Index: lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.5 -r1.6
--- lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	9 Apr 2013 12:46:10 -0000	1.5
+++ lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	17 Jan 2014 22:04:39 -0000	1.6
@@ -33,7 +33,6 @@
 link.delete  =Delete
 message.unsavedChanges  =Page contains unsaved changes
 message.defineLaterSet  =Please wait for the instructor to complete the contents of this activity
-message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 pageTitle.monitoring  =Kaltura Monitoring
 button.summary  =Summary
 button.editActivity  =Edit Activity
Index: lams_tool_kaltura/conf/middlegen/lams_tool_lakaltura11-prefs.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/conf/middlegen/lams_tool_lakaltura11-prefs.properties,v
diff -u -r1.1 -r1.2
--- lams_tool_kaltura/conf/middlegen/lams_tool_lakaltura11-prefs.properties	15 Nov 2012 14:39:33 -0000	1.1
+++ lams_tool_kaltura/conf/middlegen/lams_tool_lakaltura11-prefs.properties	17 Jan 2014 22:04:39 -0000	1.2
@@ -44,8 +44,6 @@
 hibernate.tables.tl_lakalt11_kaltura.columns.offline_instructions.java-type=java.lang.String
 hibernate.tables.tl_lakalt11_kaltura.columns.online_instructions.java-name=onlineInstructions
 hibernate.tables.tl_lakalt11_kaltura.columns.online_instructions.java-type=java.lang.String
-hibernate.tables.tl_lakalt11_kaltura.columns.run_offline.java-name=runOffline
-hibernate.tables.tl_lakalt11_kaltura.columns.run_offline.java-type=java.lang.Boolean
 hibernate.tables.tl_lakalt11_kaltura.columns.title.inctostring=true
 hibernate.tables.tl_lakalt11_kaltura.columns.title.java-name=title
 hibernate.tables.tl_lakalt11_kaltura.columns.title.java-type=java.lang.String
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	3 Apr 2013 13:18:39 -0000	1.3
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	17 Jan 2014 22:04:38 -0000	1.4
@@ -25,7 +25,6 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.tool.kaltura.service.KalturaService">
-				<property name="kalturaAttachmentDao"><ref bean="kalturaAttachmentDao"/></property>
 				<property name="kalturaSessionDao"><ref bean="kalturaSessionDao"/></property>
 				<property name="kalturaUserDao"><ref bean="kalturaUserDao"/></property>
 				<property name="kalturaDao"><ref bean="kalturaDao"/></property>
@@ -41,7 +40,6 @@
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="kalturaOutputFactory"><ref bean="kalturaOutputFactory"/></property>
-		   		<property name="repositoryService"><ref bean="repositoryService"/></property>
 		   		<property name="messageService"><ref bean="kalturaMessageService"/></property>
 			</bean>
 		</property>
@@ -60,8 +58,6 @@
 				<prop key="hide*">PROPAGATION_REQUIRED</prop>
 				<prop key="rateMessage">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>
@@ -100,10 +96,6 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
-	<bean id="kalturaAttachmentDao" class="org.lamsfoundation.lams.tool.kaltura.dao.hibernate.KalturaAttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
  	<bean id="kalturaToolContentHandler" class="org.lamsfoundation.lams.tool.kaltura.util.KalturaToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean>  
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaDAO.java	15 Nov 2012 14:39:28 -0000	1.1
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaDAO.java	17 Jan 2014 22:04:39 -0000	1.2
@@ -37,8 +37,6 @@
 
     void saveOrUpdate(Kaltura toContent);
 
-    void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type);
-
     void releaseFromCache(Object o);
 
 }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java	15 Nov 2012 14:39:30 -0000	1.1
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java	17 Jan 2014 22:04:39 -0000	1.2
@@ -26,12 +26,9 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaDAO;
 import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
-import org.lamsfoundation.lams.tool.kaltura.model.KalturaAttachment;
-import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
  * DAO for accessing the Kaltura objects - Hibernate specific code.
@@ -40,9 +37,6 @@
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Kaltura kaltura where kaltura.toolContentId=?";
 
-    private static final String FIND_INSTRUCTION_FILE = "from " + KalturaAttachment.class.getName()
-	    + " as i where tool_content_id=? and i.file_uuid=? and i.file_version_id=? and i.file_type=?";
-
     public Kaltura getByContentId(Long toolContentId) {
 	List list = getHibernateTemplate().find(KalturaDAO.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(KalturaDAO.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) {
-		KalturaAttachment file = (KalturaAttachment) list.get(0);
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.delete(file);
-		templ.flush();
-	    }
-	}
-
-    }
-
     public void releaseFromCache(Object o) {
 	getSession().evict(o);
 
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20140102.sql	17 Jan 2014 22:04:39 -0000	1.1
@@ -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_lakalt11_kaltura DROP COLUMN online_instructions;
+ALTER TABLE tl_lakalt11_kaltura DROP COLUMN offline_instructions;
+ALTER TABLE tl_lakalt11_kaltura DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lakalt11_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lakalt11';
+
+----------------------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_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.java,v
diff -u -r1.2 -r1.3
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.java	10 Jun 2013 09:13:53 -0000	1.2
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.java	17 Jan 2014 22:04:39 -0000	1.3
@@ -61,8 +61,6 @@
 
     private String instructions;
 
-    private boolean runOffline;
-
     private boolean lockOnFinished;
     
     private boolean allowContributeVideos;
@@ -75,10 +73,6 @@
 
     private boolean allowRatings;
 
-    private String onlineInstructions;
-
-    private String offlineInstructions;
-
     private boolean contentInUse;
 
     private boolean defineLater;
@@ -91,40 +85,16 @@
 
     private String reflectInstructions;
 
-    private Set kalturaAttachments;
-
     private Set kalturaSessions;
 
     private Set kalturaItems;
 
-    // *********** NON Persisit fields
-    private IToolContentHandler toolContentHandler;
-    
-    private List<KalturaAttachment> onlineFileList;
-
-    private List<KalturaAttachment> offlineFileList;
-
     // Constructors
 
     /** default constructor */
     public Kaltura() {
 	kalturaItems = new HashSet();
     }
-    
-    public void toDTO() {
-	onlineFileList = new ArrayList<KalturaAttachment>();
-	offlineFileList = new ArrayList<KalturaAttachment>();
-	Set<KalturaAttachment> fileSet = this.getKalturaAttachments();
-	if (fileSet != null) {
-	    for (KalturaAttachment file : fileSet) {
-		if (StringUtils.equalsIgnoreCase(file.getFileType(), IToolContentHandler.TYPE_OFFLINE)) {
-		    offlineFileList.add(file);
-		} else {
-		    onlineFileList.add(file);
-		}
-	    }
-	}
-    }
 
     // Property accessors
     /**
@@ -200,17 +170,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"
      */
     public boolean isLockOnFinished() {
@@ -278,28 +237,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"
      */
     public boolean isContentInUse() {
@@ -370,19 +307,6 @@
     }
 
     /**
-     * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
-     * @hibernate.collection-key column="kaltura_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.kaltura.model.KalturaAttachment"
-     */
-    public Set getKalturaAttachments() {
-	return kalturaAttachments;
-    }
-
-    public void setKalturaAttachments(Set kalturaAttachments) {
-	this.kalturaAttachments = kalturaAttachments;
-    }
-
-    /**
      * @hibernate.set lazy="true" inverse="true" cascade="none"
      * @hibernate.collection-key column="kaltura_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.kaltura.model.KalturaSession"
@@ -445,10 +369,8 @@
 	return result;
     }
 
-    public static Kaltura newInstance(Kaltura fromContent, Long toContentId,
-	    IToolContentHandler kalturaToolContentHandler) {
+    public static Kaltura newInstance(Kaltura fromContent, Long toContentId) {
 	Kaltura toContent = new Kaltura();
-	fromContent.toolContentHandler = kalturaToolContentHandler;
 	toContent = (Kaltura) fromContent.clone();
 	toContent.setToolContentId(toContentId);
 	toContent.setCreateDate(new Date());
@@ -484,18 +406,6 @@
 		}
 		kaltura.kalturaItems = set;
 	    }
-
-	    if (kalturaAttachments != null) {
-		// create a copy of the attachments
-		Iterator iter = kalturaAttachments.iterator();
-		Set<KalturaAttachment> set = new HashSet<KalturaAttachment>();
-		while (iter.hasNext()) {
-		    KalturaAttachment originalFile = (KalturaAttachment) iter.next();
-		    KalturaAttachment newFile = (KalturaAttachment) originalFile.clone();
-		    set.add(newFile);
-		}
-		kaltura.kalturaAttachments = set;
-	    }
 	    
 	    // clone KalturaUser as well
 	    if (createdBy != null) {
@@ -511,28 +421,4 @@
 	return kaltura;
     }
 
-    public IToolContentHandler getToolContentHandler() {
-	return toolContentHandler;
-    }
-
-    public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-	this.toolContentHandler = toolContentHandler;
-    }
-    
-    public List<KalturaAttachment> getOfflineFileList() {
-	return offlineFileList;
-    }
-
-    public void setOfflineFileList(List<KalturaAttachment> offlineFileList) {
-	this.offlineFileList = offlineFileList;
-    }
-
-    public List<KalturaAttachment> getOnlineFileList() {
-	return onlineFileList;
-    }
-
-    public void setOnlineFileList(List<KalturaAttachment> onlineFileList) {
-	this.onlineFileList = onlineFileList;
-    }
-
 }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/KalturaAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java,v
diff -u -r1.2 -r1.3
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java	16 Nov 2012 13:47:56 -0000	1.2
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java	17 Jan 2014 22:04:39 -0000	1.3
@@ -30,7 +30,6 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.kaltura.dto.AverageRatingDTO;
 import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
-import org.lamsfoundation.lams.tool.kaltura.model.KalturaAttachment;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaSession;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser;
@@ -69,28 +68,6 @@
     Kaltura getKalturaByContentId(Long toolContentID);
 
     /**
-     * @param toolContentId
-     * @param file
-     * @param type
-     * @return
-     */
-    KalturaAttachment uploadFileToContent(Long toolContentId, FormFile file, String type);
-
-    /**
-     * @param uuid
-     * @param versionID
-     */
-    void deleteFromRepository(Long uuid, Long versionID) throws KalturaException;
-
-    /**
-     * @param contentID
-     * @param uuid
-     * @param versionID
-     * @param type
-     */
-    void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type);
-
-    /**
      * @param kaltura
      */
     void saveOrUpdateKaltura(Kaltura kaltura);
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java,v
diff -u -r1.4 -r1.5
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	29 Jul 2013 23:12:11 -0000	1.4
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	17 Jan 2014 22:04:39 -0000	1.5
@@ -24,8 +24,6 @@
 
 package org.lamsfoundation.lams.tool.kaltura.service;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.Hashtable;
@@ -34,20 +32,8 @@
 import java.util.SortedMap;
 import java.util.TreeSet;
 
-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.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -64,7 +50,6 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaAttachmentDAO;
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaCommentDAO;
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaDAO;
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaItemDAO;
@@ -74,7 +59,6 @@
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaUserDAO;
 import org.lamsfoundation.lams.tool.kaltura.dto.AverageRatingDTO;
 import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
-import org.lamsfoundation.lams.tool.kaltura.model.KalturaAttachment;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaComment;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaItemVisitLog;
@@ -83,8 +67,8 @@
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser;
 import org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants;
 import org.lamsfoundation.lams.tool.kaltura.util.KalturaException;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaImportContentVersionFilter;
 import org.lamsfoundation.lams.tool.kaltura.util.KalturaItemComparator;
-import org.lamsfoundation.lams.tool.kaltura.util.KalturaToolContentHandler;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -117,8 +101,6 @@
 
     private IKalturaUserDAO kalturaUserDao = null;
 
-    private IKalturaAttachmentDAO kalturaAttachmentDao = null;
-
     private ILearnerService learnerService;
 
     private ILamsToolService toolService;
@@ -129,8 +111,6 @@
 
     private IToolContentHandler kalturaToolContentHandler = null;
 
-    private IRepositoryService repositoryService = null;
-
     private IAuditService auditService = null;
 
     private IExportToolContentService exportContentService;
@@ -214,31 +194,11 @@
 	    // create the fromContent using the default tool content
 	    fromContent = getDefaultContent();
 	}
-	Kaltura toContent = Kaltura.newInstance(fromContent, toContentId, kalturaToolContentHandler);
+	Kaltura toContent = Kaltura.newInstance(fromContent, toContentId);
 	kalturaDao.saveOrUpdate(toContent);
     }
 
     @Override
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Kaltura kaltura = kalturaDao.getByContentId(toolContentId);
-	if (kaltura == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	kaltura.setDefineLater(value);
-	kalturaDao.saveOrUpdate(kaltura);
-    }
-
-    @Override
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Kaltura kaltura = kalturaDao.getByContentId(toolContentId);
-	if (kaltura == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	kaltura.setRunOffline(value);
-	kalturaDao.saveOrUpdate(kaltura);
-    }
-
-    @Override
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
     }
@@ -255,20 +215,13 @@
 
 	// set ResourceToolContentHandler as null to avoid copy file node in
 	// repository again.
-	kaltura = Kaltura.newInstance(kaltura, toolContentId, null);
-	kaltura.setToolContentHandler(null);
+	kaltura = Kaltura.newInstance(kaltura, toolContentId);
 	kaltura.setKalturaSessions(null);
-	Set<KalturaAttachment> atts = kaltura.getKalturaAttachments();
-	for (KalturaAttachment att : atts) {
-	    att.setKaltura(null);
-	}
 	Set<KalturaItem> items = kaltura.getKalturaItems();
 	for (KalturaItem item : items) {
 	    item.setKalturaUid(null);
 	}
 	try {
-	    exportContentService.registerFileClassForExport(KalturaAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, kaltura, kalturaToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -279,9 +232,9 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(KalturaAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(KalturaImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, kalturaToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof Kaltura)) {
@@ -525,7 +478,7 @@
 	Kaltura defaultContent = getDefaultContent();
 	// create new kaltura using the newContentID
 	Kaltura newContent = new Kaltura();
-	newContent = Kaltura.newInstance(defaultContent, newContentID, kalturaToolContentHandler);
+	newContent = Kaltura.newInstance(defaultContent, newContentID);
 	kalturaDao.saveOrUpdate(newContent);
 	return newContent;
     }
@@ -564,36 +517,6 @@
     }
 
     @Override
-    public KalturaAttachment uploadFileToContent(Long toolContentId, FormFile file, String type) {
-	if (file == null || StringUtils.isEmpty(file.getFileName())) {
-	    throw new KalturaException("Could not find upload file: " + file);
-	}
-
-	NodeKey nodeKey = processFile(file, type);
-
-	KalturaAttachment attachment = new KalturaAttachment(nodeKey.getVersion(), type, file.getFileName(),
-		nodeKey.getUuid(), new Date());
-	return attachment;
-    }
-
-    @Override
-    public void deleteFromRepository(Long uuid, Long versionID) throws KalturaException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new KalturaException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
-    @Override
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type) {
-	kalturaDao.deleteInstructionFile(contentID, uuid, versionID, type);
-
-    }
-
-    @Override
     public void saveOrUpdateKaltura(Kaltura kaltura) {
 	kalturaDao.saveOrUpdate(kaltura);
     }
@@ -628,53 +551,6 @@
 	return messageService.getMessage(key, args);
     }
 
-    private NodeKey processFile(FormFile file, String type) {
-	NodeKey node = null;
-	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
-	    String fileName = file.getFileName();
-	    try {
-		node = kalturaToolContentHandler.uploadFile(file.getInputStream(), fileName,
-			file.getContentType(), type);
-	    } catch (InvalidParameterException e) {
-		throw new KalturaException("InvalidParameterException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (FileNotFoundException e) {
-		throw new KalturaException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-	    } catch (RepositoryCheckedException e) {
-		throw new KalturaException("RepositoryCheckedException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (IOException e) {
-		throw new KalturaException("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 KalturaException {
-	ICredentials credentials = new SimpleCredentials(KalturaToolContentHandler.repositoryUser,
-		KalturaToolContentHandler.repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials, KalturaToolContentHandler.repositoryWorkspaceName);
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new KalturaException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new KalturaException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new KalturaException("Login failed." + e.getMessage());
-	}
-    }
-
     /* ===============Methods implemented from ToolContentImport102Manager =============== */
 
     /**
@@ -700,10 +576,6 @@
     // =========================================================================================
     /* ********** Used by Spring to "inject" the linked objects ************* */
 
-    public void setKalturaAttachmentDao(IKalturaAttachmentDAO attachmentDAO) {
-	kalturaAttachmentDao = attachmentDAO;
-    }
-
     public void setKalturaDao(IKalturaDAO kalturaDAO) {
 	this.kalturaDao = kalturaDAO;
     }
@@ -760,10 +632,6 @@
 	this.coreNotebookService = coreNotebookService;
     }
 
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
     public KalturaOutputFactory getKalturaOutputFactory() {
 	return kalturaOutputFactory;
     }
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaImportContentVersionFilter.java	17 Jan 2014 22:04:38 -0000	1.1
@@ -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: KalturaImportContentVersionFilter.java,v 1.1 2014/01/17 22:04:38 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.kaltura.util;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
+
+/**
+ * Import filter class for different version of Kaltura content.
+ */
+public class KalturaImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20121018 version content to 20140102 version tool server.
+     */
+    public void up20121018To20140102() {
+	this.removeField(Kaltura.class, "runOffline");
+	this.removeField(Kaltura.class, "onlineInstructions");
+	this.removeField(Kaltura.class, "offlineInstructions");
+	this.removeField(Kaltura.class, "kalturaAttachments");
+    }
+}
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java	3 Apr 2013 13:18:39 -0000	1.2
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java	17 Jan 2014 22:04:38 -0000	1.3
@@ -54,7 +54,6 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
-import org.lamsfoundation.lams.tool.kaltura.model.KalturaAttachment;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser;
 import org.lamsfoundation.lams.tool.kaltura.service.IKalturaService;
@@ -90,11 +89,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";
 
     @Override
     protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -132,8 +126,6 @@
 	AuthoringForm authForm = (AuthoringForm) form;
 	authForm.setTitle(kaltura.getTitle());
 	authForm.setInstructions(kaltura.getInstructions());
-	authForm.setOnlineInstruction(kaltura.getOnlineInstructions());
-	authForm.setOfflineInstruction(kaltura.getOfflineInstructions());
 	authForm.setLockOnFinished(kaltura.isLockOnFinished());
 	authForm.setAllowContributeVideos(kaltura.isAllowContributeVideos());
 	authForm.setAllowSeeingOtherUsersRecordings(kaltura.isAllowSeeingOtherUsersRecordings());
@@ -152,23 +144,6 @@
 	sessionMap.put(AuthoringAction.KEY_MODE, mode);
 	sessionMap.put(AuthoringAction.KEY_CONTENT_FOLDER_ID, contentFolderID);
 	sessionMap.put(AuthoringAction.KEY_TOOL_CONTENT_ID, toolContentID);
-	sessionMap.put(AuthoringAction.KEY_ONLINE_FILES, new LinkedList<KalturaAttachment>());
-	sessionMap.put(AuthoringAction.KEY_OFFLINE_FILES, new LinkedList<KalturaAttachment>());
-	sessionMap.put(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, new LinkedList<KalturaAttachment>());
-	sessionMap.put(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, new LinkedList<KalturaAttachment>());
-	sessionMap.put(AuthoringAction.KEY_DELETED_FILES, new LinkedList<KalturaAttachment>());
-
-	Iterator iter = kaltura.getKalturaAttachments().iterator();
-	while (iter.hasNext()) {
-	    KalturaAttachment attachment = (KalturaAttachment) iter.next();
-	    String type = attachment.getFileType();
-	    if (type.equals(IToolContentHandler.TYPE_OFFLINE)) {
-		getAttList(AuthoringAction.KEY_OFFLINE_FILES, sessionMap).add(attachment);
-	    }
-	    if (type.equals(IToolContentHandler.TYPE_ONLINE)) {
-		getAttList(AuthoringAction.KEY_ONLINE_FILES, sessionMap).add(attachment);
-	    }
-	}
 	
 	Set<KalturaItem> items = kaltura.getKalturaItems();
 	// init taskList item list
@@ -195,8 +170,6 @@
 	kaltura.setTitle(authForm.getTitle());
 	kaltura.setInstructions(authForm.getInstructions());
 	if (mode.isAuthor()) { // Teacher cannot modify following
-	    kaltura.setOfflineInstructions(authForm.getOfflineInstruction());
-	    kaltura.setOnlineInstructions(authForm.getOnlineInstruction());
 	    kaltura.setLockOnFinished(authForm.isLockOnFinished());
 	    kaltura.setAllowContributeVideos(authForm.isAllowContributeVideos());
 	    kaltura.setLearnerContributionLimit(authForm.getLearnerContributionLimit());
@@ -217,24 +190,6 @@
 	}
 
 	kaltura.setCreatedBy(kalturaUser);
-
-	// remove attachments marked for deletion.
-	Set<KalturaAttachment> attachments = kaltura.getKalturaAttachments();
-	if (attachments == null) {
-	    attachments = new HashSet<KalturaAttachment>();
-	}
-
-	for (KalturaAttachment att : getAttList(AuthoringAction.KEY_DELETED_FILES, sessionMap)) {
-	    // remove from db, leave in repository
-	    attachments.remove(att);
-	}
-
-	// add unsaved attachments
-	attachments.addAll(getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, sessionMap));
-	attachments.addAll(getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, sessionMap));
-
-	// set attachments in case it didn't exist
-	kaltura.setKalturaAttachments(attachments);
 	
 	// ************************* Handle taskList items *******************
 	Set itemList = new LinkedHashSet();
@@ -413,156 +368,6 @@
 	return mapping.findForward(KalturaConstants.ITEM_LIST);
     }
 
-    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<KalturaAttachment> unsavedFiles;
-	List<KalturaAttachment> 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(KalturaConstants.ATTR_SESSION_MAP, map);
-	    this.saveErrors(request, errors);
-	    return mapping.findForward("success");
-	}
-
-	if (file.getFileName().length() != 0) {
-
-	    // upload file to repository
-	    KalturaAttachment newAtt = kalturaService.uploadFileToContent(
-		    (Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID), file, type);
-
-	    // Add attachment to unsavedFiles
-	    // check to see if file with same name exists
-	    KalturaAttachment currAtt;
-	    Iterator iter = savedFiles.iterator();
-	    while (iter.hasNext()) {
-		currAtt = (KalturaAttachment) 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(KalturaConstants.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()) {
-	    KalturaAttachment att = (KalturaAttachment) 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(KalturaConstants.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()) {
-	    KalturaAttachment att = (KalturaAttachment) iter.next();
-
-	    if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-		// delete from repository and list
-		kalturaService.deleteFromRepository(att.getFileUuid(), att.getFileVersionId());
-		iter.remove();
-		break;
-	    }
-	}
-
-	request.setAttribute(KalturaConstants.ATTR_SESSION_MAP, map);
-	request.setAttribute("unsavedChanges", new Boolean(true));
-
-	return mapping.findForward("success");
-    }
-
     /**
      * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
     */
@@ -578,14 +383,6 @@
     }
 
     /**
-     * Retrieves a List of attachments from the map using the key.
-     */
-    private List<KalturaAttachment> getAttList(String key, SessionMap<String, Object> map) {
-	List<KalturaAttachment> list = (List<KalturaAttachment>) map.get(key);
-	return list;
-    }
-
-    /**
      * Retrieve the SessionMap from the HttpSession.
      */
     private SessionMap<String, Object> getSessionMap(HttpServletRequest request, AuthoringForm authForm) {
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java	9 Apr 2013 12:46:10 -0000	1.7
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java	17 Jan 2014 22:04:38 -0000	1.8
@@ -81,7 +81,7 @@
  * @struts.action-forward name="success" path="tiles:/learning/main"
  * @struts:action-forward name ="viewitem" path="/learning.do?dispatch=viewItem" redirect="true"
  * @struts.action-forward name="commentlist" path="tiles:/learning/commentlist"
- * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
+ * @struts.action-forward name="submissionDeadline" path="tiles:/learning/submissionDeadline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  * @struts.action-forward name="notebook" path="tiles:/learning/notebook"
  * @struts.action-forward name="finish" path="tiles:/learning/finish"
@@ -147,11 +147,6 @@
 	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet()
 		.getServletContext());
 	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
-	
-	// check runOffline
-	if (kaltura.isRunOffline()) {
-	    return mapping.findForward("runOffline");
-	}
 
 	// reflection information
 	String entryText = new String();
@@ -181,9 +176,9 @@
 	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
 	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
 
-	    // 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");
 	    }
 	}
 	
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java	16 Nov 2012 13:47:56 -0000	1.2
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java	17 Jan 2014 22:04:38 -0000	1.3
@@ -82,7 +82,6 @@
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
 	Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentID);
-	kaltura.toDTO();
 	boolean isGroupedActivity = kalturaService.isGroupedActivity(toolContentID);
 	request.setAttribute(KalturaConstants.ATTR_KALTURA, kaltura);
 	request.setAttribute("contentFolderID", contentFolderID);
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/AuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/AuthoringForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/AuthoringForm.java	15 Nov 2012 14:39:33 -0000	1.1
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/AuthoringForm.java	17 Jan 2014 22:04:39 -0000	1.2
@@ -48,10 +48,6 @@
 
     private String instructions;
 
-    private String offlineInstruction;
-
-    private String onlineInstruction;
-
     private boolean lockOnFinished;
     
     private boolean allowContributeVideos;
@@ -64,10 +60,6 @@
     
     private boolean allowRatings;
 
-    private FormFile onlineFile;
-
-    private FormFile offlineFile;
-
     private String currentTab;
 
     private String dispatch;
@@ -138,38 +130,6 @@
 	this.allowContributeVideos = allowContributeVideos;
     }
 
-    public FormFile getOfflineFile() {
-	return offlineFile;
-    }
-
-    public void setOfflineFile(FormFile offlineFile) {
-	this.offlineFile = offlineFile;
-    }
-
-    public String getOfflineInstruction() {
-	return offlineInstruction;
-    }
-
-    public void setOfflineInstruction(String offlineInstruction) {
-	this.offlineInstruction = offlineInstruction;
-    }
-
-    public FormFile getOnlineFile() {
-	return onlineFile;
-    }
-
-    public void setOnlineFile(FormFile onlineFile) {
-	this.onlineFile = onlineFile;
-    }
-
-    public String getOnlineInstruction() {
-	return onlineInstruction;
-    }
-
-    public void setOnlineInstruction(String onlineInstruction) {
-	this.onlineInstruction = onlineInstruction;
-    }
-
     public String getTitle() {
 	return title;
     }
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/servlets/ExportServlet.java,v
diff -u -r1.2 -r1.3
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/servlets/ExportServlet.java	6 Jan 2014 08:42:30 -0000	1.2
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/servlets/ExportServlet.java	17 Jan 2014 22:04:39 -0000	1.3
@@ -77,30 +77,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 (kalturaService == null) {
-		kalturaService = KalturaServiceProxy.getKalturaService(getServletContext());
-	    }
-
-	    Kaltura content = null;
-	    if (toolContentID != null) {
-		content = kalturaService.getKalturaByContentId(toolContentID);
-	    } else {
-		KalturaSession session = kalturaService.getSessionBySessionId(toolSessionID);
-		if (session != null)
-		    content = session.getKaltura();
-	    }
-	    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 KalturaException {
 
Index: lams_tool_kaltura/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_kaltura/web/WEB-INF/tiles-defs.xml	24 Nov 2012 12:37:49 -0000	1.2
+++ lams_tool_kaltura/web/WEB-INF/tiles-defs.xml	17 Jan 2014 22:04:38 -0000	1.3
@@ -64,9 +64,9 @@
 		<put name="bodyMobile" value="/pages/learning/mobile/learning.jsp"/>
 	</definition>
 
-	<definition name="tiles:/learning/runOffline" extends="tiles:/layout:learning">
-		<put name="body" value="/pages/learning/runOffline.jsp" />
-		<put name="bodyMobile" value="/pages/learning/mobile/runOffline.jsp"/>
+	<definition name="tiles:/learning/submissionDeadline" extends="tiles:/layout:learning">
+		<put name="body" value="/pages/learning/submissionDeadline.jsp" />
+		<put name="bodyMobile" value="/pages/learning/mobile/submissionDeadline.jsp"/>
 	</definition>
 	
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/DefineLater.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/includes/javascript/authoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/includes/javascript/authoring.js,v
diff -u -r1.1 -r1.2
--- lams_tool_kaltura/web/includes/javascript/authoring.js	15 Nov 2012 14:39:32 -0000	1.1
+++ lams_tool_kaltura/web/includes/javascript/authoring.js	17 Jan 2014 22:04:39 -0000	1.2
@@ -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_kaltura/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/authoring/authoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_kaltura/web/pages/authoring/authoring.jsp	15 Nov 2012 14:39:28 -0000	1.1
+++ lams_tool_kaltura/web/pages/authoring/authoring.jsp	17 Jan 2014 22:04:38 -0000	1.2
@@ -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>
 
@@ -32,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">
@@ -50,7 +46,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 1.2 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp	17 Jan 2014 22:04:39 -0000	1.1
@@ -0,0 +1,54 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${not empty param.sessionMapID}">
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+</c:if>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+<c:set var="kaltura" value="${sessionMap.kaltura}" />
+
+<script type="text/javascript">
+	function disableFinishButton() {
+		document.getElementById("finishButton").disabled = true;
+	}
+    function submitForm(methodName){
+    	var f = document.getElementById('messageForm');
+    	f.submit();
+    }
+</script>
+
+<div id="content">
+	<h1>
+		${kaltura.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="${mode == 'learner' || mode == 'author'}">
+		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
+			<html:hidden property="dispatch" value="finishActivity" />
+			<html:hidden property="sessionMapID" value="${sessionMapID}"/>
+
+			<div align="right" class="space-bottom-top">
+				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="button.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="button.finish" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			</span>
+				</html:link>
+			</div>
+		</html:form>
+	</c:if>
+</div>
+
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/mobile/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/pages/learning/mobile/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/mobile/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_kaltura/web/pages/learning/mobile/submissionDeadline.jsp	17 Jan 2014 22:04:38 -0000	1.1
@@ -0,0 +1,64 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${not empty param.sessionMapID}">
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+</c:if>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+<c:set var="kaltura" value="${sessionMap.kaltura}" />
+
+<script type="text/javascript">
+	function disableFinishButton() {
+		document.getElementById("finishButton").disabled = true;
+	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
+</script>
+
+<div data-role="header" data-theme="b" data-nobackbtn="true">
+	<h1>
+		${kaltura.title}
+	</h1>
+</div>
+	
+<div data-role="content">
+	<div class="warning">
+		<fmt:message key="authoring.info.teacher.set.restriction" >
+			<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+		</fmt:message>	
+	</div>
+</div>
+	
+<div data-role="footer" data-theme="b" class="ui-bar">
+	<span class="ui-finishbtn-right">
+		
+		<c:if test="${mode == 'learner' || mode == 'author'}">
+			<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
+				<html:hidden property="dispatch" value="finishActivity" />
+				<html:hidden property="sessionMapID" value="${sessionMapID}"/>
+	
+				<a href="#nogo" id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="button.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="button.finish" />
+		 					</c:otherwise>
+		 				</c:choose>
+			 		</span>		
+				</a>
+			</html:form>
+		</c:if>
+			
+	</span>
+</div>
+
+	
+
+
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_kaltura/web/pages/monitoring/monitoring.jsp	15 Nov 2012 14:39:27 -0000	1.1
+++ lams_tool_kaltura/web/pages/monitoring/monitoring.jsp	17 Jan 2014 22:04:40 -0000	1.2
@@ -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 = "${initialTabId}";
@@ -17,9 +16,8 @@
 	<lams:help toolSignature="<%= KalturaConstants.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_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml	8 Jan 2014 17:49:42 -0000	1.2
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml	17 Jan 2014 22:04:48 -0000	1.3
@@ -60,15 +60,7 @@
         length="1"        
    />
 
-   <property
-        name="runOffline"
-        type="boolean"
-        access="property"
-        column="run_offline"
-        length="1"        
-   />
 
-
     <property
         name="creationDate"
         type="java.util.Date"
@@ -126,24 +118,8 @@
         column="content_in_use"
         length="1"
     />
-
-    <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="retries"
         type="boolean"
         access="property"        
@@ -245,25 +221,7 @@
               />
 
     </set>
-    
-    	<set
-            name="mcAttachments"
-            lazy="true"
-            inverse="true"
-            cascade="all-delete-orphan"
-            sort="unsorted"
-        >
-              <key
-                  column="mc_content_id"
-              >
-              </key>
 
-              <one-to-many
-                  class="org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile"
-              />
 
-    </set>
-
-
 </class>
 </hibernate-mapping>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McUploadedFile.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/conf/middlegen/lams_tool_lamc11-prefs.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/middlegen/lams_tool_lamc11-prefs.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/conf/middlegen/lams_tool_lamc11-prefs.properties	6 Oct 2005 16:00:36 -0000	1.3
+++ lams_tool_lamc/conf/middlegen/lams_tool_lamc11-prefs.properties	17 Jan 2014 22:04:49 -0000	1.4
@@ -30,8 +30,6 @@
 hibernate.tables.tl_lamc11_content.columns.report_title.java-type=java.lang.String
 hibernate.tables.tl_lamc11_content.columns.retries.java-name=retries
 hibernate.tables.tl_lamc11_content.columns.retries.java-type=byte
-hibernate.tables.tl_lamc11_content.columns.run_offline.java-name=runOffline
-hibernate.tables.tl_lamc11_content.columns.run_offline.java-type=byte
 hibernate.tables.tl_lamc11_content.columns.show_feedback.java-name=showFeedback
 hibernate.tables.tl_lamc11_content.columns.show_feedback.java-type=byte
 hibernate.tables.tl_lamc11_content.columns.show_top_users.java-name=showTopUsers
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v
diff -u -r1.110 -r1.111
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	8 Jan 2014 17:49:42 -0000	1.110
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	17 Jan 2014 22:04:49 -0000	1.111
@@ -54,26 +54,17 @@
     public static final String PREVIEW = "preview";
     public static final String LEARNER_PROGRESS = "learnerProgress";
     public static final String LEARNER_PROGRESS_USERID = "learnerProgressUserId";
-    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 LIST_QUESTION_CONTENT_DTO = "listQuestionContentDTO";
     public static final String LIST_QUESTION_CONTENT_DTO_KEY = "listQuestionContentDTOKey";
-    public static final String DEFAULT_ONLINE_INST = "";
-    public static final String DEFAULT_OFFLINE_INST = "";
-    public static final String ONLINE_INSTRUCTIONS_KEY = "onlineInstructionsKey";
-    public static final String OFFLINE_INSTRUCTIONS_KEY = "offlineInstructionsKey";
     public static final String MAP_QUESTION_CONTENT_KEY = "mapQuestionContentKey";
     public static final String LOAD_VIEW_ONLY = "loadViewOnly";
     public static final String MC_GENERAL_AUTHORING_DTO = "mcGeneralAuthoringDTO";
     public static final String DEFAULT_CONTENT_ID_STR = "defaultContentIdStr";
     public static final String LIST_ADD_QUESTION_CONTENT_DTO_KEY = "listAddQuestionContentDtoKey";
     public static final String NEW_QUESTION_CONTENT_DTO = "newQuestionContentDTO";
     public static final Integer MAX_QUESTION_COUNT = new Integer(50);
-    public static final String ONLINE_INSTRUCTIONS = "onlineInstructions";
-    public static final String OFFLINE_INSTRUCTIONS = "offlineInstructions";
-    public static final String UUID = "uuid";
     public static final String EDIT_ACTIVITY_DTO = "editActivityDTO";
     public static final String LIST_CANDIDATE_ANSWERS_DTO = "listCandidateAnswersDTO";
     public static final String CURRENT_EDITABLE_QUESTION_INDEX = "currentEditableQuestionIndex";
@@ -188,7 +179,6 @@
     public static final String CREATION_DATE = "creationDate";
     public static final String DEFINE_LATER = "defineLater";
     public static final String WAIT_FOR_LEADER = "waitForLeader";    
-    public static final String RUN_OFFLINE = "runOffline";
     public static final String RETRIES = "retries";
     public static final String PASSMARK = "passMark";
     public static final String VIEW_ANSWERS = "viewAnswers";
@@ -201,19 +191,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_REPORT_TITLE = "richTextReportTitle";
-    // public static final String RICHTEXT_END_LEARNING_MSG ="richTextEndLearningMsg";
     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_ONLINE_FILENAMES = "listUploadedOnlineFileNames";
-    public static final String LIST_OFFLINEFILES_METADATA = "listOfflineFilesMetadata";
-    public static final String LIST_ONLINEFILES_METADATA = "listOnlineFilesMetadata";
 
     public static final String COUNT_SESSION_COMPLETE = "countSessionComplete";
     public static final String COUNT_ALL_USERS = "countAllUsers";
@@ -222,7 +203,7 @@
     public static final String LOWEST_MARK = "lowestMark";
     public static final String AVERAGE_MARK = "averageMark";
 
-    /* Date time restriction LDEV-2657 */
+    /* Date time restriction */
     public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
     public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
     public static final String ATTR_GROUP_USERS = "groupUsers";
@@ -271,7 +252,6 @@
     public static final String ENTRY_TEXT = "entryText";
 
     public static final String MC_LEARNER_STARTER_DTO = "mcLearnerStarterDTO";
-    public static final String IS_TOOL_ACTIVITY_OFFLINE = "isToolActivityOffline";
     public static final String IS_USERNAME_VISIBLE = "isUsernameVisible";
     public static final String IS_CONTENT_IN_USE = "isContentInUse";
     public static final String IS_MONITORED_CONTENT_IN_USE = "isMonitoredContentInUse";
@@ -352,7 +332,6 @@
     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";
@@ -367,7 +346,6 @@
     public static final String USER_EXCEPTION_PASSMARK_NOTINTEGER = "userExceptionPassmarkNotInteger";
     public static final String USER_EXCEPTION_PASSMARK_EMPTY = "userExceptionPassmarkEmpty";
     public static final String USER_EXCEPTION_PASSMARK_GREATER100 = "userExceptionPassmarkGreater100";
-    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";
 
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java	8 May 2013 13:18:25 -0000	1.7
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java	17 Jan 2014 22:04:49 -0000	1.8
@@ -49,8 +49,6 @@
 
     protected String activityTitle;
     protected String activityInstructions;
-    protected String onlineInstructions;
-    protected String offlineInstructions;
     protected String usernameVisible;
     protected String reflect;
     protected String synchInMonitor;
@@ -68,9 +66,6 @@
     protected String isDefineLater;
     protected Map mapQuestionContent;
 
-    protected List attachmentList;
-    protected List deletedAttachmentList;
-
     protected String sbmtSuccess;
     protected String userExceptionQuestionsDuplicate;
 
@@ -101,14 +96,12 @@
 		.append("targetMode: ", targetMode).append("defaultQuestionContent: ", defaultQuestionContent)
 		.append("defaultContentIdStr: ", defaultContentIdStr).append("activityTitle: ", activityTitle)
 		.append("activityInstructions: ", activityInstructions).append("reflect: ", reflect)
-		.append("onlineInstructions: ", onlineInstructions)
-		.append("offlineInstructions: ", offlineInstructions).append("usernameVisible: ", usernameVisible)
+		.append("usernameVisible: ", usernameVisible)
 		.append("synchInMonitor: ", synchInMonitor).append("questionsSequenced: ", questionsSequenced)
 		.append("editActivityEditMode: ", editActivityEditMode)
 		.append("reflectionSubject: ", reflectionSubject).append("requestedModule: ", requestedModule)
 		.append("isDefineLater: ", isDefineLater).append("monitoredContentInUse: ", monitoredContentInUse)
-		.append("mapQuestionContent: ", mapQuestionContent).append("attachmentList: ", attachmentList)
-		.append("deletedAttachmentList: ", deletedAttachmentList).append("sbmtSuccess: ", sbmtSuccess)
+		.append("mapQuestionContent: ", mapQuestionContent).append("sbmtSuccess: ", sbmtSuccess)
 		.append("userExceptionQuestionsDuplicate: ", userExceptionQuestionsDuplicate).toString();
     }
 
@@ -173,21 +166,6 @@
     }
 
     /**
-     * @return Returns the deletedAttachmentList.
-     */
-    public List getDeletedAttachmentList() {
-	return deletedAttachmentList;
-    }
-
-    /**
-     * @param deletedAttachmentList
-     *            The deletedAttachmentList to set.
-     */
-    public void setDeletedAttachmentList(List deletedAttachmentList) {
-	this.deletedAttachmentList = deletedAttachmentList;
-    }
-
-    /**
      * @return Returns the mapQuestionContent.
      */
     public Map getMapQuestionContent() {
@@ -218,21 +196,6 @@
     }
 
     /**
-     * @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 toolContentID.
      */
     public String getToolContentID() {
@@ -407,36 +370,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 questionsSequenced.
      */
     public String getQuestionsSequenced() {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java	3 Sep 2013 16:56:41 -0000	1.7
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java	17 Jan 2014 22:04:49 -0000	1.8
@@ -71,12 +71,6 @@
     protected List listMonitoredAnswersContainerDto;
     protected List listUserEntries;
 
-    protected String richTextOnlineInstructions;
-    protected String richTextOfflineInstructions;
-    protected List listOfflineFilesMetadata;
-    protected List listUploadedOfflineFileNames;
-    protected List listOnlineFilesMetadata;
-    protected List listUploadedOnlineFileNames;
     protected String showOpenMcsSection;
 
     protected List listMcAllSessionsDTO;
@@ -88,103 +82,10 @@
     protected String completedSessionUserPercent;
     protected List mapStudentsMcd;
 
-    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() {
@@ -728,12 +629,6 @@
 		.append("listMonitoredAnswersContainerDto: ", listMonitoredAnswersContainerDto)
 		.append("listUserEntries: ", listUserEntries).append("existsOpenMcs: ", existsOpenMcs)
 		.append("listMcAllSessionsDTO: ", listMcAllSessionsDTO)
-		.append("richTextOnlineInstructions: ", richTextOnlineInstructions)
-		.append("richTextOfflineInstructions: ", richTextOfflineInstructions)
-		.append("listOfflineFilesMetadata: ", listOfflineFilesMetadata)
-		.append("listUploadedOfflineFileNames: ", listUploadedOfflineFileNames)
-		.append("listOnlineFilesMetadata: ", listOnlineFilesMetadata)
-		.append("listUploadedOnlineFileNames: ", listUploadedOnlineFileNames)
 		.append("showOpenMcsSection: ", showOpenMcsSection).append("mapStudentsMcd: ", mapStudentsMcd)
 		.append("responseId: ", responseId).append("currentUid: ", currentUid)
 		.append("displayAnswers: ", displayAnswers).append("sessionUserCount: ", sessionUserCount)
@@ -766,51 +661,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 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() {
@@ -826,21 +676,6 @@
     }
 
     /**
-     * @return Returns the deletedAttachmentList.
-     */
-    public List getDeletedAttachmentList() {
-	return deletedAttachmentList;
-    }
-
-    /**
-     * @param deletedAttachmentList
-     *            The deletedAttachmentList to set.
-     */
-    public void setDeletedAttachmentList(List deletedAttachmentList) {
-	this.deletedAttachmentList = deletedAttachmentList;
-    }
-
-    /**
      * @return Returns the defaultQuestionContent.
      */
     public String getDefaultQuestionContent() {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McLearnerStarterDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McLearnerStarterDTO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McLearnerStarterDTO.java	8 May 2013 13:18:25 -0000	1.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McLearnerStarterDTO.java	17 Jan 2014 22:04:49 -0000	1.5
@@ -37,26 +37,9 @@
 
     protected String activityTitle;
 
-    protected String toolActivityOffline;
-
     protected Date submissionDeadline;
 
     /**
-     * @return Returns the toolActivityOffline.
-     */
-    public String getToolActivityOffline() {
-	return toolActivityOffline;
-    }
-
-    /**
-     * @param toolActivityOffline
-     *            The toolActivityOffline to set.
-     */
-    public void setToolActivityOffline(String toolActivityOffline) {
-	this.toolActivityOffline = toolActivityOffline;
-    }
-
-    /**
      * @return Returns the activityTitle.
      */
     public String getActivityTitle() {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v
diff -u -r1.59 -r1.60
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	3 Sep 2013 16:56:41 -0000	1.59
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	17 Jan 2014 22:04:49 -0000	1.60
@@ -36,7 +36,6 @@
 
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
-import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.web.McAuthoringForm;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -123,10 +122,6 @@
 	return mapOptionsContent;
     }
 
-    public static void configureContentRepository(HttpServletRequest request, IMcService mcService) {
-	mcService.configureContentRepository();
-    }
-
     /**
      * temporary function
      * 
@@ -197,17 +192,6 @@
     }
 
     /**
-     * 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..
-     * 
-     * @param mcContent
-     * @return boolean
-     */
-    public static boolean isRunOffline(McContent mcContent) {
-	return mcContent.isRunOffline();
-    }
-
-    /**
      * the only attributes kept are TOOL_SESSION and TOOL_CONTENT_ID and CURRENT_MONITORED_TOOL_SESSION
      * cleanUpSessionAbsolute(HttpServletRequest request)
      * 
@@ -284,21 +268,13 @@
 	request.getSession().removeAttribute(ON);
 	request.getSession().removeAttribute(OFF);
 	request.getSession().removeAttribute(RICHTEXT_FEEDBACK_INCORRECT);
-	request.getSession().removeAttribute(RICHTEXT_OFFLINEINSTRUCTIONS);
 	request.getSession().removeAttribute(PASSMARK);
 	request.getSession().removeAttribute(SHOW_AUTHORING_TABS);
-	request.getSession().removeAttribute(RICHTEXT_ONLINEINSTRUCTIONS);
 	request.getSession().removeAttribute(RICHTEXT_REPORT_TITLE);
 	// request.getSession().removeAttribute(RICHTEXT_END_LEARNING_MSG);
 	request.getSession().removeAttribute(RICHTEXT_TITLE);
 	request.getSession().removeAttribute(RICHTEXT_INSTRUCTIONS);
 	request.getSession().removeAttribute(RICHTEXT_BLANK);
-	request.getSession().removeAttribute(SUBMIT_OFFLINE_FILE);
-	request.getSession().removeAttribute(SUBMIT_ONLINE_FILE);
-	request.getSession().removeAttribute(LIST_UPLOADED_OFFLINE_FILENAMES);
-	request.getSession().removeAttribute(LIST_UPLOADED_ONLINE_FILENAMES);
-	request.getSession().removeAttribute(LIST_OFFLINEFILES_METADATA);
-	request.getSession().removeAttribute(LIST_ONLINEFILES_METADATA);
 	request.getSession().removeAttribute(COUNT_SESSION_COMPLETE);
 	request.getSession().removeAttribute(COUNT_ALL_USERS);
 	request.getSession().removeAttribute(COUNT_MAX_ATTEMPT);
@@ -326,7 +302,6 @@
 	request.getSession().removeAttribute(USER_FEEDBACK);
 	request.getSession().removeAttribute(REPORT_TITLE_LEARNER);
 	request.getSession().removeAttribute(TOTAL_COUNT_REACHED);
-	request.getSession().removeAttribute(IS_TOOL_ACTIVITY_OFFLINE);
 	request.getSession().removeAttribute(IS_USERNAME_VISIBLE);
 	request.getSession().removeAttribute(IS_CONTENT_IN_USE);
 	request.getSession().removeAttribute(IS_RETRIES);
@@ -399,9 +374,6 @@
 	    McGeneralAuthoringDTO mcGeneralAuthoringDTO) {
 	mcGeneralAuthoringDTO.setActivityTitle(defaultMcContent.getTitle());
 	mcGeneralAuthoringDTO.setActivityInstructions(defaultMcContent.getInstructions());
-
-	mcGeneralAuthoringDTO.setOnlineInstructions(defaultMcContent.getOnlineInstructions());
-	mcGeneralAuthoringDTO.setOfflineInstructions(defaultMcContent.getOfflineInstructions());
     }
 
     /**
@@ -468,14 +440,6 @@
 	mcAuthoringForm.setRetries(retries);
 	mcGeneralAuthoringDTO.setRetries(retries);
 
-	String offlineInstructions = request.getParameter(OFFLINE_INSTRUCTIONS);
-	mcAuthoringForm.setOfflineInstructions(offlineInstructions);
-	mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	String onlineInstructions = request.getParameter(ONLINE_INSTRUCTIONS);
-	mcAuthoringForm.setOnlineInstructions(onlineInstructions);
-	mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
 	String reflect = request.getParameter(REFLECT);
 	mcAuthoringForm.setReflect(reflect);
 	mcGeneralAuthoringDTO.setReflect(reflect);
@@ -488,60 +452,4 @@
 	mcGeneralAuthoringDTO.setPassMarkValue(passmark);
     }
 
-    /**
-     * 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();
-	    McUploadedFile attachment = null;
-	    while (iter.hasNext() && attachment == null) {
-		McUploadedFile value = (McUploadedFile) iter.next();
-		if (uuid.equals(value.getUuid())) {
-		    attachment = value;
-		}
-
-	    }
-	    if (attachment != null) {
-		deletedList.add(attachment);
-		attachmentsList.remove(attachment);
-	    }
-	}
-
-	return deletedList;
-    }
-
-    /**
-     * 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 filename, boolean isOnline, List attachmentsList, List deletedAttachmentsList) {
-
-	List deletedList = deletedAttachmentsList != null ? deletedAttachmentsList : new ArrayList();
-
-	if (attachmentsList != null) {
-	    Iterator iter = attachmentsList.iterator();
-	    McUploadedFile attachment = null;
-	    while (iter.hasNext() && attachment == null) {
-		McUploadedFile value = (McUploadedFile) iter.next();
-		if (filename.equals(value.getFileName()) && isOnline == value.isFileOnline()) {
-		    attachment = value;
-		}
-
-	    }
-	    if (attachment != null) {
-		deletedList.add(attachment);
-		attachmentsList.remove(attachment);
-	    }
-	}
-
-	return deletedList;
-    }
-
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml,v
diff -u -r1.21 -r1.22
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	8 Jan 2014 17:49:42 -0000	1.21
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	17 Jan 2014 22:04:49 -0000	1.22
@@ -41,11 +41,6 @@
 	<bean id="mcUsrAttemptDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUsrAttemptDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
-
-
-	<bean id="mcUploadedFileDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUploadedFileDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
 	
 	<bean id="mcToolContentHandler" class="org.lamsfoundation.lams.tool.mc.util.McToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
@@ -74,10 +69,8 @@
 					<property name="mcUserDAO"><ref bean="mcUserDAO"/></property>
 					<property name="mcQueContentDAO"><ref bean="mcQueContentDAO"/></property>
 					<property name="mcOptionsContentDAO"><ref bean="mcOptionsContentDAO"/></property>								
-					<property name="mcUsrAttemptDAO"><ref bean="mcUsrAttemptDAO"/></property>													
-			 		<property name="mcUploadedFileDAO"><ref bean="mcUploadedFileDAO"/></property>
+					<property name="mcUsrAttemptDAO"><ref bean="mcUsrAttemptDAO"/></property>	
 					<property name="toolService"><ref bean="lamsToolService"/></property>
-			 		<property name="repositoryService"><ref bean="repositoryService"/></property>
 			 		<property name="learnerService"><ref bean="learnerService"/></property>		
 					<property name="mcToolContentHandler"><ref bean="mcToolContentHandler"/></property>		
 					<property name="auditService"><ref bean="auditService"/></property>					
Fisheye: Tag 1.16 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.15 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUploadedFileDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20140102.sql	17 Jan 2014 22:04:49 -0000	1.1
@@ -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_lamc11_content DROP COLUMN online_instructions;
+ALTER TABLE tl_lamc11_content DROP COLUMN offline_instructions;
+ALTER TABLE tl_lamc11_content DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lamc11_uploadedfile;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lamc11';
+
+----------------------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_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java,v
diff -u -r1.22 -r1.23
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	8 Jan 2014 17:49:42 -0000	1.22
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	17 Jan 2014 22:04:49 -0000	1.23
@@ -61,8 +61,6 @@
 
     private boolean defineLater;
 
-    private boolean runOffline;
-
     /** nullable persistent field */
     private boolean reflect;
 
@@ -82,12 +80,6 @@
     private boolean contentInUse;
 
     /** nullable persistent field */
-    private String offlineInstructions;
-
-    /** nullable persistent field */
-    private String onlineInstructions;
-
-    /** nullable persistent field */
     private boolean retries;
 
     private boolean showReport;
@@ -102,7 +94,7 @@
     
     private boolean prefixAnswersWithLetters;
     
-    /* LDEV-2657 */
+    /** nullable persistent field */
     private Date submissionDeadline;
 
     /** nullable persistent field */
@@ -116,30 +108,23 @@
     /** persistent field */
     private Set mcSessions;
 
-    /** persistent field */
-    private Set mcAttachments;
-
     /** full constructor */
     public McContent(Long mcContentId, String content, String title, String instructions, boolean defineLater,
-	    boolean runOffline, Date creationDate, Date updateDate, boolean questionsSequenced, long createdBy,
-	    boolean contentInUse, String offlineInstructions, String onlineInstructions, Integer passMark,
-	    boolean showReport, boolean randomize, boolean displayAnswers, boolean showMarks,
+	    Date creationDate, Date updateDate, boolean questionsSequenced, long createdBy, boolean contentInUse,
+	    Integer passMark, boolean showReport, boolean randomize, boolean displayAnswers, boolean showMarks,
 	    boolean useSelectLeaderToolOuput, boolean prefixAnswersWithLetters, boolean retries, boolean reflect,
-	    String reflectionSubject, Set mcQueContents, Set mcSessions, Set mcAttachments) {
-
+	    String reflectionSubject, Set mcQueContents, Set mcSessions) {
+	
 	this.mcContentId = mcContentId;
 	this.content = content;
 	this.title = title;
 	this.instructions = instructions;
 	this.defineLater = defineLater;
-	this.runOffline = runOffline;
 	this.creationDate = creationDate;
 	this.updateDate = updateDate;
 	this.questionsSequenced = questionsSequenced;
 	this.createdBy = createdBy;
 	this.contentInUse = contentInUse;
-	this.offlineInstructions = offlineInstructions;
-	this.onlineInstructions = onlineInstructions;
 	this.retries = retries;
 	this.reflectionSubject = reflectionSubject;
 	this.reflect = reflect;
@@ -152,7 +137,6 @@
 	this.prefixAnswersWithLetters = prefixAnswersWithLetters;
 	this.mcQueContents = mcQueContents;
 	this.mcSessions = mcSessions;
-	this.mcAttachments = mcAttachments;
     }
 
     /** default constructor */
@@ -181,14 +165,12 @@
     public static McContent newInstance(IToolContentHandler toolContentHandler, McContent mc, Long newContentId)
 	    throws ItemNotFoundException, RepositoryCheckedException {
 	McContent newContent = new McContent(newContentId, mc.getContent(), mc.getTitle(), mc.getInstructions(),
-		mc.isDefineLater(), mc.isRunOffline(), mc.getCreationDate(), mc.getUpdateDate(),
-		mc.isQuestionsSequenced(), mc.getCreatedBy(), mc.isContentInUse(), mc.getOfflineInstructions(),
-		mc.getOnlineInstructions(), mc.getPassMark(), mc.isShowReport(), mc.isRandomize(),
+		mc.isDefineLater(), mc.getCreationDate(), mc.getUpdateDate(),
+		mc.isQuestionsSequenced(), mc.getCreatedBy(), mc.isContentInUse(), mc.getPassMark(), mc.isShowReport(), mc.isRandomize(),
 		mc.isDisplayAnswers(), mc.isShowMarks(), mc.isUseSelectLeaderToolOuput(),
 		mc.isPrefixAnswersWithLetters(), mc.isRetries(), mc.isReflect(), mc.getReflectionSubject(),
-		new TreeSet(), new TreeSet(), new TreeSet());
+		new TreeSet(), new TreeSet());
 	newContent.setMcQueContents(mc.deepCopyMcQueContent(newContent));
-	newContent.setMcAttachments(mc.deepCopyMcAttachments(toolContentHandler, newContent));
 
 	return newContent;
     }
@@ -212,26 +194,6 @@
 	return newMcQueContent;
     }
 
-    /**
-     * gets called as part of the copyToolContent
-     * 
-     * @param newMcContent
-     * @return Set
-     */
-    public Set deepCopyMcAttachments(IToolContentHandler toolContentHandler, McContent newMcContent)
-	    throws ItemNotFoundException, RepositoryCheckedException {
-	Set newMcQueContent = new TreeSet();
-	for (Iterator i = this.getMcAttachments().iterator(); i.hasNext();) {
-	    McUploadedFile mcUploadedFile = (McUploadedFile) i.next();
-	    if (mcUploadedFile.getMcContent() != null) {
-		McUploadedFile newMcUploadedFile = McUploadedFile.newInstance(toolContentHandler, mcUploadedFile,
-			newMcContent);
-		newMcQueContent.add(newMcUploadedFile);
-	    }
-	}
-	return newMcQueContent;
-    }
-
     public Long getUid() {
 	return this.uid;
     }
@@ -272,14 +234,6 @@
 	this.defineLater = defineLater;
     }
 
-    public boolean isRunOffline() {
-	return this.runOffline;
-    }
-
-    public void setRunOffline(boolean runOffline) {
-	this.runOffline = runOffline;
-    }
-
     public Date getUpdateDate() {
 	return this.updateDate;
     }
@@ -312,22 +266,6 @@
 	this.contentInUse = contentInUse;
     }
 
-    public String getOfflineInstructions() {
-	return this.offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    public String getOnlineInstructions() {
-	return this.onlineInstructions;
-    }
-
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
     public Integer getPassMark() {
 	return this.passMark;
     }
@@ -391,24 +329,6 @@
     }
 
     /**
-     * @return Returns the mcAttachments.
-     */
-    public Set getMcAttachments() {
-	if (mcAttachments == null)
-	    mcAttachments = new TreeSet();
-
-	return mcAttachments;
-    }
-
-    /**
-     * @param mcAttachments
-     *            The mcAttachments to set.
-     */
-    public void setMcAttachments(Set mcAttachments) {
-	this.mcAttachments = mcAttachments;
-    }
-
-    /**
      * @return Returns the creationDate.
      */
     public Date getCreationDate() {
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUploadedFile.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java,v
diff -u -r1.73 -r1.74
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	8 Jan 2014 17:49:42 -0000	1.73
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	17 Jan 2014 22:04:49 -0000	1.74
@@ -26,12 +26,9 @@
 import java.io.InputStream;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.lamsfoundation.lams.contentrepository.ITicket;
 import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.IToolVO;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
@@ -48,9 +45,7 @@
 import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
 import org.lamsfoundation.lams.tool.mc.pojos.McSession;
-import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
-import org.lamsfoundation.lams.usermanagement.User;
 
 /**
  * @author Ozgur Demirtas
@@ -82,7 +77,6 @@
      */
     void copyAnswersFromLeader(McQueUsr user, McQueUsr leader);
     
-    void configureContentRepository() throws McApplicationException;
 
     void createMc(McContent mcContent) throws McApplicationException;
 
@@ -184,10 +178,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;
 
@@ -210,24 +200,8 @@
 
     McQueContent getToolDefaultQuestionContent(long contentId) throws McApplicationException;
 
-    ITicket getRepositoryLoginTicket() throws McApplicationException;
-
-    void deleteFromRepository(Long uuid, Long versionID);
-
-    NodeKey uploadFileToRepository(InputStream stream, String fileName) throws McApplicationException;
-
-    InputStream downloadFile(Long uuid, Long versionID) throws McApplicationException;
-
-    void persistFile(String uuid, boolean isOnlineFile, String fileName, McContent mcContent)
-	    throws McApplicationException;
-
     List getNextAvailableDisplayOrder(final long mcContentId) throws McApplicationException;
 
-    NodeKey uploadFile(InputStream istream, String filename, String contentType, String fileType)
-	    throws RepositoryCheckedException;
-
-    NodeKey copyFile(Long uuid) throws RepositoryCheckedException;
-
     List findMcOptionCorrectByQueId(Long mcQueContentId) throws McApplicationException;
 
     Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry);
@@ -236,12 +210,6 @@
 
     void updateEntry(NotebookEntry notebookEntry);
 
-    void persistFile(McContent content, McUploadedFile file) throws McApplicationException;
-
-    void removeFile(Long submissionId) throws McApplicationException;
-
-    List<McUploadedFile> retrieveMcUploadedFiles(McContent mcContent) throws McApplicationException;
-
     /**
      * Return the top, lowest and average mark for all learners for one particular tool session.
      * 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java,v
diff -u -r1.8 -r1.9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	8 May 2013 13:18:26 -0000	1.8
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	17 Jan 2014 22:04:49 -0000	1.9
@@ -36,6 +36,15 @@
 	// Adds displayAnswers LDEV-1156
 
 	this.addField(McContent.class, "displayAnswers", new Boolean(true));
-
     }
+    
+    /**
+     * Import 20140101 version content to 20140102 version tool server.
+     */
+    public void up20140101To20140102() {
+	this.removeField(McContent.class, "runOffline");
+	this.removeField(McContent.class, "onlineInstructions");
+	this.removeField(McContent.class, "offlineInstructions");
+	this.removeField(McContent.class, "mcAttachments");
+    }
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.120 -r1.121
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	8 Jan 2014 17:49:42 -0000	1.120
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	17 Jan 2014 22:04:49 -0000	1.121
@@ -96,15 +96,13 @@
 import org.lamsfoundation.lams.tool.mc.dao.IMcOptionsContentDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcQueContentDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcSessionDAO;
-import org.lamsfoundation.lams.tool.mc.dao.IMcUploadedFileDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcUsrAttemptDAO;
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
 import org.lamsfoundation.lams.tool.mc.pojos.McSession;
-import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
 import org.lamsfoundation.lams.tool.mc.util.McSessionComparator;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
@@ -132,20 +130,12 @@
 	McAppConstants {
     static Logger logger = Logger.getLogger(McServicePOJO.class.getName());
 
-    /* repository access related constants */
-    private final String repositoryUser = "lamc11";
-    private final char[] repositoryId = { 'l', 'a', 'm', 'c', '_', '1', '1' };
-    private final String repositoryWorkspace = "lamc11";
-    private IRepositoryService repositoryService;
-    private ICredentials cred;
-
     private IMcContentDAO mcContentDAO;
     private IMcQueContentDAO mcQueContentDAO;
     private IMcOptionsContentDAO mcOptionsContentDAO;
     private IMcSessionDAO mcSessionDAO;
     private IMcUserDAO mcUserDAO;
     private IMcUsrAttemptDAO mcUsrAttemptDAO;
-    private IMcUploadedFileDAO mcUploadedFileDAO;
     private MCOutputFactory mcOutputFactory;
 
     private IAuditService auditService;
@@ -242,22 +232,6 @@
 	}
     }
 
-    public void configureContentRepository() throws McApplicationException {
-	cred = new SimpleCredentials(repositoryUser, repositoryId);
-	try {
-	    repositoryService.createCredentials(cred);
-	    repositoryService.addWorkspace(cred, repositoryWorkspace);
-	} catch (ItemExistsException ie) {
-	    McServicePOJO.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();
-	    McServicePOJO.logger.error(error, e);
-	    throw new McApplicationException(error, e);
-	}
-    }
-
     public void createMc(McContent mcContent) throws McApplicationException {
 	try {
 	    mcContentDAO.saveMcContent(mcContent);
@@ -1355,20 +1329,6 @@
 	McContent mcContent = mcContentDAO.findMcContentById(toolContentId);
 
 	if (mcContent != null) {
-	    Iterator filesIterator = mcContent.getMcAttachments().iterator();
-	    while (filesIterator.hasNext()) {
-		McUploadedFile mcUploadedFile = (McUploadedFile) filesIterator.next();
-		String filesUuid = mcUploadedFile.getUuid();
-		if (filesUuid != null && filesUuid.length() > 0) {
-		    try {
-			mcToolContentHandler.deleteFile(new Long(filesUuid));
-		    } catch (RepositoryCheckedException e) {
-			McServicePOJO.logger.error("exception occured deleting files from content repository : " + e);
-			throw new ToolException("undeletable file in the content repository");
-		    }
-		}
-	    }
-
 	    Iterator sessionIterator = mcContent.getMcSessions().iterator();
 	    while (sessionIterator.hasNext()) {
 		if (removeSessionData == false) {
@@ -1392,51 +1352,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) {
-	    McServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved toolContentId is null.");
-	    throw new DataMissingException("toolContentId is missing");
-	}
-
-	McContent mcContent = retrieveMc(toolContentId);
-	if (mcContent == null) {
-	    McServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved mcContent is null.");
-	    throw new DataMissingException("mcContent is missing");
-	}
-	mcContent.setDefineLater(value);
-	saveMcContent(mcContent);
-    }
-
-    /**
-     * 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) {
-	    McServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved toolContentId is null.");
-	    throw new DataMissingException("toolContentId is missing");
-	}
-	McContent mcContent = mcContentDAO.findMcContentById(toolContentId);
-	if (mcContent == null) {
-	    McServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved mcContent is null.");
-	    throw new DataMissingException("mcContent is missing");
-	}
-	mcContent.setRunOffline(value);
-	saveMcContent(mcContent);
-    }
-
-    /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
      * @throws DataMissingException
@@ -1459,11 +1374,6 @@
 	    // set ToolContentHandler as null to avoid copy file node in repository again.
 	    toolContentObj = McContent.newInstance(null, toolContentObj, toolContentId);
 	    toolContentObj.setMcSessions(null);
-	    Set<McUploadedFile> files = toolContentObj.getMcAttachments();
-	    for (McUploadedFile file : files) {
-		file.setMcContent(null);
-	    }
-	    exportContentService.registerFileClassForExport(McUploadedFile.class.getName(), "uuid", null);
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, mcToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -1483,10 +1393,6 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    // register File node class
-	    exportContentService.registerFileClassForImport(McUploadedFile.class.getName(), "uuid", null, "fileName",
-		    "fileProperty", null, null);
-
 	    // register version filter class
 	    exportContentService.registerImportVersionFilterClass(McImportContentVersionFilter.class);
 
@@ -1501,11 +1407,6 @@
 	    // reset it to new toolContentId
 	    toolContentObj.setMcContentId(toolContentId);
 	    toolContentObj.setCreatedBy(newUserUid);
-	    Set<McUploadedFile> files = toolContentObj.getMcAttachments();
-	    for (McUploadedFile file : files) {
-		// file.setMcContentId(toolContentId);
-		file.setMcContent(toolContentObj);
-	    }
 	    mcContentDAO.saveMcContent(toolContentObj);
 	} catch (ImportToolContentException e) {
 	    throw new ToolException(e);
@@ -1758,171 +1659,11 @@
 	return mcQueContent;
     }
 
-    public void removeAttachment(McContent content, McUploadedFile attachment) throws RepositoryCheckedException {
-	try {
-	    attachment.setMcContent(null);
-	    content.getMcAttachments().remove(attachment);
-	    mcToolContentHandler.deleteFile(new Long(attachment.getUuid()));
-	    saveMcContent(content);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException(
-		    "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 mcToolContentHandler.uploadFile(istream, filename, contentType, fileType);
-    }
-
-    public NodeKey copyFile(Long uuid) throws RepositoryCheckedException {
-	return mcToolContentHandler.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 McApplicationException {
-	ICredentials credentials = new SimpleCredentials(repositoryUser, repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials, repositoryWorkspace);
-	    return ticket;
-	} catch (AccessDeniedException e) {
-	    throw new McApplicationException("Access Denied to repository." + e.getMessage());
-	} catch (WorkspaceNotFoundException e) {
-	    throw new McApplicationException("Workspace not found." + e.getMessage());
-	} catch (LoginException e) {
-	    throw new McApplicationException("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 McApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    String files[] = repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new McApplicationException("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 McApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-
-	try {
-	    NodeKey nodeKey = repositoryService.addFileItem(ticket, stream, fileName, null, null);
-	    return nodeKey;
-	} catch (Exception e) {
-	    throw new McApplicationException("Exception occured while trying to" + " upload file into the repository"
-		    + e.getMessage());
-	}
-    }
-
-    public InputStream downloadFile(Long uuid, Long versionID) throws McApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    IVersionedNode node = repositoryService.getFileItem(ticket, uuid, null);
-	    return node.getFile();
-	} catch (AccessDeniedException e) {
-	    throw new McApplicationException("AccessDeniedException occured while trying to download file "
-		    + e.getMessage());
-	} catch (FileException e) {
-	    throw new McApplicationException("FileException occured while trying to download file " + e.getMessage());
-	} catch (ItemNotFoundException e) {
-	    throw new McApplicationException("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, McContent mcContent)
-	    throws McApplicationException {
-
-	McUploadedFile mcUploadedFile = new McUploadedFile(uuid, isOnlineFile, fileName, mcContent);
-	mcUploadedFileDAO.saveUploadFile(mcUploadedFile);
-    }
-
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
 
     /**
-     * @return Returns the cred.
-     */
-    public ICredentials getCred() {
-	return cred;
-    }
-
-    /**
-     * @param cred
-     *            The cred to set.
-     */
-    public void setCred(ICredentials cred) {
-	this.cred = cred;
-    }
-
-    /*
-     * !!! COMPLETE THIS !!! public IMcUploadedFileDAO getMcUploadedFileDAO() { return mcUploadedFileDAO; }
-     * 
-     * public void setMcUploadedFileDAO(IMcUploadedFileDAO mcUploadedFileDAO) { this.mcUploadedFileDAO =
-     * mcUploadedFileDAO; }
-     */
-
-    /**
-     * @return Returns the repositoryId.
-     */
-    public char[] getRepositoryId() {
-	return repositoryId;
-    }
-
-    /**
-     * @return Returns the repositoryUser.
-     */
-    public String getRepositoryUser() {
-	return repositoryUser;
-    }
-
-    /**
-     * @return Returns the repositoryWorkspace.
-     */
-    public String getRepositoryWorkspace() {
-	return repositoryWorkspace;
-    }
-
-    /**
      * @return Returns the toolService.
      */
     public ILamsToolService getToolService() {
@@ -2026,21 +1767,6 @@
 	this.mcUsrAttemptDAO = mcUsrAttemptDAO;
     }
 
-    /**
-     * @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;
     }
@@ -2050,21 +1776,6 @@
     }
 
     /**
-     * @return Returns the mcUploadedFileDAO.
-     */
-    public IMcUploadedFileDAO getMcUploadedFileDAO() {
-	return mcUploadedFileDAO;
-    }
-
-    /**
-     * @param mcUploadedFileDAO
-     *            The mcUploadedFileDAO to set.
-     */
-    public void setMcUploadedFileDAO(IMcUploadedFileDAO mcUploadedFileDAO) {
-	this.mcUploadedFileDAO = mcUploadedFileDAO;
-    }
-
-    /**
      * @return Returns the mcToolContentHandler.
      */
     public IToolContentHandler getMcToolContentHandler() {
@@ -2128,11 +1839,8 @@
 	toolContentObj.setDefineLater(false);
 	toolContentObj.setInstructions(WebUtil.convertNewlines((String) importValues
 		.get(ToolContentImport102Manager.CONTENT_BODY)));
-	toolContentObj.setOfflineInstructions(null);
-	toolContentObj.setOnlineInstructions(null);
 	toolContentObj.setReflect(false);
 	toolContentObj.setReflectionSubject(null);
-	toolContentObj.setRunOffline(false);
 	toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 
 	toolContentObj.setContent(null);
@@ -2297,32 +2005,6 @@
 	toolContentObj.setReflectionSubject(description);
     }
 
-    public List<McUploadedFile> retrieveMcUploadedFiles(McContent mc) throws McApplicationException {
-	try {
-	    return mcUploadedFileDAO.retrieveMcUploadedFiles(mc);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is loading mc uploaded files: "
-		    + e.getMessage(), e);
-	}
-    }
-
-    /**
-     * adds a new entry to the uploaded files table
-     */
-    public void persistFile(McContent content, McUploadedFile file) throws McApplicationException {
-
-	content.getMcAttachments().add(file);
-	file.setMcContent(content);
-	mcContentDAO.saveOrUpdateMc(content);
-    }
-
-    /**
-     * removes an entry from the uploaded files table
-     */
-    public void removeFile(Long submissionId) throws McApplicationException {
-	mcUploadedFileDAO.removeUploadFile(submissionId);
-    }
-
     public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) {
 	return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry);
     }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java,v
diff -u -r1.69 -r1.70
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	8 Jan 2014 17:49:42 -0000	1.69
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	17 Jan 2014 22:04:48 -0000	1.70
@@ -1013,9 +1013,6 @@
 
 	String reflect = request.getParameter(McAppConstants.REFLECT);
 
-	String richTextOfflineInstructions = request.getParameter(McAppConstants.OFFLINE_INSTRUCTIONS);
-	String richTextOnlineInstructions = request.getParameter(McAppConstants.ONLINE_INSTRUCTIONS);
-
 	String reflectionSubject = request.getParameter(McAppConstants.REFLECTION_SUBJECT);
 
 	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
@@ -1115,8 +1112,6 @@
 	AuthoringUtil.logger.debug("activeModule:" + activeModule);
 	if (activeModule.equals(McAppConstants.AUTHORING)) {
 	    // setting other content values
-	    mcContent.setOnlineInstructions(richTextOnlineInstructions);
-	    mcContent.setOfflineInstructions(richTextOfflineInstructions);
 	    mcContent.setQuestionsSequenced(questionsSequencedBoolean);
 	    mcContent.setRandomize(randomizeBoolean);
 	    mcContent.setDisplayAnswers(displayAnswersBoolean);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java	8 May 2013 13:18:25 -0000	1.7
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java	17 Jan 2014 22:04:48 -0000	1.8
@@ -61,16 +61,10 @@
 	    session.removeAttribute(McAction.USER_EXCEPTION_ANSWERS_DUPLICATE);
 	    session.removeAttribute(McAction.USER_EXCEPTION_ANSWER_EMPTY);
 	    session.removeAttribute(McAction.USER_EXCEPTION_NO_TOOL_SESSIONS);
-	    session.removeAttribute(McAction.LIST_UPLOADED_OFFLINE_FILENAMES);
-	    session.removeAttribute(McAction.LIST_UPLOADED_ONLINE_FILENAMES);
 	    session.removeAttribute(McAction.CREATION_DATE);
-	    session.removeAttribute(McAction.LIST_OFFLINEFILES_METADATA);
-	    session.removeAttribute(McAction.LIST_ONLINEFILES_METADATA);
 	    session.removeAttribute(McAction.QUESTIONS_WITHNO_OPTIONS);
 	    session.removeAttribute(McAction.RICHTEXT_CORRECT_FEEDBACK);
 	    // session.removeAttribute(McAction.RICHTEXT_END_LEARNING_MSG);
-	    session.removeAttribute(McAction.RICHTEXT_OFFLINEINSTRUCTIONS);
-	    session.removeAttribute(McAction.RICHTEXT_ONLINEINSTRUCTIONS);
 	    session.removeAttribute(McAction.RICHTEXT_INSTRUCTIONS);
 	    session.removeAttribute(McAction.MAP_STARTUP_GENERAL_OPTIONS_CONTENT);
 	    session.removeAttribute(McAction.MAP_STARTUP_GENERAL_OPTIONS_QUEID);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java,v
diff -u -r1.25 -r1.26
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	6 Jan 2014 08:42:25 -0000	1.25
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	17 Jan 2014 22:04:48 -0000	1.26
@@ -80,27 +80,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 {
-	    IMcService mcService = McServiceProxy.getMcService(getServletContext());
-	    McContent content = null;
-	    if (toolContentID != null) {
-		content = mcService.retrieveMc(toolContentID);
-	    } else {
-		McSession session = mcService.getMcSessionById(toolSessionID);
-		if (session != null)
-		    content = session.getMcContent();
-	    }
-	    if (content != null) {
-		activityTitle = content.getTitle();
-	    }
-	}
-	return super.doOfflineExport(request, response, directoryName, cookies);
-    }
-
     /**
      * learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
      * 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v
diff -u -r1.138 -r1.139
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	26 Jul 2013 16:10:44 -0000	1.138
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	17 Jan 2014 22:04:48 -0000	1.139
@@ -62,7 +62,6 @@
 import org.lamsfoundation.lams.tool.mc.McQuestionContentDTO;
 import org.lamsfoundation.lams.tool.mc.McUtils;
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
-import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
 import org.lamsfoundation.lams.tool.mc.util.McToolContentHandler;
@@ -166,27 +165,6 @@
 
 	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-
-	}
-
 	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
 
 	String richTextTitle = request.getParameter(McAppConstants.TITLE);
@@ -232,15 +210,6 @@
 
 	    authoringUtil.reOrganizeDisplayOrder(mapQuestionContent, mcService, mcAuthoringForm, mcContent);
 
-	    if (activeModule.equals(McAppConstants.AUTHORING)) {
-
-		List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-
-		List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-		
-		saveAttachments(mcContent, attachmentList, deletedAttachmentList, mapping, request);
-	    }
-
 	    McUtils.setDefineLater(request, false, strToolContentID, mcService);
 	    // define later set to false
 
@@ -578,27 +547,6 @@
 	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
 	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-
-	}
-
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -783,13 +731,6 @@
 	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
 		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 
 	AuthoringUtil authoringUtil = new AuthoringUtil();
@@ -948,13 +889,6 @@
 
 	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
 	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
 
@@ -1068,25 +1002,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	AuthoringUtil authoringUtil = new AuthoringUtil();
 
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
@@ -1190,25 +1105,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	AuthoringUtil authoringUtil = new AuthoringUtil();
 
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
@@ -1296,25 +1192,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	AuthoringUtil authoringUtil = new AuthoringUtil();
 
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
@@ -1357,253 +1234,10 @@
 
 	return (mapping.findForward("itemList"));
     }
+ 
 
     /**
      * 
-     * adds a new file to content repository
-     * 
-     * @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 {
-	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-
-	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
-
-	String httpSessionID = mcAuthoringForm.getHttpSessionID();
-
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	mcAuthoringForm.setContentFolderID(contentFolderID);
-
-	String totalMarks = request.getParameter("totalMarks");
-
-	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
-
-	String onlineInstructions = request.getParameter(McAppConstants.ONLINE_INSTRUCTIONS);
-
-	String offlineInstructions = request.getParameter(McAppConstants.OFFLINE_INSTRUCTIONS);
-
-	sessionMap.put(McAppConstants.ONLINE_INSTRUCTIONS_KEY, onlineInstructions);
-	sessionMap.put(McAppConstants.OFFLINE_INSTRUCTIONS, offlineInstructions);
-
-	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
-
-	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
-
-	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-
-	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
-		.toString();
-
-	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
-
-	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
-	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-
-	mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-	mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
-
-	String richTextTitle = request.getParameter(McAppConstants.TITLE);
-	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
-
-	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	mcAuthoringForm.setTitle(richTextTitle);
-
-	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-
-	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
-	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-
-	List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	addFileToContentRepository(request, mcAuthoringForm, attachmentList, deletedAttachmentList, sessionMap,
-		mcGeneralAuthoringDTO);
-
-	sessionMap.put(McAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
-	sessionMap.put(McAppConstants.DELETED_ATTACHMENT_LIST_KEY, deletedAttachmentList);
-
-	mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
-		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-
-	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-	mcGeneralAuthoringDTO.setActiveModule(activeModule);
-	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-	mcAuthoringForm.setToolContentID(strToolContentID);
-	mcAuthoringForm.setHttpSessionID(httpSessionID);
-	mcAuthoringForm.setActiveModule(activeModule);
-	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-	mcAuthoringForm.setCurrentTab("3");
-
-	AuthoringUtil authoringUtil = new AuthoringUtil();
-	Map marksMap = authoringUtil.buildMarksMap();
-	mcGeneralAuthoringDTO.setMarksMap(marksMap);
-
-	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-
-	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
-	mcAuthoringForm.setTotalMarks(totalMark);
-	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
-
-	Map correctMap = authoringUtil.buildCorrectMap();
-	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-
-	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-
-	mcAuthoringForm.resetUserAction();
-
-	String strOnlineInstructions = request.getParameter("onlineInstructions");
-	String strOfflineInstructions = request.getParameter("offlineInstructions");
-	mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-
-	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-
-	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
-    }
-
-    /**
-     * 
-     * deletes a file from the content repository
-     * 
-     * @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 {
-	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-
-	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
-
-	String httpSessionID = mcAuthoringForm.getHttpSessionID();
-
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	mcAuthoringForm.setContentFolderID(contentFolderID);
-
-	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
-
-	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-
-	String totalMarks = request.getParameter("totalMarks");
-
-	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
-		.toString();
-
-	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
-
-	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
-
-	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
-
-	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
-	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-
-	mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
-
-	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
-		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-
-	String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-
-	String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-
-	mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-	mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-	mcAuthoringForm.setOnlineInstructions(onlineInstructions);
-	mcAuthoringForm.setOfflineInstructions(offlineInstructions);
-
-	String richTextTitle = (String) sessionMap.get(McAppConstants.ACTIVITY_TITLE_KEY);
-	String richTextInstructions = (String) sessionMap.get(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY);
-	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	mcAuthoringForm.setTitle(richTextTitle);
-
-	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-
-	long uuid = WebUtil.readLongParam(request, McAppConstants.UUID);
-
-	List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-
-	if (attachmentList == null) {
-	    attachmentList = new ArrayList();
-	}
-
-	List deletedAttachmentList = (List) sessionMap.get(McAppConstants.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 = McUtils.moveToDelete(Long.toString(uuid), attachmentList, deletedAttachmentList);
-
-	sessionMap.put(McAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
-	sessionMap.put(McAppConstants.DELETED_ATTACHMENT_LIST_KEY, deletedAttachmentList);
-
-	mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-	mcGeneralAuthoringDTO.setActiveModule(activeModule);
-	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-	mcAuthoringForm.setToolContentID(strToolContentID);
-	mcAuthoringForm.setHttpSessionID(httpSessionID);
-	mcAuthoringForm.setActiveModule(activeModule);
-	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-	mcAuthoringForm.setCurrentTab("3");
-
-	AuthoringUtil authoringUtil = new AuthoringUtil();
-	Map marksMap = authoringUtil.buildMarksMap();
-	mcGeneralAuthoringDTO.setMarksMap(marksMap);
-
-	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-
-	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
-	mcAuthoringForm.setTotalMarks(totalMark);
-	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
-
-	Map correctMap = authoringUtil.buildCorrectMap();
-	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-
-	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-
-	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-
-	mcAuthoringForm.resetUserAction();
-	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
-    }
-
-    /**
-     * 
      * persists error messages to request scope
      * 
      * @param request
@@ -1615,93 +1249,6 @@
 	saveErrors(request, errors);
     }
 
-    /**
-     * addFileToContentRepository(HttpServletRequest request, McAuthoringForm mcAuthoringForm, List attachmentList, List
-     * deletedAttachmentList, SessionMap sessionMap, McGeneralAuthoringDTO mcGeneralAuthoringDTO)
-     * 
-     * @param request
-     * @param mcAuthoringForm
-     */
-    public void addFileToContentRepository(HttpServletRequest request, McAuthoringForm mcAuthoringForm,
-	    List attachmentList, List deletedAttachmentList, SessionMap sessionMap,
-	    McGeneralAuthoringDTO mcGeneralAuthoringDTO) {
-	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
-
-	if (attachmentList == null) {
-	    attachmentList = new ArrayList();
-	}
-
-	if (deletedAttachmentList == null) {
-	    deletedAttachmentList = new ArrayList();
-	}
-
-	FormFile uploadedFile = null;
-	boolean isOnlineFile = false;
-	String fileType = null;
-	if ((mcAuthoringForm.getTheOfflineFile() != null) && (mcAuthoringForm.getTheOfflineFile().getFileSize() > 0)) {
-	    // theOfflineFile is available
-	    uploadedFile = mcAuthoringForm.getTheOfflineFile();
-	    fileType = IToolContentHandler.TYPE_OFFLINE;
-	} else if ((mcAuthoringForm.getTheOnlineFile() != null)
-		&& (mcAuthoringForm.getTheOnlineFile().getFileSize() > 0)) {
-	    // theOnlineFile is available
-	    uploadedFile = mcAuthoringForm.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 = McUtils.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);
-	    McUploadedFile file = new McUploadedFile();
-	    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 */
-	    mcAuthoringForm.setTheOfflineFile(null);
-	    mcAuthoringForm.setTheOnlineFile(null);
-	} catch (FileNotFoundException e) {
-	    McAction.logger.error("Unable to uploadfile", e);
-	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
-	} catch (IOException e) {
-	    McAction.logger.error("Unable to uploadfile", e);
-	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
-	} catch (RepositoryCheckedException e) {
-	    McAction.logger.error("Unable to uploadfile", e);
-	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
-	}
-    }
-
     private McToolContentHandler getToolContentHandler() {
 	if (toolContentHandler == null) {
 	    WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
@@ -1711,55 +1258,6 @@
 	return toolContentHandler;
     }
 
-    /**
-     * 
-     * Go through the attachments collections. Remove any content repository or tool objects matching entries in the the
-     * deletedAttachments collection, add any new attachments in the attachments collection. Clear the
-     * deletedAttachments collection, ready for new editing.
-     * 
-     * @param mcContent
-     * @param attachmentList
-     * @param deletedAttachmentList
-     * @param mapping
-     * @param request
-     * @return
-     */
-    private List saveAttachments(McContent mcContent, List attachmentList, List deletedAttachmentList,
-	    ActionMapping mapping, HttpServletRequest request) {
-
-	if ((attachmentList == null) || (deletedAttachmentList == null)) {
-	    return null;
-	}
-
-	IMcService voteService = McServiceProxy.getMcService(getServlet().getServletContext());
-
-	if (deletedAttachmentList != null) {
-	    Iterator iter = deletedAttachmentList.iterator();
-	    while (iter.hasNext()) {
-		McUploadedFile attachment = (McUploadedFile) iter.next();
-
-		if (attachment.getSubmissionId() != null) {
-		    voteService.removeFile(attachment.getSubmissionId());
-		}
-	    }
-	    deletedAttachmentList.clear();
-	}
-
-	if (attachmentList != null) {
-	    Iterator iter = attachmentList.iterator();
-	    while (iter.hasNext()) {
-		McUploadedFile attachment = (McUploadedFile) iter.next();
-
-		if (attachment.getSubmissionId() == null) {
-		    /* add entry to tool table - file already in content repository */
-		    voteService.persistFile(mcContent, attachment);
-		}
-	    }
-	}
-
-	return deletedAttachmentList;
-    }
-
     public ActionForward editActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 	return null;
@@ -1966,20 +1464,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-	}
-
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -2111,20 +1595,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-	}
-
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -2274,20 +1744,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-	}
-
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -2424,20 +1880,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-	}
-
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -2524,25 +1966,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	AuthoringUtil authoringUtil = new AuthoringUtil();
 
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
@@ -2651,23 +2074,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	}
-
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -2776,20 +2182,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-	}
-
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -2919,20 +2311,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-	}
-
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -3055,20 +2433,6 @@
 
 	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(McAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-	}
-
 	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java,v
diff -u -r1.45 -r1.46
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	8 Jan 2014 17:49:42 -0000	1.45
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	17 Jan 2014 22:04:48 -0000	1.46
@@ -52,20 +52,13 @@
     protected String randomize;
     protected String displayAnswers;
 
-    protected String fileItem;
-    protected String uuid;
-
-    protected FormFile receivedFile;
-    protected String offlineFile;
     protected String defaultContentIdStr;
 
     protected String addContent;
     protected String removeContent;
     protected String removeAllContent;
     protected String submitAllContent;
     protected String submitTabDone;
-    protected String submitOfflineFile;
-    protected String submitOnlineFile;
 
     // dispatch controls which method is called by the Lookup map */
     protected String dispatch;
@@ -86,15 +79,6 @@
     protected String toolContentId;
     protected String toolContentID;
 
-    /* instructions content */
-    protected String onlineInstructions;
-    protected String offlineInstructions;
-    protected FormFile theOfflineFile;
-    protected FormFile theOnlineFile;
-
-    protected String richTextOfflineInstructions;
-    protected String richTextOnlineInstructions;
-
     /* advanced content */
     protected String synchInMonitor;
     protected String showFeedback;
@@ -134,15 +118,11 @@
 	this.addOptionContent = null;
 	this.removeOptionContent = null;
 
-	this.fileItem = null;
-
 	this.addContent = null;
 	this.removeContent = null;
 	this.removeAllContent = null;
 	this.submitAllContent = null;
 	this.submitTabDone = null;
-	this.submitOfflineFile = null;
-	this.submitOnlineFile = null;
 
 	this.dispatch = null;
 
@@ -159,18 +139,11 @@
 	this.addOptionContent = null;
 	this.removeOptionContent = null;
 
-	this.fileItem = null;
-	this.uuid = null;
-	this.receivedFile = null;
-
 	this.addContent = null;
 	this.removeContent = null;
 	this.removeAllContent = null;
 	this.submitAllContent = null;
 	this.submitTabDone = null;
-	this.submitOfflineFile = null;
-	this.submitOnlineFile = null;
-	this.offlineFile = null;
 
 	this.showMarks = null;
 	this.useSelectLeaderToolOuput = null;
@@ -193,12 +166,6 @@
 	this.toolContentId = null;
 	this.toolContentID = null;
 
-	this.onlineInstructions = null;
-	this.offlineInstructions = null;
-
-	this.richTextOfflineInstructions = null;
-	this.richTextOnlineInstructions = null;
-
 	this.endLearningMessage = null;
 	this.synchInMonitor = null;
 	this.reportTitle = null;
@@ -363,38 +330,8 @@
     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 syncInMonitor.
      */
     public String getSynchInMonitor() {
@@ -635,96 +572,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() {
@@ -874,36 +721,7 @@
 	this.sln = sln;
     }
 
-    /**
-     * @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;
-    }
-
     public String getDispatch() {
 	return dispatch;
     }
@@ -913,36 +731,6 @@
     }
 
     /**
-     * @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() {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.85 -r1.86
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	8 Jan 2014 17:49:42 -0000	1.85
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	17 Jan 2014 22:04:48 -0000	1.86
@@ -167,17 +167,13 @@
 	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
 	    mcLearnerStarterDTO.setSubmissionDeadline(submissionDeadline);
 
-	    // 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)) {
 		request.setAttribute(McAppConstants.MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
-		return mapping.findForward(McAppConstants.RUN_OFFLINE);
+		return mapping.findForward("submissionDeadline");
 	    }
 	}
 
-	/*
-	 * Is the tool activity been checked as Run Offline in the property inspector?
-	 */
-	mcLearnerStarterDTO.setToolActivityOffline(new Boolean(mcContent.isRunOffline()).toString());
 	mcLearnerStarterDTO.setActivityTitle(mcContent.getTitle());
 	request.setAttribute(McAppConstants.MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
 	mcLearningForm.setToolContentID(mcContent.getMcContentId().toString());
@@ -210,15 +206,6 @@
 	Boolean showMarks = LearningUtil.isShowMarksOnQuestion(learnerAnswersDTOList);
 	mcGeneralLearnerFlowDTO.setShowMarks(showMarks.toString());
 
-	/*
-	 * 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 = McUtils.isRunOffline(mcContent);
-	if (isRunOffline == true) {
-	    return (mapping.findForward(McAppConstants.RUN_OFFLINE));
-	}
-
 	/* find out if the content is being modified at the moment. */
 	boolean isDefineLater = McUtils.isDefineLater(mcContent);
 	if (isDefineLater == true) {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.55 -r1.56
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	5 Sep 2013 17:35:12 -0000	1.55
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	17 Jan 2014 22:04:48 -0000	1.56
@@ -63,7 +63,6 @@
 import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
 import org.lamsfoundation.lams.tool.mc.pojos.McSession;
-import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
@@ -149,15 +148,6 @@
 	    mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	mcGeneralMonitoringDTO.setOnlineInstructions(mcContent.getOnlineInstructions());
-	mcGeneralMonitoringDTO.setOfflineInstructions(mcContent.getOfflineInstructions());
-
-	List<McUploadedFile> attachmentList = mcService.retrieveMcUploadedFiles(mcContent);
-	mcGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	mcGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here **/
-
 	request.setAttribute(MC_GENERAL_MONITORING_DTO, mcGeneralMonitoringDTO);
 
 	EditActivityDTO editActivityDTO = new EditActivityDTO();
@@ -330,13 +320,6 @@
 	    mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	mcGeneralMonitoringDTO.setOnlineInstructions(mcContent.getOnlineInstructions());
-	mcGeneralMonitoringDTO.setOfflineInstructions(mcContent.getOfflineInstructions());
-
-	List<McUploadedFile> attachmentList = mcService.retrieveMcUploadedFiles(mcContent);
-	mcGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	mcGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-
 	request.setAttribute(MC_GENERAL_MONITORING_DTO, mcGeneralMonitoringDTO);
 	/* .. till here */
 
@@ -413,26 +396,6 @@
 
 	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
 
-	if (activeModule.equals(AUTHORING)) {
-	    List attachmentList = (List) sessionMap.get(ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-
-	    String onlineInstructions = (String) sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-
-	}
-
 	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
 
 	String richTextTitle = request.getParameter(TITLE);
@@ -546,13 +509,6 @@
 	    mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	mcGeneralMonitoringDTO.setOnlineInstructions(mcContent.getOnlineInstructions());
-	mcGeneralMonitoringDTO.setOfflineInstructions(mcContent.getOfflineInstructions());
-
-	List<McUploadedFile> attachmentList = mcService.retrieveMcUploadedFiles(mcContent);
-	mcGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	mcGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-
 	/* find out if there are any reflection entries, from here */
 	boolean notebookEntriesExist = MonitoringUtil.notebookEntriesExist(mcService, mcContent);
 
@@ -2577,13 +2533,6 @@
 	    mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	mcGeneralMonitoringDTO.setOnlineInstructions(mcContent.getOnlineInstructions());
-	mcGeneralMonitoringDTO.setOfflineInstructions(mcContent.getOfflineInstructions());
-
-	List attachmentList = mcService.retrieveMcUploadedFiles(mcContent);
-	mcGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	mcGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-
 	request.setAttribute(MC_GENERAL_MONITORING_DTO, mcGeneralMonitoringDTO);
 	/* .. till here */
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v
diff -u -r1.50 -r1.51
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	5 Sep 2013 17:35:12 -0000	1.50
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	17 Jan 2014 22:04:48 -0000	1.51
@@ -24,7 +24,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -51,7 +50,6 @@
 import org.lamsfoundation.lams.tool.mc.ReflectionDTO;
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
-import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -177,13 +175,6 @@
 	    mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	// getting instructions screen content 
-	mcGeneralMonitoringDTO.setOnlineInstructions(mcContent.getOnlineInstructions());
-	mcGeneralMonitoringDTO.setOfflineInstructions(mcContent.getOfflineInstructions());
-	List<McUploadedFile> attachmentList = service.retrieveMcUploadedFiles(mcContent);
-	mcGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	mcGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-
 	request.setAttribute(MC_GENERAL_MONITORING_DTO, mcGeneralMonitoringDTO);
 
 	EditActivityDTO editActivityDTO = new EditActivityDTO();
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v
diff -u -r1.97 -r1.98
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	8 Jan 2014 17:49:42 -0000	1.97
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	17 Jan 2014 22:04:48 -0000	1.98
@@ -145,7 +145,6 @@
 import org.lamsfoundation.lams.tool.mc.McGeneralAuthoringDTO;
 import org.lamsfoundation.lams.tool.mc.McUtils;
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
-import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -232,8 +231,6 @@
 
 	SessionMap sessionMap = new SessionMap();
 	List sequentialCheckedCa = new LinkedList();
-	sessionMap.put(ATTACHMENT_LIST_KEY, new ArrayList());
-	sessionMap.put(DELETED_ATTACHMENT_LIST_KEY, new ArrayList());
 	sessionMap.put(ACTIVITY_TITLE_KEY, "");
 	sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, "");
 	mcAuthoringForm.setHttpSessionID(sessionMap.getSessionID());
@@ -292,20 +289,6 @@
 		    strToolContentID).longValue(), false, mcService, mcGeneralAuthoringDTO, sessionMap);
 	}
 
-	if ((mcGeneralAuthoringDTO.getOnlineInstructions() == null)
-		|| (mcGeneralAuthoringDTO.getOnlineInstructions().length() == 0)) {
-	    mcGeneralAuthoringDTO.setOnlineInstructions(DEFAULT_ONLINE_INST);
-	    mcAuthoringForm.setOnlineInstructions(DEFAULT_ONLINE_INST);
-	    sessionMap.put(ONLINE_INSTRUCTIONS_KEY, DEFAULT_ONLINE_INST);
-	}
-
-	if ((mcGeneralAuthoringDTO.getOfflineInstructions() == null)
-		|| (mcGeneralAuthoringDTO.getOfflineInstructions().length() == 0)) {
-	    mcGeneralAuthoringDTO.setOfflineInstructions(DEFAULT_OFFLINE_INST);
-	    mcAuthoringForm.setOfflineInstructions(DEFAULT_OFFLINE_INST);
-	    sessionMap.put(OFFLINE_INSTRUCTIONS_KEY, DEFAULT_OFFLINE_INST);
-	}
-
 	String destination = McUtils.getDestination(sourceMcStarter, requestedModule);
 	Map mapQuestionContentLocal = mcGeneralAuthoringDTO.getMapQuestionContent();
 	sessionMap.put(MAP_QUESTION_CONTENT_KEY, mapQuestionContent);
@@ -380,13 +363,6 @@
 	mcGeneralAuthoringDTO.setReflect(mcContent.isReflect() ? "1" : "0");
 	mcGeneralAuthoringDTO.setReflectionSubject(mcContent.getReflectionSubject());
 
-	List<McUploadedFile> attachmentList = mcService.retrieveMcUploadedFiles(mcContent);
-	mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	mcGeneralAuthoringDTO.setDeletedAttachmentList(new ArrayList());
-
-	sessionMap.put(ATTACHMENT_LIST_KEY, attachmentList);
-	sessionMap.put(DELETED_ATTACHMENT_LIST_KEY, new ArrayList());
-
 	mcGeneralAuthoringDTO.setIsDefineLater(new Boolean(mcContent.isDefineLater()).toString());
 
 	mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
@@ -412,14 +388,7 @@
 	}
 
 	mcGeneralAuthoringDTO.setMapQuestionContent(mapQuestionContent);
-	mcGeneralAuthoringDTO.setOnlineInstructions(mcContent.getOnlineInstructions());
-	mcGeneralAuthoringDTO.setOfflineInstructions(mcContent.getOfflineInstructions());
 
-	mcAuthoringForm.setOnlineInstructions(mcContent.getOnlineInstructions());
-	mcAuthoringForm.setOfflineInstructions(mcContent.getOfflineInstructions());
-	sessionMap.put(ONLINE_INSTRUCTIONS_KEY, mcContent.getOnlineInstructions());
-	sessionMap.put(OFFLINE_INSTRUCTIONS_KEY, mcContent.getOfflineInstructions());
-
 	mcAuthoringForm.resetUserAction();
 	return mcContent;
     }
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v
diff -u -r1.66 -r1.67
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	8 Jan 2014 17:49:42 -0000	1.66
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	17 Jan 2014 22:04:49 -0000	1.67
@@ -217,8 +217,8 @@
 	  	/>
 
 	  	<forward
-		    name="runOffline"
-	        path="/learning/RunOffline.jsp"
+		    name="submissionDeadline"
+	        path="/learning/submissionDeadline.jsp"
 		    redirect="false"
 	  	/>
 
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	26 Jul 2013 16:10:44 -0000	1.12
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	17 Jan 2014 22:04:49 -0000	1.13
@@ -11,7 +11,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();
@@ -143,10 +142,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) -->
 
 
 			<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
Fisheye: Tag 1.21 refers to a dead (removed) revision in file `lams_tool_lamc/web/authoring/InstructionsContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.20 refers to a dead (removed) revision in file `lams_tool_lamc/web/learning/RunOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/learning/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/learning/submissionDeadline.jsp	17 Jan 2014 22:04:49 -0000	1.1
@@ -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="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 type="text/javascript">
+		function disableFinishButton() {
+			var elem = document.getElementById("finishButton");
+			if (elem != null) {
+				elem.disabled = true;
+			}
+		}
+	         function submitForm(methodName){
+	                var f = document.getElementById('messageForm');
+	                f.submit();
+	        }
+	</script>
+</lams:head>
+
+<body class="stripes">
+
+	<html:form action="/learning?method=displayMc&validate=false"
+		method="POST" onsubmit="disableFinishButton();" styleId="messageForm">
+		<html:hidden property="toolContentID" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="httpSessionID" />
+		<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="${mcLearnerStarterDTO.submissionDeadline}" /></fmt:param>
+				</fmt:message>							
+			</div>
+					
+			<div class="space-bottom-top align-right">
+
+				<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
+					<html:hidden property="learnerFinished" value="Finished" />
+					
+					<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="javascript:submitForm('finish');return false">
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+				 			</c:choose>
+				 		</span>
+					</html:link>
+				</c:if>
+
+				<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}">
+					<html:submit property="forwardtoReflection" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:submit>
+				</c:if>
+			</div>
+		</div>
+	</html:form>
+	<div id="footer"></div>
+</body>
+</lams:html>
+
+
+
+
+
+
+
+
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_tool_lamc/web/learning/mobile/RunOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/learning/mobile/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/mobile/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/learning/mobile/submissionDeadline.jsp	17 Jan 2014 22:04:48 -0000	1.1
@@ -0,0 +1,90 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="activity.title" /></title>
+	<%@ include file="/common/mobileheader.jsp"%>
+	
+	<script type="text/javascript">
+		function disableFinishButton() {
+			var elem = document.getElementById("finishButton");
+			if (elem != null) {
+				elem.disabled = true;
+			}
+		}
+	         function submitForm(methodName){
+	                var f = document.getElementById('messageForm');
+	                f.submit();
+	        }
+	</script>
+</lams:head>
+
+<body>
+
+	<html:form action="/learning?method=displayMc&validate=false"
+		method="POST" onsubmit="disableFinishButton();" styleId="messageForm">
+		<html:hidden property="toolContentID" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="httpSessionID" />
+		<html:hidden property="userID" />
+
+		<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>
+	
+			<div data-role="content">
+				<div class="warning">
+					<fmt:message key="authoring.info.teacher.set.restriction" >
+						<fmt:param><lams:Date value="${mcLearnerStarterDTO.submissionDeadline}" /></fmt:param>
+					</fmt:message>							
+				</div>	
+			</div>	
+								
+			<div data-role="footer" data-theme="b" class="ui-bar">
+				<span class="ui-finishbtn-right">
+
+					<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
+						<html:hidden property="learnerFinished" value="Finished" />
+						
+						<a href="#nogo" id="finishButton" onclick="javascript:submitForm('finish');return false"  data-role="button" data-icon="arrow-r">
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+					 			</c:choose>
+					 		</span>
+						</a>
+					</c:if>
+	
+					<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}">
+						<button type="submit" name="forwardtoReflection" data-icon="arrow-r">
+							<fmt:message key="label.continue" />
+						</button>
+					</c:if>
+				</span>
+			</div>
+			
+			
+		</div>
+	</html:form>
+</body>
+</lams:html>
+
+
+
+
+
+
+
+
Fisheye: Tag 1.23 refers to a dead (removed) revision in file `lams_tool_lamc/web/monitoring/Instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.45 -r1.46
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	3 Sep 2013 16:56:40 -0000	1.45
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	17 Jan 2014 22:04:48 -0000	1.46
@@ -10,7 +10,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);
@@ -123,20 +122,19 @@
 		    <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 				<html:hidden property="dispatch"/>
 				<html:hidden property="toolContentID"/>
-				<html:hidden property="httpSessionID"/>		
+				<html:hidden property="httpSessionID"/>
 				<html:hidden property="currentTab" styleId="currentTab" />
-				<html:hidden property="contentFolderID"/>						
+				<html:hidden property="contentFolderID"/>
 				<html:hidden property="activeModule"/>
 				<html:hidden property="defineLaterInEditMode"/>
-				<html:hidden property="responseId"/>	 
+				<html:hidden property="responseId"/>
 				<html:hidden property="currentUid"/>
 			
 				<lams:help toolSignature="<%= McAppConstants.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_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	8 Jan 2014 17:50:55 -0000	1.17
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	17 Jan 2014 22:04:45 -0000	1.18
@@ -61,14 +61,6 @@
    />
 
 
-   <property
-        name="runOffline"
-        type="boolean"
-        access="property"
-        column="run_offline"
-   />
-
-
     <property
         name="creationDate"
         type="java.util.Date"
@@ -185,24 +177,7 @@
         column="showOtherAnswers"
         length="1"
     />
-
     
-    <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"
-    />
-    
 
    	 <set
             name="qaQueContents"
@@ -239,22 +214,6 @@
 
     </set>
     
-   	<set
-            name="qaUploadedFiles"
-            lazy="true"
-            inverse="true"
-            cascade="all-delete-orphan"
-            sort="unsorted"
-        >
-              <key
-                  column="qa_content_id"
-              >
-              </key>
-
-              <one-to-many
-                  class="org.lamsfoundation.lams.tool.qa.QaUploadedFile"
-              />
-    </set>
     <set
             name="conditions"
             lazy="true"
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.88 -r1.89
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	8 Jan 2014 17:50:55 -0000	1.88
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	17 Jan 2014 22:04:44 -0000	1.89
@@ -34,10 +34,6 @@
     public static final long DEFAULT_QUE_CONTENT_ID = 1;
     public static final String ERROR_QAAPPLICATION = "error.exception.QaApplication";
     public static final String TOOL_CONTENT_ID = "toolContentID";
-    public static final String ATTACHMENT_LIST_KEY = "attachmentListKey";
-    public static final String DELETED_ATTACHMENT_LIST_KEY = "deletedAttachmentListKey";
-    public static final String ONLINE_INSTRUCTIONS_KEY = "onlineInstructionsKey";
-    public static final String OFFLINE_INSTRUCTIONS_KEY = "offlineInstructionsKey";
     public static final String ACTIVITY_TITLE_KEY = "activityTitleKey";
     public static final String ACTIVITY_INSTRUCTIONS_KEY = "activityInstructionsKey";
     public static final String LIST_QUESTION_CONTENT_DTO = "listQuestionContentDTO";
@@ -70,8 +66,6 @@
     public static final String ERROR_LIST_LEARNER = "errorListLearner";
     public static final String MAP_SEQUENTIAL_ANSWERS_KEY = "mapSequentialAnswersKey";
     public static final String DEFAULT_CONTENT_ID_STR = "defaultContentIdStr";
-    public static final String DEFAULT_ONLINE_INST = "";
-    public static final String DEFAULT_OFFLINE_INST = "";
     public static final String TOOL_SESSION_ID = "toolSessionID";
     public static final String EXPORT_USER_ID = "exportUserId";
     public static final String NOTEBOOK = "notebook";
@@ -102,7 +96,6 @@
     public static final String SOURCE_MC_STARTER = "sourceMcStarter";
     public static final Integer MAX_QUESTION_COUNT = new Integer(50);
 
-    public static final String RUN_OFFLINE = "runOffline";
     public static final String REFLECT = "reflect";
     public static final String REFLECTION_SUBJECT = "reflectionSubject";
 
@@ -139,20 +132,13 @@
      */
     public static final String MAP_QUESTION_CONTENT = "mapQuestionContent";
     public static final String DEFAULT_QUESTION_CONTENT = "defaultQuestionContent";
-    public static final String ONLINE_INSTRUCTIONS = "onlineInstructions";
-    public static final String OFFLINE_INSTRUCTIONS = "offlineInstructions";
     public static final String END_LEARNING_MESSSAGE = "endLearningMessage";
     public static final String ON = "ON";
     public static final String OFF = "OFF";
-    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 POPULATED_UPLOADED_FILESDATA = "populateUploadedFilesData";
     public static final String USER_ID = "userID";
 
     public final long ONE_DAY = 60 * 60 * 1000 * 24;
@@ -184,7 +170,6 @@
     public static final String USER_EXCEPTION_NO_TOOL_SESSIONS = "userExceptionNoToolSessions";
     public static final String USER_EXCEPTION_NO_STUDENT_ACTIVITY = "userExceptionNoStudentActivity";
     public static final String USER_EXCEPTION_CONTENT_IN_USE = "userExceptionContentInUse";
-    public static final String USER_EXCEPTION_RUN_OFFLINE = "userExceptionRunOffline";
     public static final String USER_EXCEPTION_MODE_REQUIRED = "userExceptionModeRequired";
     public static final String USER_EXCEPTION_MODE_INVALID = "userExceptionModeInvalid";
     public static final String USER_EXCEPTION_QUESTIONS_DUPLICATE = "userExceptionQuestionsDuplicate";
@@ -234,7 +219,6 @@
     public static final String MONITORING_REPORT_TITLE = "monitoringReportTitle";
     public static final String REPORT_TITLE_LEARNER = "reportTitleLearner";
     public static final String END_LEARNING_MESSAGE = "endLearningMessage";
-    public static final String IS_TOOL_ACTIVITY_OFFLINE = "isToolActivityOffline";
     public static final String CHECK_ALL_SESSIONS_COMPLETED = "checkAllSessionsCompleted";
     public static final String FROM_TOOL_CONTENT_ID = "fromToolContentId";
     public static final String TO_TOOL_CONTENT_ID = "toToolContentId";
@@ -254,7 +238,6 @@
     public static final String NO_AVAILABLE_SESSIONS = "noAvailableSessions";
     public static final String NO_TOOL_SESSIONS_AVAILABLE = "noToolSessionAvailable";
     public static final String ATTR_CONTENT = "content";
-    public static final String ATTR_RUN_OFFLINE = "runOffline";
     public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
     public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
     public static final String ATTR_GROUP_USERS = "groupUsers";
@@ -277,10 +260,7 @@
     public static final String FEEDBACK_TYPE_COMBINED = "You are being presented total of: ";
     public static final String QUESTIONS = " questions.";
 
-    public static final String ATTACHMENT_LIST = "attachmentList";
     public static final String SUBMIT_SUCCESS = "sbmtSuccess";
-    public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
-    public static final String UUID = "uuid";
     // for condition management use
     public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
     public static final Object ATTR_CONDITION_SET = "conditionList";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java,v
diff -u -r1.29 -r1.30
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	8 Jan 2014 17:50:55 -0000	1.29
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	17 Jan 2014 22:04:44 -0000	1.30
@@ -35,7 +35,6 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 
 /**
@@ -46,12 +45,10 @@
  */
 
 /**
- * QaContent Value Object The value object that maps to our model database
- * table: tl_laqa11_content The relevant hibernate mapping resides in:
- * QaContent.hbm.xml
+ * QaContent Value Object The value object that maps to our model database table: tl_laqa11_content The relevant
+ * hibernate mapping resides in: QaContent.hbm.xml
  * 
- * Holds content representation for the tool. Default content is made available
- * to the tool by the database.
+ * Holds content representation for the tool. Default content is made available to the tool by the database.
  */
 public class QaContent implements Serializable {
 
@@ -77,12 +74,6 @@
     private String monitoringReportTitle;
 
     /** nullable persistent field */
-    private String offlineInstructions;
-
-    /** nullable persistent field */
-    private String onlineInstructions;
-
-    /** nullable persistent field */
     private long createdBy;
 
     /** nullable persistent field */
@@ -93,21 +84,20 @@
     private String reflectionSubject;
 
     /** nullable persistent field */
-    private boolean runOffline;
 
     private boolean questionsSequenced;
 
     private boolean lockWhenFinished;
 
     private boolean showOtherAnswers;
-    
+
     private boolean allowRichEditor;
     
     private boolean useSelectLeaderToolOuput;
 
     /** nullable persistent field */
     private boolean usernameVisible;
-    
+
     /** nullable persistent field */
     private boolean allowRateAnswers;
 
@@ -122,7 +112,7 @@
 
     /** nullable persistent field */
     private Date updateDate;
-    
+
     private Date submissionDeadline;
 
     /** persistent field */
@@ -132,31 +122,25 @@
     private Set qaSessions;
 
     /** persistent field */
-    private Set qaUploadedFiles;
-    /** persistent field */
     private Set<QaCondition> conditions = new TreeSet<QaCondition>(new TextSearchConditionComparator());
 
     public QaContent() {
     };
 
     /** full constructor */
     public QaContent(Long qaContentId, String content, String title, String instructions, String reportTitle,
-	    String monitoringReportTitle, String offlineInstructions, String onlineInstructions, long createdBy,
-	    boolean defineLater, boolean runOffline, boolean questionsSequenced, boolean usernameVisible,
+	    String monitoringReportTitle, long createdBy, boolean questionsSequenced, boolean usernameVisible,
 	    boolean allowRateAnswers, boolean synchInMonitor, boolean lockWhenFinished, boolean contentLocked,
 	    boolean showOtherAnswers, boolean reflect, String reflectionSubject, Date creationDate, Date updateDate,
-	    Set qaQueContents, Set qaSessions, Set qaUploadedFiles, Set<QaCondition> conditions, boolean allowRichEditor, boolean useSelectLeaderToolOuput) {
+	    Set qaQueContents, Set qaSessions, Set<QaCondition> conditions, boolean allowRichEditor,
+	    boolean useSelectLeaderToolOuput) {
 	this.qaContentId = qaContentId;
 	this.content = content;
 	this.title = title;
 	this.instructions = instructions;
 	this.reportTitle = reportTitle;
 	this.monitoringReportTitle = monitoringReportTitle;
-	this.offlineInstructions = offlineInstructions;
-	this.onlineInstructions = onlineInstructions;
 	this.createdBy = createdBy;
-	this.defineLater = defineLater;
-	this.runOffline = runOffline;
 	this.questionsSequenced = questionsSequenced;
 	this.usernameVisible = usernameVisible;
 	this.allowRateAnswers = allowRateAnswers;
@@ -170,36 +154,32 @@
 	this.updateDate = updateDate;
 	this.qaQueContents = qaQueContents;
 	this.qaSessions = qaSessions;
-	this.qaUploadedFiles = qaUploadedFiles;
 	this.conditions = conditions;
 	this.allowRichEditor = allowRichEditor;
 	this.useSelectLeaderToolOuput = useSelectLeaderToolOuput;
     }
 
     /**
-     * Copy Construtor to create a new qa content instance. Note that we don't
-     * copy the qa session data here because the qa session will be created
-     * after we copied tool content.
+     * Copy Construtor to create a new qa content instance. Note that we don't copy the qa session data here because the
+     * qa session will be created after we copied tool content.
      * 
      * @param qa
-     *                the original qa content.
+     *            the original qa content.
      * @param newContentId
-     *                the new qa content id.
+     *            the new qa content id.
      * @return the new qa content object.
      */
-    public static QaContent newInstance(IToolContentHandler toolContentHandler, QaContent qa, Long newContentId)
-	    throws ItemNotFoundException, RepositoryCheckedException {
+    public static QaContent newInstance(QaContent qa, Long newContentId) throws ItemNotFoundException,
+	    RepositoryCheckedException {
 	QaContent newContent = new QaContent(newContentId, qa.getContent(), qa.getTitle(), qa.getInstructions(),
-		qa.getReportTitle(), qa.getMonitoringReportTitle(), qa.getOfflineInstructions(),
-		qa.getOnlineInstructions(), qa.getCreatedBy(), qa.isDefineLater(), qa.isRunOffline(),
-		qa.isQuestionsSequenced(), qa.isUsernameVisible(), qa.isAllowRateAnswers(), qa.isSynchInMonitor(),
-		qa.isLockWhenFinished(), qa.isContentLocked(), qa.isShowOtherAnswers(), qa.isReflect(),
-		qa.getReflectionSubject(), qa.getCreationDate(), qa.getUpdateDate(), new TreeSet(), new TreeSet(),
-		new TreeSet(), new TreeSet<QaCondition>(new TextSearchConditionComparator()), qa.isAllowRichEditor(), qa.isUseSelectLeaderToolOuput());
+		qa.getReportTitle(), qa.getMonitoringReportTitle(), qa.getCreatedBy(), qa.isQuestionsSequenced(),
+		qa.isUsernameVisible(), qa.isAllowRateAnswers(), qa.isSynchInMonitor(), qa.isLockWhenFinished(),
+		qa.isContentLocked(), qa.isShowOtherAnswers(), qa.isReflect(), qa.getReflectionSubject(),
+		qa.getCreationDate(), qa.getUpdateDate(), new TreeSet(), new TreeSet(), new TreeSet<QaCondition>(
+			new TextSearchConditionComparator()), qa.isAllowRichEditor(), qa.isUseSelectLeaderToolOuput());
 
 	newContent.setQaQueContents(qa.deepCopyQaQueContent(newContent));
 
-	newContent.setQaUploadedFiles(qa.deepCopyQaAttachments(toolContentHandler, newContent));
 	newContent.setConditions(qa.deepCopyConditions(newContent));
 	return newContent;
     }
@@ -213,20 +193,6 @@
 	return newQaQueContent;
     }
 
-    public Set deepCopyQaAttachments(IToolContentHandler toolContentHandler, QaContent newQaContent)
-	    throws ItemNotFoundException, RepositoryCheckedException {
-	Set attachments = new TreeSet();
-	for (Iterator i = this.getQaUploadedFiles().iterator(); i.hasNext();) {
-	    QaUploadedFile qaUploadedFile = (QaUploadedFile) i.next();
-	    if (qaUploadedFile.getQaContent() != null) {
-		QaUploadedFile newQaUploadedFile = QaUploadedFile.newInstance(toolContentHandler, qaUploadedFile,
-			newQaContent);
-		attachments.add(newQaUploadedFile);
-	    }
-	}
-	return attachments;
-    }
-
     public Set<QaCondition> deepCopyConditions(QaContent newQaContent) {
 
 	Set<QaCondition> newConditions = new TreeSet<QaCondition>(new TextSearchConditionComparator());
@@ -274,7 +240,7 @@
 
     /**
      * @param qaContentId
-     *                The qaContentId to set.
+     *            The qaContentId to set.
      */
     public void setQaContentId(Long qaContentId) {
 	this.qaContentId = qaContentId;
@@ -289,7 +255,7 @@
 
     /**
      * @param title
-     *                The title to set.
+     *            The title to set.
      */
     public void setTitle(String title) {
 	this.title = title;
@@ -298,12 +264,10 @@
     @Override
     public String toString() {
 	return new ToStringBuilder(this).append("qaContentId:", getQaContentId()).append("qa title:", getTitle())
-		.append("qa instructions:", getInstructions()).append("creator user id", getCreatedBy()).append(
-			"username_visible:", isUsernameVisible()).append(
-				"allow to rate answers:", isAllowRateAnswers()).append("defineLater", isDefineLater()).append(
-			"offline_instructions:", getOfflineInstructions()).append("online_instructions:",
-			getOnlineInstructions()).append("report_title: ", getReportTitle()).append(
-			"reflection subject: ", getReflectionSubject())
+		.append("qa instructions:", getInstructions()).append("creator user id", getCreatedBy())
+		.append("username_visible:", isUsernameVisible())
+		.append("allow to rate answers:", isAllowRateAnswers()).append("defineLater", isDefineLater())
+		.append("report_title: ", getReportTitle()).append("reflection subject: ", getReflectionSubject())
 		.append("synch_in_monitor: ", isSynchInMonitor()).toString();
     }
 
@@ -330,7 +294,7 @@
 
     /**
      * @param createdBy
-     *                The createdBy to set.
+     *            The createdBy to set.
      */
     public void setCreatedBy(long createdBy) {
 	this.createdBy = createdBy;
@@ -345,7 +309,7 @@
 
     /**
      * @param defineLater
-     *                The defineLater to set.
+     *            The defineLater to set.
      */
     public void setDefineLater(boolean defineLater) {
 	this.defineLater = defineLater;
@@ -360,43 +324,13 @@
 
     /**
      * @param instructions
-     *                The instructions to set.
+     *            The instructions to set.
      */
     public void setInstructions(String instructions) {
 	this.instructions = instructions;
     }
 
     /**
-     * @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 reportTitle.
      */
     public String getReportTitle() {
@@ -405,7 +339,7 @@
 
     /**
      * @param reportTitle
-     *                The reportTitle to set.
+     *            The reportTitle to set.
      */
     public void setReportTitle(String reportTitle) {
 	this.reportTitle = reportTitle;
@@ -420,7 +354,7 @@
 
     /**
      * @param synchInMonitor
-     *                The synchInMonitor to set.
+     *            The synchInMonitor to set.
      */
     public void setSynchInMonitor(boolean synchInMonitor) {
 	this.synchInMonitor = synchInMonitor;
@@ -435,7 +369,7 @@
 
     /**
      * @param updateDate
-     *                The updateDate to set.
+     *            The updateDate to set.
      */
     public void setUpdateDate(Date updateDate) {
 	this.updateDate = updateDate;
@@ -445,17 +379,17 @@
      * @return Returns the submissionDeadline.
      */
     public Date getSubmissionDeadline() {
-    	return submissionDeadline;
+	return submissionDeadline;
     }
-    
+
     /**
      * @param submissionDeadline
-     * The submissionDeadline to set.
+     *            The submissionDeadline to set.
      */
     public void setSubmissionDeadline(Date submissionDeadline) {
-    	this.submissionDeadline = submissionDeadline;
+	this.submissionDeadline = submissionDeadline;
     }
-    
+
     /**
      * @return Returns the usernameVisible.
      */
@@ -465,12 +399,12 @@
 
     /**
      * @param usernameVisible
-     *                The usernameVisible to set.
+     *            The usernameVisible to set.
      */
     public void setUsernameVisible(boolean usernameVisible) {
 	this.usernameVisible = usernameVisible;
     }
-    
+
     /**
      * @return Returns the allowRateAnswers.
      */
@@ -480,7 +414,7 @@
 
     /**
      * @param allowRateAnswers
-     *                The allowRateAnswers to set.
+     *            The allowRateAnswers to set.
      */
     public void setAllowRateAnswers(boolean allowRateAnswers) {
 	this.allowRateAnswers = allowRateAnswers;
@@ -495,28 +429,13 @@
 
     /**
      * @param questionsSequenced
-     *                The questionsSequenced to set.
+     *            The questionsSequenced to set.
      */
     public void setQuestionsSequenced(boolean questionsSequenced) {
 	this.questionsSequenced = questionsSequenced;
     }
 
     /**
-     * @return Returns the runOffline.
-     */
-    public boolean isRunOffline() {
-	return runOffline;
-    }
-
-    /**
-     * @param runOffline
-     *                The runOffline to set.
-     */
-    public void setRunOffline(boolean runOffline) {
-	this.runOffline = runOffline;
-    }
-
-    /**
      * @return Returns the monitoringReportTitle.
      */
     public String getMonitoringReportTitle() {
@@ -525,7 +444,7 @@
 
     /**
      * @param monitoringReportTitle
-     *                The monitoringReportTitle to set.
+     *            The monitoringReportTitle to set.
      */
     public void setMonitoringReportTitle(String monitoringReportTitle) {
 	this.monitoringReportTitle = monitoringReportTitle;
@@ -540,31 +459,13 @@
 
     /**
      * @param contentLocked
-     *                The contentLocked to set.
+     *            The contentLocked to set.
      */
     public void setContentLocked(boolean contentLocked) {
 	this.contentLocked = contentLocked;
     }
 
     /**
-     * @return Returns the qaUploadedFiles.
-     */
-    public Set getQaUploadedFiles() {
-	if (qaUploadedFiles == null) {
-	    qaUploadedFiles = new TreeSet();
-	}
-	return qaUploadedFiles;
-    }
-
-    /**
-     * @param qaUploadedFiles
-     *                The qaUploadedFiles to set.
-     */
-    public void setQaUploadedFiles(Set qaUploadedFiles) {
-	this.qaUploadedFiles = qaUploadedFiles;
-    }
-
-    /**
      * @return Returns the uid.
      */
     public Long getUid() {
@@ -573,7 +474,7 @@
 
     /**
      * @param uid
-     *                The uid to set.
+     *            The uid to set.
      */
     public void setUid(Long uid) {
 	this.uid = uid;
@@ -588,7 +489,7 @@
 
     /**
      * @param content
-     *                The content to set.
+     *            The content to set.
      */
     public void setContent(String content) {
 	this.content = content;
@@ -603,7 +504,7 @@
 
     /**
      * @param creationDate
-     *                The creationDate to set.
+     *            The creationDate to set.
      */
     public void setCreationDate(Date creationDate) {
 	this.creationDate = creationDate;
@@ -618,7 +519,7 @@
 
     /**
      * @param reflect
-     *                The reflect to set.
+     *            The reflect to set.
      */
     public void setReflect(boolean reflect) {
 	this.reflect = reflect;
@@ -633,7 +534,7 @@
 
     /**
      * @param reflectionSubject
-     *                The reflectionSubject to set.
+     *            The reflectionSubject to set.
      */
     public void setReflectionSubject(String reflectionSubject) {
 	this.reflectionSubject = reflectionSubject;
@@ -648,19 +549,18 @@
 
     /**
      * @param lockWhenFinished
-     *                The lockWhenFinished to set.
+     *            The lockWhenFinished to set.
      */
     public void setLockWhenFinished(boolean lockWhenFinished) {
 	this.lockWhenFinished = lockWhenFinished;
     }
-    
-    
+
     public boolean isAllowRichEditor() {
-        return allowRichEditor;
+	return allowRichEditor;
     }
 
     public void setAllowRichEditor(boolean allowRichEditor) {
-        this.allowRichEditor = allowRichEditor;
+	this.allowRichEditor = allowRichEditor;
     }
     
     public boolean isUseSelectLeaderToolOuput() {
@@ -680,7 +580,7 @@
 
     /**
      * @param showOtherAnswers
-     *                The showOtherAnswers to set.
+     *            The showOtherAnswers to set.
      */
     public void setShowOtherAnswers(boolean showOtherAnswers) {
 	this.showOtherAnswers = showOtherAnswers;
Fisheye: Tag 1.20 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml,v
diff -u -r1.27 -r1.28
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	8 Jan 2014 17:50:55 -0000	1.27
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	17 Jan 2014 22:04:44 -0000	1.28
@@ -52,10 +52,6 @@
 	<bean id="qaResponseRatingDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.ResponseRatingDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
-
-	<bean id="qaUploadedFileDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaUploadedFileDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
 	
 	<bean id="qaConfigItemDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaConfigItemDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
@@ -82,12 +78,10 @@
 					<property name="qaQueUsrDAO"><ref bean="qaQueUsrDAO"/></property>
 					<property name="qaQuestionDAO"><ref bean="qaQuestionDAO"/></property>
 					<property name="qaUsrRespDAO"><ref bean="qaUsrRespDAO"/></property>	
-					<property name="qaResponseRatingDAO"><ref bean="qaResponseRatingDAO"/></property>									
-					<property name="qaUploadedFileDAO"><ref bean="qaUploadedFileDAO"/></property>	
+					<property name="qaResponseRatingDAO"><ref bean="qaResponseRatingDAO"/></property>	
 					<property name="qaConfigItemDAO"><ref bean="qaConfigItemDAO"/></property>
 					<property name="qaWizardDAO"><ref bean="qaWizardDAO"/></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="qaOutputFactory"><ref bean="qaOutputFactory"/></property>
@@ -105,7 +99,6 @@
 					<prop key="update*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 					<prop key="get*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
 					<prop key="remove*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="persistFile">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 					<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 					<prop key="importToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 					<prop key="exportToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
Fisheye: Tag 1.12 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUploadedFileDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java	13 Nov 2013 15:38:47 -0000	1.20
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java	17 Jan 2014 22:04:44 -0000	1.21
@@ -29,7 +29,6 @@
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.dao.IQaSessionDAO;
-import org.springframework.orm.hibernate3.HibernateTemplate;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
Fisheye: Tag 1.17 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140102.sql	17 Jan 2014 22:04:44 -0000	1.1
@@ -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_laqa11_content DROP COLUMN online_instructions;
+ALTER TABLE tl_laqa11_content DROP COLUMN offline_instructions;
+ALTER TABLE tl_laqa11_content DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_laqa11_uploadedfile;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='laqa11';
+
+----------------------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_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java	8 May 2013 14:07:08 -0000	1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java	17 Jan 2014 22:04:43 -0000	1.4
@@ -37,7 +37,6 @@
  * @author Ozgur Demirtas
  */
 public class GeneralLearnerFlowDTO implements Comparable {
-    protected String activityOffline;
 
     protected Integer totalQuestionCount;
 
@@ -208,21 +207,6 @@
     }
 
     /**
-     * @return Returns the activityOffline.
-     */
-    public String getActivityOffline() {
-	return activityOffline;
-    }
-
-    /**
-     * @param activityOffline
-     *                The activityOffline to set.
-     */
-    public void setActivityOffline(String activityOffline) {
-	this.activityOffline = activityOffline;
-    }
-
-    /**
      * @return Returns the activityTitle.
      */
     public String getActivityTitle() {
@@ -277,7 +261,7 @@
     }
 
     public String toString() {
-	return new ToStringBuilder(this).append("activityOffline: ", activityOffline).append(
+	return new ToStringBuilder(this).append(
 		"remainingQuestionCount: ", remainingQuestionCount).append("totalQuestionCount : ", totalQuestionCount)
 		.append("activityInstructions: ", activityInstructions).append("teacherViewOnly: ", teacherViewOnly)
 		.append("lockWhenFinished: ", lockWhenFinished).append("activityTitle: ", activityTitle).append(
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralMonitoringDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/Attic/GeneralMonitoringDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralMonitoringDTO.java	18 Mar 2011 17:09:50 -0000	1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralMonitoringDTO.java	17 Jan 2014 22:04:43 -0000	1.3
@@ -24,8 +24,6 @@
 package org.lamsfoundation.lams.tool.qa.dto;
 
 
-import java.util.List;
-
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 
@@ -54,12 +52,6 @@
     
     protected String defaultQuestionContent;
     
-    protected String onlineInstructions;
-    protected String offlineInstructions;
-
-    protected List attachmentList;
-    protected List deletedAttachmentList;
-    
     protected String contentFolderID;
     
 	
@@ -75,11 +67,7 @@
             .append("editResponse: ", editResponse)
             .append("defaultQuestionContent: ", defaultQuestionContent)
             .append("countAllUsers: ", countAllUsers)
-            .append("countSessionComplete: ", countSessionComplete)
-			.append("onlineInstructions: ", onlineInstructions)
-			.append("offlineInstructions: ", offlineInstructions)
-            .append("attachmentList: ", attachmentList)
-            .append("deletedAttachmentList: ", deletedAttachmentList)            
+            .append("countSessionComplete: ", countSessionComplete)      
             .toString();
     }
 
@@ -155,54 +143,6 @@
         this.defaultQuestionContent = defaultQuestionContent;
     }
     /**
-     * @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 deletedAttachmentList.
-     */
-    public List getDeletedAttachmentList() {
-        return deletedAttachmentList;
-    }
-    /**
-     * @param deletedAttachmentList The deletedAttachmentList to set.
-     */
-    public void setDeletedAttachmentList(List deletedAttachmentList) {
-        this.deletedAttachmentList = deletedAttachmentList;
-    }
-    /**
      * @return Returns the userExceptionNoStudentActivity.
      */
     public String getUserExceptionNoStudentActivity() {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaGeneralAuthoringDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/Attic/QaGeneralAuthoringDTO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaGeneralAuthoringDTO.java	8 May 2013 14:07:08 -0000	1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaGeneralAuthoringDTO.java	17 Jan 2014 22:04:43 -0000	1.4
@@ -24,8 +24,6 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.qa.dto;
 
-import java.util.List;
-
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
@@ -48,8 +46,6 @@
 
     protected String activityTitle;
     protected String activityInstructions;
-    protected String onlineInstructions;
-    protected String offlineInstructions;
     protected String usernameVisible;
     protected String allowRateAnswers;
     protected String showOtherAnswers;
@@ -68,9 +64,6 @@
     protected String requestedModule;
     protected String isDefineLater;
 
-    protected List attachmentList;
-    protected List deletedAttachmentList;
-
     protected String sbmtSuccess;
     protected String userExceptionQuestionsDuplicate;
 
@@ -88,14 +81,12 @@
 		.append("targetMode: ", targetMode).append("defaultQuestionContent: ", defaultQuestionContent)
 		.append("defaultContentIdStr: ", defaultContentIdStr).append("activityTitle: ", activityTitle)
 		.append("activityInstructions: ", activityInstructions).append("reflect: ", reflect)
-		.append("onlineInstructions: ", onlineInstructions)
-		.append("offlineInstructions: ", offlineInstructions).append("usernameVisible: ", usernameVisible)
+		.append("usernameVisible: ", usernameVisible)
 		.append("allowRateAnswers: ", allowRateAnswers).append("showOtherAnswers: ", showOtherAnswers)
 		.append("synchInMonitor: ", synchInMonitor).append("questionsSequenced: ", questionsSequenced)
 		.append("lockWhenFinished: ", lockWhenFinished).append("editActivityEditMode: ", editActivityEditMode)
 		.append("reflectionSubject: ", reflectionSubject).append("requestedModule: ", requestedModule)
 		.append("isDefineLater: ", isDefineLater).append("monitoredContentInUse: ", monitoredContentInUse)
-		.append("attachmentList: ", attachmentList).append("deletedAttachmentList: ", deletedAttachmentList)
 		.append("sbmtSuccess: ", sbmtSuccess)
 		.append("userExceptionQuestionsDuplicate: ", userExceptionQuestionsDuplicate).toString();
     }
@@ -161,21 +152,6 @@
     }
 
     /**
-     * @return Returns the deletedAttachmentList.
-     */
-    public List getDeletedAttachmentList() {
-	return deletedAttachmentList;
-    }
-
-    /**
-     * @param deletedAttachmentList
-     *                The deletedAttachmentList to set.
-     */
-    public void setDeletedAttachmentList(List deletedAttachmentList) {
-	this.deletedAttachmentList = deletedAttachmentList;
-    }
-
-    /**
      * @return Returns the isDefineLater.
      */
     public String getIsDefineLater() {
@@ -191,21 +167,6 @@
     }
 
     /**
-     * @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 toolContentID.
      */
     public String getToolContentID() {
@@ -380,36 +341,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 questionsSequenced.
      */
     public String getQuestionsSequenced() {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v
diff -u -r1.62 -r1.63
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	8 Jan 2014 17:50:55 -0000	1.62
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	17 Jan 2014 22:04:44 -0000	1.63
@@ -23,12 +23,10 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.qa.service;
 
-import java.io.InputStream;
 import java.util.Collection;
 import java.util.List;
 import java.util.SortedSet;
 
-import org.lamsfoundation.lams.contentrepository.ITicket;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.IToolVO;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -39,7 +37,6 @@
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
 import org.lamsfoundation.lams.tool.qa.QaSession;
-import org.lamsfoundation.lams.tool.qa.QaUploadedFile;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
 import org.lamsfoundation.lams.tool.qa.QaWizardCategory;
 import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO;
@@ -188,10 +185,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;
-
     boolean isStudentActivityOccurredGlobal(QaContent qaContent) throws QaApplicationException;
 
     /**
@@ -221,21 +214,6 @@
 
     long getToolDefaultContentIdBySignature(String toolSignature) throws QaApplicationException;
 
-    ITicket getRepositoryLoginTicket() throws QaApplicationException;
-
-    void deleteFromRepository(Long uuid, Long versionID) throws QaApplicationException;
-
-    InputStream downloadFile(Long uuid, Long versionID) throws QaApplicationException;
-
-    void persistFile(String uuid, boolean isOnlineFile, String fileName, QaContent qaContent)
-	    throws QaApplicationException;
-
-    void persistFile(QaContent content, QaUploadedFile file) throws QaApplicationException;
-
-    void removeFile(Long submissionId) throws QaApplicationException;
-
-    List retrieveQaUploadedFiles(QaContent qa) throws QaApplicationException;
-
     Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry);
 
     NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java	22 Mar 2011 16:51:34 -0000	1.7
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java	17 Jan 2014 22:04:44 -0000	1.8
@@ -45,4 +45,14 @@
 	this.removeField(QaQueContent.class, "isOptional");
 	this.addField(QaQueContent.class, "required", new Boolean(false));
     }
+    
+    /**
+     * Import 20140101 version content to 20140102 version tool server.
+     */
+    public void up20140101To20140102() {
+	this.removeField(QaContent.class, "runOffline");
+	this.removeField(QaContent.class, "onlineInstructions");
+	this.removeField(QaContent.class, "offlineInstructions");
+	this.removeField(QaContent.class, "qaUploadedFiles");
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.99 -r1.100
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	8 Jan 2014 17:50:55 -0000	1.99
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	17 Jan 2014 22:04:44 -0000	1.100
@@ -24,7 +24,6 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.qa.service;
 
-import java.io.InputStream;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Hashtable;
@@ -40,18 +39,9 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-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.ItemNotFoundException;
-import org.lamsfoundation.lams.contentrepository.LoginException;
 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.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -76,7 +66,6 @@
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
 import org.lamsfoundation.lams.tool.qa.QaSession;
-import org.lamsfoundation.lams.tool.qa.QaUploadedFile;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
 import org.lamsfoundation.lams.tool.qa.QaWizardCategory;
 import org.lamsfoundation.lams.tool.qa.ResponseRating;
@@ -85,7 +74,6 @@
 import org.lamsfoundation.lams.tool.qa.dao.IQaQueUsrDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaQuestionDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaSessionDAO;
-import org.lamsfoundation.lams.tool.qa.dao.IQaUploadedFileDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaWizardDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IResponseRatingDAO;
@@ -125,20 +113,13 @@
 	QaAppConstants {
     static Logger logger = Logger.getLogger(QaServicePOJO.class.getName());
 
-    private final String repositoryUser = "laqa11";
-    private final char[] repositoryId = { 'l', 'a', 'q', 'a', '_', '1', '1' };
-    private final String repositoryWorkspace = "laqa11";
-    private IRepositoryService repositoryService;
-    private ICredentials cred;
-
     private IQaContentDAO qaDAO;
     private IQaQuestionDAO qaQuestionDAO;
 
     private IQaSessionDAO qaSessionDAO;
     private IQaQueUsrDAO qaQueUsrDAO;
     private IQaUsrRespDAO qaUsrRespDAO;
     private IResponseRatingDAO qaResponseRatingDAO;
-    private IQaUploadedFileDAO qaUploadedFileDAO;
 
     private IToolContentHandler qaToolContentHandler = null;
     private IUserManagementService userManagementService;
@@ -530,15 +511,6 @@
 		.getUsername(), qaUsrResp.getAnswer());
     }
 
-    public List retrieveQaUploadedFiles(QaContent qa) throws QaApplicationException {
-	try {
-	    return qaUploadedFileDAO.retrieveQaUploadedFiles(qa);
-	} catch (DataAccessException e) {
-	    throw new QaApplicationException("Exception occured when lams is loading qa uploaded files: "
-		    + e.getMessage(), e);
-	}
-    }
-
     public int getTotalNumberOfUsers(QaContent qa) {
 	try {
 	    return qaQueUsrDAO.getTotalNumberOfUsers(qa);
@@ -644,7 +616,7 @@
 		fromContent.getConditions().add(
 			getQaOutputFactory().createDefaultComplexUserAnswersCondition(fromContent));
 	    }
-	    QaContent toContent = QaContent.newInstance(qaToolContentHandler, fromContent, toContentId);
+	    QaContent toContent = QaContent.newInstance(fromContent, toContentId);
 	    if (toContent == null) {
 		QaServicePOJO.logger.error("throwing ToolException: WARNING!, retrieved toContent is null.");
 		throw new ToolException("WARNING! Fail to create toContent. Can't continue!");
@@ -664,48 +636,6 @@
     }
 
     /**
-     * setAsDefineLater(Long toolContentID) throws DataMissingException,
-     * ToolException
-     * 
-     * @param toolContentID
-     *                return void
-     */
-    public void setAsDefineLater(Long toolContentID, boolean value) throws DataMissingException, ToolException {
-	if (toolContentID == null) {
-	    QaServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved toolContentID is null.");
-	    throw new DataMissingException("toolContentID is missing");
-	}
-	QaContent qaContent = qaDAO.getQaByContentId(toolContentID.longValue());
-	if (qaContent == null) {
-	    QaServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved qaContent is null.");
-	    throw new DataMissingException("qaContent is missing");
-	}
-	qaContent.setDefineLater(value);
-	updateQa(qaContent);
-    }
-
-    /**
-     * setAsRunOffline(Long toolContentID) throws DataMissingException, ToolException set the runOffline to true on this
-     * content
-     * 
-     * @param toolContentID
-     *                return void
-     */
-    public void setAsRunOffline(Long toolContentID, boolean value) throws DataMissingException, ToolException {
-	if (toolContentID == null) {
-	    QaServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved toolContentID is null.");
-	    throw new DataMissingException("toolContentID is missing");
-	}
-	QaContent qaContent = qaDAO.getQaByContentId(toolContentID.longValue());
-	if (qaContent == null) {
-	    QaServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved qaContent is null.");
-	    throw new DataMissingException("qaContent is missing");
-	}
-	qaContent.setRunOffline(value);
-	updateQa(qaContent);
-    }
-
-    /**
      * removeToolContent(Long toolContentID, boolean removeSessionData) throws
      * SessionDataExistsException, ToolException Will need an update on the core
      * tool signature: reason : when qaContent is null throw an exception
@@ -857,7 +787,7 @@
 	try {
 	    // set ToolContentHandler as null to avoid copy file node in
 	    // repository again.
-	    toolContentObj = QaContent.newInstance(null, toolContentObj, toolContentID);
+	    toolContentObj = QaContent.newInstance(toolContentObj, toolContentID);
 
 	    // don't export following fields value
 	    toolContentObj.setQaSessions(null);
@@ -866,12 +796,7 @@
 		question.setQaQueUsers(null);
 		question.setQaContent(null);
 	    }
-	    Set<QaUploadedFile> files = toolContentObj.getQaUploadedFiles();
-	    for (QaUploadedFile file : files) {
-		file.setQaContent(null);
-	    }
 
-	    exportContentService.registerFileClassForExport(QaUploadedFile.class.getName(), "uuid", null);
 	    exportContentService.exportToolContent(toolContentID, toolContentObj, qaToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -891,9 +816,6 @@
     public void importToolContent(Long toolContentID, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(QaUploadedFile.class.getName(), "uuid", null, "fileName",
-		    "fileProperty", null, null);
-
 	    // register version filter class
 	    exportContentService.registerImportVersionFilterClass(QaImportContentVersionFilter.class);
 
@@ -914,10 +836,6 @@
 	    for (QaQueContent question : questions) {
 		question.setQaContent(toolContentObj);
 	    }
-	    Set<QaUploadedFile> files = toolContentObj.getQaUploadedFiles();
-	    for (QaUploadedFile file : files) {
-		file.setQaContent(toolContentObj);
-	    }
 	    qaDAO.saveOrUpdateQa(toolContentObj);
 	} catch (ImportToolContentException e) {
 	    throw new ToolException(e);
@@ -1137,91 +1055,6 @@
 	return contentId;
     }
 
-    /**
-     * 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 QaApplicationException {
-	ICredentials credentials = new SimpleCredentials(repositoryUser, repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials, repositoryWorkspace);
-	    return ticket;
-	} catch (AccessDeniedException e) {
-	    throw new QaApplicationException("Access Denied to repository." + e.getMessage());
-	} catch (WorkspaceNotFoundException e) {
-	    throw new QaApplicationException("Workspace not found." + e.getMessage());
-	} catch (LoginException e) {
-	    throw new QaApplicationException("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 QaApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    String files[] = repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new QaApplicationException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
-    public InputStream downloadFile(Long uuid, Long versionID) throws QaApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    IVersionedNode node = repositoryService.getFileItem(ticket, uuid, null);
-	    return node.getFile();
-	} catch (AccessDeniedException e) {
-	    throw new QaApplicationException("AccessDeniedException occured while trying to download file "
-		    + e.getMessage());
-	} catch (FileException e) {
-	    throw new QaApplicationException("FileException occured while trying to download file " + e.getMessage());
-	} catch (ItemNotFoundException e) {
-	    throw new QaApplicationException("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, QaContent qaContent)
-	    throws QaApplicationException {
-	QaUploadedFile qaUploadedFile = new QaUploadedFile(uuid, isOnlineFile, fileName, qaContent);
-	qaUploadedFileDAO.saveUploadFile(qaUploadedFile);
-    }
-
-    /**
-     * adds a new entry to the uploaded files table
-     */
-    public void persistFile(QaContent content, QaUploadedFile file) throws QaApplicationException {
-	content.getQaUploadedFiles().add(file);
-	file.setQaContent(content);
-	qaDAO.saveOrUpdateQa(content);
-    }
-
-    /**
-     * removes an entry from the uploaded files table
-     */
-    public void removeFile(Long submissionId) throws QaApplicationException {
-	qaUploadedFileDAO.removeUploadFile(submissionId);
-    }
-
     @Override
     public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) {
 	return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry);
@@ -1249,57 +1082,6 @@
     }
 
     /**
-     * @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 qaUploadedFileDAO.
-     */
-    public IQaUploadedFileDAO getQaUploadedFileDAO() {
-	return qaUploadedFileDAO;
-    }
-
-    /**
-     * @param qaUploadedFileDAO
-     *                The qaUploadedFileDAO to set.
-     */
-    public void setQaUploadedFileDAO(IQaUploadedFileDAO qaUploadedFileDAO) {
-	this.qaUploadedFileDAO = qaUploadedFileDAO;
-    }
-
-    /**
-     * @return Returns the repositoryId.
-     */
-    public char[] getRepositoryId() {
-	return repositoryId;
-    }
-
-    /**
-     * @return Returns the repositoryUser.
-     */
-    public String getRepositoryUser() {
-	return repositoryUser;
-    }
-
-    /**
-     * @return Returns the repositoryWorkspace.
-     */
-    public String getRepositoryWorkspace() {
-	return repositoryWorkspace;
-    }
-
-    /**
      * @return Returns the qaQuestionDAO.
      */
     public IQaQuestionDAO getQaQuestionDAO() {
@@ -1387,21 +1169,6 @@
 	return qaResponseRatingDAO;
     }
 
-    /**
-     * @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;
     }
@@ -1456,11 +1223,8 @@
 	toolContentObj.setCreationDate(now);
 	toolContentObj.setDefineLater(false);
 	toolContentObj.setInstructions(null);
-	toolContentObj.setOfflineInstructions(null);
-	toolContentObj.setOnlineInstructions(null);
 	toolContentObj.setReflect(false);
 	toolContentObj.setReflectionSubject(null);
-	toolContentObj.setRunOffline(false);
 	toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 	toolContentObj.setQaContentId(toolContentId);
 	toolContentObj.setUpdateDate(now);
@@ -1489,7 +1253,6 @@
 	}
 
 	// leave as empty, no need to set them to anything.
-	// setQaUploadedFiles(Set qaUploadedFiles);
 	// setQaSessions(Set qaSessions);
 
 	// set up question from body
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java	4 Jul 2013 10:27:29 -0000	1.4
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java	17 Jan 2014 22:04:44 -0000	1.5
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.tool.qa.util;
 
 import java.text.DateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -37,7 +36,6 @@
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaSession;
-import org.lamsfoundation.lams.tool.qa.QaUploadedFile;
 import org.lamsfoundation.lams.tool.qa.dto.QaGeneralAuthoringDTO;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
@@ -63,9 +61,6 @@
 	    QaGeneralAuthoringDTO qaGeneralAuthoringDTO) {
 	qaGeneralAuthoringDTO.setActivityTitle(defaultQaContent.getTitle());
 	qaGeneralAuthoringDTO.setActivityInstructions(defaultQaContent.getInstructions());
-
-	qaGeneralAuthoringDTO.setOnlineInstructions(defaultQaContent.getOnlineInstructions());
-	qaGeneralAuthoringDTO.setOfflineInstructions(defaultQaContent.getOfflineInstructions());
     }
 
     public static String replaceNewLines(String text) {
@@ -118,16 +113,6 @@
 	qaAuthoringForm.setLockWhenFinished(lockWhenFinished);
 	qaGeneralAuthoringDTO.setLockWhenFinished(lockWhenFinished);
 
-	String offlineInstructions = request.getParameter(OFFLINE_INSTRUCTIONS);
-	
-	qaAuthoringForm.setOfflineInstructions(offlineInstructions);
-	qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	String onlineInstructions = request.getParameter(ONLINE_INSTRUCTIONS);
-	
-	qaAuthoringForm.setOnlineInstructions(onlineInstructions);
-	qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
 	String reflect = request.getParameter(REFLECT);
 	
 	qaAuthoringForm.setReflect(reflect);
@@ -186,64 +171,6 @@
     }
 
     /**
-     * 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();
-	    QaUploadedFile attachment = null;
-	    while (iter.hasNext() && attachment == null) {
-		QaUploadedFile value = (QaUploadedFile) iter.next();
-		if (uuid.equals(value.getUuid())) {
-		    attachment = value;
-		}
-
-	    }
-	    if (attachment != null) {
-		deletedList.add(attachment);
-		attachmentsList.remove(attachment);
-	    }
-	}
-
-	return deletedList;
-    }
-
-    /**
-     * 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 filename, boolean isOnline, List attachmentsList, List deletedAttachmentsList) {
-
-	List deletedList = deletedAttachmentsList != null ? deletedAttachmentsList : new ArrayList();
-
-	if (attachmentsList != null) {
-	    Iterator iter = attachmentsList.iterator();
-	    QaUploadedFile attachment = null;
-	    while (iter.hasNext() && attachment == null) {
-		QaUploadedFile value = (QaUploadedFile) iter.next();
-		if (filename.equals(value.getFileName()) && isOnline == value.isFileOnline()) {
-		    attachment = value;
-		}
-
-	    }
-	    if (attachment != null) {
-		deletedList.add(attachment);
-		attachmentsList.remove(attachment);
-	    }
-	}
-
-	return deletedList;
-    }
-
-    /**
      * builds a String based map from a list convertToMap(List sessionsList)
      * 
      * @param sessionsList
@@ -306,19 +233,12 @@
 	request.getSession().removeAttribute(SELECTION_CASE);
 	request.getSession().removeAttribute(MAP_QUESTION_CONTENT);
 	request.getSession().removeAttribute(DEFAULT_QUESTION_CONTENT);
-	request.getSession().removeAttribute(ONLINE_INSTRUCTIONS);
-	request.getSession().removeAttribute(OFFLINE_INSTRUCTIONS);
 	request.getSession().removeAttribute(END_LEARNING_MESSSAGE);
 	request.getSession().removeAttribute(ON);
 	request.getSession().removeAttribute(OFF);
-	request.getSession().removeAttribute(RICHTEXT_OFFLINEINSTRUCTIONS);
-	request.getSession().removeAttribute(RICHTEXT_ONLINEINSTRUCTIONS);
 	request.getSession().removeAttribute(RICHTEXT_TITLE);
 	request.getSession().removeAttribute(RICHTEXT_INSTRUCTIONS);
 	request.getSession().removeAttribute(RICHTEXT_BLANK);
-	request.getSession().removeAttribute(SUBMIT_OFFLINE_FILE);
-	request.getSession().removeAttribute(SUBMIT_ONLINE_FILE);
-	request.getSession().removeAttribute(POPULATED_UPLOADED_FILESDATA);
 	request.getSession().removeAttribute(USER_ID);
 	request.getSession().removeAttribute(NOT_ATTEMPTED);
 	request.getSession().removeAttribute(INCOMPLETE);
@@ -353,7 +273,6 @@
 	request.getSession().removeAttribute(MONITORING_REPORT_TITLE);
 	request.getSession().removeAttribute(REPORT_TITLE_LEARNER);
 	request.getSession().removeAttribute(END_LEARNING_MESSAGE);
-	request.getSession().removeAttribute(IS_TOOL_ACTIVITY_OFFLINE);
 	request.getSession().removeAttribute(CHECK_ALL_SESSIONS_COMPLETED);
 	request.getSession().removeAttribute(FROM_TOOL_CONTENT_ID);
 	request.getSession().removeAttribute(TO_TOOL_CONTENT_ID);
@@ -371,10 +290,7 @@
 	request.getSession().removeAttribute(FEEDBACK_TYPE_SEQUENTIAL);
 	request.getSession().removeAttribute(FEEDBACK_TYPE_COMBINED);
 	request.getSession().removeAttribute(QUESTIONS);
-	request.getSession().removeAttribute(ATTACHMENT_LIST);
 	request.getSession().removeAttribute(SUBMIT_SUCCESS);
-	request.getSession().removeAttribute(DELETED_ATTACHMENT_LIST);
-	request.getSession().removeAttribute(UUID);
 	request.getSession().removeAttribute(IS_USERNAME_VISIBLE);
 	request.getSession().removeAttribute(CURRENT_ANSWER);
 	request.getSession().removeAttribute(ACTIVE_MODULE);
@@ -411,7 +327,6 @@
 	request.getSession().removeAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY);
 	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_IN_USE);
 	request.getSession().removeAttribute(USER_EXCEPTION_MODE_REQUIRED);
-	request.getSession().removeAttribute(USER_EXCEPTION_RUN_OFFLINE);
 	request.getSession().removeAttribute(USER_EXCEPTION_MODE_INVALID);
 	request.getSession().removeAttribute(USER_EXCEPTION_QUESTIONS_DUPLICATE);
     }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v
diff -u -r1.58 -r1.59
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	8 Jan 2014 17:50:55 -0000	1.58
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	17 Jan 2014 22:04:43 -0000	1.59
@@ -307,8 +307,6 @@
 	
 	String useSelectLeaderToolOuput = request.getParameter("useSelectLeaderToolOuput");
 
-	String richTextOfflineInstructions = request.getParameter(QaAppConstants.OFFLINE_INSTRUCTIONS);
-	String richTextOnlineInstructions = request.getParameter(QaAppConstants.ONLINE_INSTRUCTIONS);
 	String reflect = request.getParameter(QaAppConstants.REFLECT);
 
 	String reflectionSubject = request.getParameter(QaAppConstants.REFLECTION_SUBJECT);
@@ -388,8 +386,6 @@
 	/** make sure we are setting the userId from the User object above */
 
 	if (activeModule.equals(QaAppConstants.AUTHORING)) {
-	    qaContent.setOnlineInstructions(richTextOnlineInstructions);
-	    qaContent.setOfflineInstructions(richTextOfflineInstructions);
 	    qaContent.setUsernameVisible(usernameVisibleBoolean);
 	    qaContent.setAllowRateAnswers(allowRateQuestionsBoolean);
 	    qaContent.setShowOtherAnswers(showOtherAnswersBoolean);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java,v
diff -u -r1.24 -r1.25
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java	6 Jan 2014 08:42:09 -0000	1.24
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java	17 Jan 2014 22:04:43 -0000	1.25
@@ -83,27 +83,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 {
-	    IQaService service = QaServiceProxy.getQaService(getServletContext());
-	    QaContent content = null;
-	    if (toolContentID != null) {
-		content = service.getQa(toolContentID);
-	    } else {
-		QaSession session = service.retrieveQaSession(toolSessionID);
-		if (session != null)
-		    content = session.getQaContent();
-	    }
-	    if (content != null) {
-		activityTitle = content.getTitle();
-	    }
-	}
-	return super.doOfflineExport(request, response, directoryName, cookies);
-    }
-
     public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) {
 	IQaService qaService = QaServiceProxy.getQaService(getServletContext());
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.47 -r1.48
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	8 Jan 2014 17:50:55 -0000	1.47
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	17 Jan 2014 22:04:43 -0000	1.48
@@ -76,7 +76,6 @@
 
 	generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
 	generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
-	generalLearnerFlowDTO.setActivityOffline(new Boolean(qaContent.isRunOffline()).toString());
 	generalLearnerFlowDTO.setAllowRichEditor(new Boolean(qaContent.isAllowRichEditor()).toString());
 	generalLearnerFlowDTO.setUseSelectLeaderToolOuput(new Boolean(qaContent.isUseSelectLeaderToolOuput()).toString());
 	generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v
diff -u -r1.34 -r1.35
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	4 Jul 2013 10:27:29 -0000	1.34
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	17 Jan 2014 22:04:43 -0000	1.35
@@ -24,7 +24,6 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.qa.web;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -44,28 +43,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.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaCondition;
 import org.lamsfoundation.lams.tool.qa.QaConfigItem;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
-import org.lamsfoundation.lams.tool.qa.QaUploadedFile;
 import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO;
 import org.lamsfoundation.lams.tool.qa.dto.QaGeneralAuthoringDTO;
 import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
-import org.lamsfoundation.lams.tool.qa.util.QaApplicationException;
 import org.lamsfoundation.lams.tool.qa.util.QaToolContentHandler;
 import org.lamsfoundation.lams.tool.qa.util.QaUtils;
 import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
-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;
@@ -74,63 +66,7 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * 
  * @author Ozgur Demirtas
- * 
- <action
- path="/authoring"
- type="org.lamsfoundation.lams.tool.qa.web.QaAction"
- name="QaAuthoringForm"
- input="/AuthoringMaincontent.jsp"
- parameter="dispatch"
- scope="request"
- unknown="false"
- validate="false"
- >
-
- <forward
- name="load"
- path="/AuthoringMaincontent.jsp"
- redirect="false"
- />
-
- <forward
- name="loadMonitoring"
- path="/monitoring/MonitoringMaincontent.jsp"
- redirect="false"
- />
-
- <forward
- name="refreshMonitoring"
- path="/monitoring/MonitoringMaincontent.jsp"
- redirect="false"
- />
-
- <forward
- name="loadViewOnly"
- path="/authoring/AuthoringTabsHolder.jsp"
- redirect="false"
- />
-
- <forward
- name="newQuestionBox"
- path="/authoring/newQuestionBox.jsp"
- redirect="false"
- />
-
- <forward
- name="editQuestionBox"
- path="/authoring/editQuestionBox.jsp"
- redirect="false"
- />
-
-
- <forward
- name="starter"
- path="/index.jsp"
- redirect="false"
- />
- </action>
  */
 public class QaAction extends LamsDispatchAction implements QaAppConstants {
     static Logger logger = Logger.getLogger(QaAction.class.getName());
@@ -190,26 +126,6 @@
 
 	QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
 
-	if (activeModule.equals(QaAppConstants.AUTHORING)) {
-	    List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    String onlineInstructions = (String) sessionMap.get(QaAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    qaGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    qaGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    qaAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	    qaAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-
-	}
-
 	qaGeneralAuthoringDTO.setContentFolderID(contentFolderID);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
@@ -255,13 +171,6 @@
 
 	    authoringUtil.reOrganizeDisplayOrder(qaService, qaAuthoringForm, qaContent);
 
-	    if (activeModule.equals(QaAppConstants.AUTHORING)) {
-
-		List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY);
-		List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-		List attachments = saveAttachments(qaContent, attachmentList, deletedAttachmentList, mapping, request);
-	    }
-
 	    QaUtils.setDefineLater(request, false, strToolContentID, qaService);
 	    QaUtils.setFormProperties(request, qaService, qaAuthoringForm, qaGeneralAuthoringDTO, strToolContentID,
 		    defaultContentIdStr, activeModule, sessionMap, httpSessionID);
@@ -451,29 +360,6 @@
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
-
-	if (activeModule.equals(QaAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(QaAppConstants.ONLINE_INSTRUCTIONS_KEY);
-
-	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY);
-
-	    List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    qaGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    qaGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    qaAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    qaAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-
-	}
-
 	qaGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -578,26 +464,7 @@
 
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	if (activeModule.equals(QaAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(QaAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
 
-	    String offlineInstructions = (String) sessionMap.get(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY);
-
-	    List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    qaGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    qaGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    qaAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    qaAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	qaGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
@@ -671,12 +538,6 @@
 
 	QaUtils.setFormProperties(request, qaService, qaAuthoringForm, qaGeneralAuthoringDTO, strToolContentID,
 		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	if (activeModule.equals(QaAppConstants.AUTHORING)) {
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    qaAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    qaAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
 
 	qaGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 
@@ -780,13 +641,6 @@
 
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
 
-	if (activeModule.equals(QaAppConstants.AUTHORING)) {
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    qaAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    qaAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	return mapping.findForward("editQuestionBox");
     }
 
@@ -886,25 +740,6 @@
 
 	qaGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(QaAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(QaAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    qaGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    qaGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    qaAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    qaAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	AuthoringUtil authoringUtil = new AuthoringUtil();
 
 	qaGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
@@ -994,25 +829,6 @@
 
 	qaGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(QaAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(QaAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    qaGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    qaGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    qaAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    qaAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	AuthoringUtil authoringUtil = new AuthoringUtil();
 
 	qaGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
@@ -1102,26 +918,6 @@
 
 	qaGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-
-	if (activeModule.equals(QaAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(QaAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    qaGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    qaGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    qaAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    qaAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	AuthoringUtil authoringUtil = new AuthoringUtil();
 
 	qaGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
@@ -1150,218 +946,8 @@
 	return mapping.findForward(QaAppConstants.LOAD_QUESTIONS);
     }
 
-    /**
-     * adds a new file to content repository 
-     * 
-     * @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 {
-	QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form;
 
-	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-	
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
-
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	qaAuthoringForm.setContentFolderID(contentFolderID);
-
-	String activeModule = request.getParameter(QaAppConstants.ACTIVE_MODULE);
-
-	String onlineInstructions = request.getParameter(QaAppConstants.ONLINE_INSTRUCTIONS);
-
-	String offlineInstructions = request.getParameter(QaAppConstants.OFFLINE_INSTRUCTIONS);
-
-	sessionMap.put(QaAppConstants.ONLINE_INSTRUCTIONS_KEY, onlineInstructions);
-	sessionMap.put(QaAppConstants.OFFLINE_INSTRUCTIONS, offlineInstructions);
-
-	List listQuestionContentDTO = (List) sessionMap.get(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
-
-	request.setAttribute(QaAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
-
-	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-
-	String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
-
-	QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
-
-	QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
-	
-	qaGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-
-	qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-	qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	qaGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
-
-	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
-	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
-
-	qaGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	qaAuthoringForm.setTitle(richTextTitle);
-
-	qaGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-
-	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
-	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-
-	List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY);
-	List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	addFileToContentRepository(request, qaAuthoringForm, attachmentList, deletedAttachmentList, sessionMap,
-		qaGeneralAuthoringDTO);
-
-	sessionMap.put(QaAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
-	sessionMap.put(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY, deletedAttachmentList);
-
-	qaGeneralAuthoringDTO.setAttachmentList(attachmentList);
-
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	QaUtils.setFormProperties(request, qaService, qaAuthoringForm, qaGeneralAuthoringDTO, strToolContentID,
-		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-
-	qaGeneralAuthoringDTO.setToolContentID(strToolContentID);
-	qaGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-	qaGeneralAuthoringDTO.setActiveModule(activeModule);
-	qaGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-	qaAuthoringForm.setToolContentID(strToolContentID);
-	qaAuthoringForm.setHttpSessionID(httpSessionID);
-	qaAuthoringForm.setActiveModule(activeModule);
-	qaAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-	qaAuthoringForm.setCurrentTab("3");
-
-	request.setAttribute(QaAppConstants.QA_GENERAL_AUTHORING_DTO, qaGeneralAuthoringDTO);
-
-	qaAuthoringForm.resetUserAction();
-
-	String strOnlineInstructions = request.getParameter("onlineInstructions");
-	String strOfflineInstructions = request.getParameter("offlineInstructions");
-
-	qaAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	qaAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-
-	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-	return mapping.findForward(QaAppConstants.LOAD_QUESTIONS);
-    }
-
     /**
-     * deletes a file from the content repository 
-     * 
-     * @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 {
-	QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form;
-
-	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
-
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	qaAuthoringForm.setContentFolderID(contentFolderID);
-
-	String activeModule = request.getParameter(QaAppConstants.ACTIVE_MODULE);
-
-	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-
-	String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
-
-	List listQuestionContentDTO = (List) sessionMap.get(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
-
-	request.setAttribute(QaAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
-
-	QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
-
-	QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
-	
-	qaGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-
-	qaGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
-
-	QaUtils.setFormProperties(request, qaService, qaAuthoringForm, qaGeneralAuthoringDTO, strToolContentID,
-		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-
-	String onlineInstructions = (String) sessionMap.get(QaAppConstants.ONLINE_INSTRUCTIONS_KEY);
-
-	String offlineInstructions = (String) sessionMap.get(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-
-	qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-	qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-	qaAuthoringForm.setOnlineInstructions(onlineInstructions);
-	qaAuthoringForm.setOfflineInstructions(offlineInstructions);
-
-	String richTextTitle = (String) sessionMap.get(QaAppConstants.ACTIVITY_TITLE_KEY);
-	String richTextInstructions = (String) sessionMap.get(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY);
-
-	qaGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	qaAuthoringForm.setTitle(richTextTitle);
-
-	qaGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-
-	long uuid = WebUtil.readLongParam(request, QaAppConstants.UUID);
-
-	List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY);
-
-	if (attachmentList == null) {
-	    attachmentList = new ArrayList();
-	}
-
-	List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.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 = QaUtils.moveToDelete(Long.toString(uuid), attachmentList, deletedAttachmentList);
-
-	sessionMap.put(QaAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
-	sessionMap.put(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY, deletedAttachmentList);
-
-	qaGeneralAuthoringDTO.setAttachmentList(attachmentList);
-
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	qaGeneralAuthoringDTO.setToolContentID(strToolContentID);
-	qaGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-	qaGeneralAuthoringDTO.setActiveModule(activeModule);
-	qaGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-	qaAuthoringForm.setToolContentID(strToolContentID);
-	qaAuthoringForm.setHttpSessionID(httpSessionID);
-	qaAuthoringForm.setActiveModule(activeModule);
-	qaAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-	qaAuthoringForm.setCurrentTab("3");
-
-	request.setAttribute(QaAppConstants.QA_GENERAL_AUTHORING_DTO, qaGeneralAuthoringDTO);
-
-	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-
-	qaAuthoringForm.resetUserAction();
-	return mapping.findForward(QaAppConstants.LOAD_QUESTIONS);
-    }
-
-    /**
      * persists error messages to request scope
      * 
      * 
@@ -1375,94 +961,6 @@
     }
 
     /**
-     * 
-     * @param request
-     * @param qaAuthoringForm
-     */
-    public void addFileToContentRepository(HttpServletRequest request, QaAuthoringForm qaAuthoringForm,
-	    List attachmentList, List deletedAttachmentList, SessionMap sessionMap,
-	    QaGeneralAuthoringDTO qaGeneralAuthoringDTO) {
-	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
-	if (attachmentList == null) {
-	    attachmentList = new ArrayList();
-	}
-
-	if (deletedAttachmentList == null) {
-	    deletedAttachmentList = new ArrayList();
-	}
-
-	FormFile uploadedFile = null;
-	boolean isOnlineFile = false;
-	String fileType = null;
-	if (qaAuthoringForm.getTheOfflineFile() != null && qaAuthoringForm.getTheOfflineFile().getFileSize() > 0) {
-	    //theOfflineFile is available
-	    uploadedFile = qaAuthoringForm.getTheOfflineFile();
-	    fileType = IToolContentHandler.TYPE_OFFLINE;
-	} else if (qaAuthoringForm.getTheOnlineFile() != null && qaAuthoringForm.getTheOnlineFile().getFileSize() > 0) {
-	    //theOnlineFile is available
-	    uploadedFile = qaAuthoringForm.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 = QaUtils.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);
-	    QaUploadedFile file = new QaUploadedFile();
-	    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 */
-	    qaAuthoringForm.setTheOfflineFile(null);
-	    qaAuthoringForm.setTheOnlineFile(null);
-	} catch (FileNotFoundException e) {
-	    QaAction.logger.error("Unable to uploadfile", e);
-	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
-	} catch (IOException e) {
-	    QaAction.logger.error("Unable to uploadfile", e);
-	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
-	} catch (RepositoryCheckedException e) {
-	    QaAction.logger.error("Unable to uploadfile", e);
-	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
-	}
-    }
-
-    /**
      * QaToolContentHandler getToolContentHandler()
      * 
      * @return
@@ -1476,60 +974,6 @@
 	return toolContentHandler;
     }
 
-    /**
-     * 
-     * Go through the attachments collections. Remove any content repository or
-     * tool objects matching entries in the the deletedAttachments collection,
-     * add any new attachments in the attachments collection. Clear the
-     * deletedAttachments collection, ready for new editing.
-     * 
-     * @param qaContent
-     * @param attachmentList
-     * @param deletedAttachmentList
-     * @param mapping
-     * @param request
-     * @return
-     */
-    private List saveAttachments(QaContent qaContent, List attachmentList, List deletedAttachmentList,
-	    ActionMapping mapping, HttpServletRequest request) {
-
-	if (attachmentList == null || deletedAttachmentList == null) {
-	    return null;
-	}
-
-	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
-	if (deletedAttachmentList != null) {
-	    Iterator iter = deletedAttachmentList.iterator();
-	    while (iter.hasNext()) {
-		QaUploadedFile attachment = (QaUploadedFile) iter.next();
-
-		/* remove entry from db, leave in content repository. */
-
-		if (attachment.getSubmissionId() != null) {
-		    qaService.removeFile(attachment.getSubmissionId());
-		}
-	    }
-	    deletedAttachmentList.clear();
-	}
-
-	if (attachmentList != null) {
-	    Iterator iter = attachmentList.iterator();
-	    while (iter.hasNext()) {
-		QaUploadedFile attachment = (QaUploadedFile) iter.next();
-
-		if (attachment.getSubmissionId() == null) {
-		    /*
-		     * add entry to tool table - file already in content repository
-		     */
-		    qaService.persistFile(qaContent, attachment);
-		}
-	    }
-	}
-
-	return deletedAttachmentList;
-    }
-
     public ActionForward editActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 	return null;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.80 -r1.81
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	8 Jan 2014 17:50:55 -0000	1.80
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	17 Jan 2014 22:04:43 -0000	1.81
@@ -291,13 +291,6 @@
 	    return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
 	}
 
-	// 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.
-	if (qaContent.isRunOffline()) {
-	    QaUtils.cleanUpSessionAbsolute(request);
-	    return (mapping.findForward(RUN_OFFLINE));
-	}
-
 	//check if there is submission deadline
 	Date submissionDeadline = qaContent.getSubmissionDeadline();
 	if (submissionDeadline != null) {
@@ -310,9 +303,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("runOffline");
+			return mapping.findForward("submissionDeadline");
 		}
 	}
 	
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v
diff -u -r1.74 -r1.75
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	8 Jan 2014 17:50:55 -0000	1.74
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	17 Jan 2014 22:04:43 -0000	1.75
@@ -95,7 +95,6 @@
 package org.lamsfoundation.lams.tool.qa.web;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -223,17 +222,7 @@
 	}
 	/* ... till here */
 
-	/** getting instructions screen content from here... */
-	generalMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	generalMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	generalMonitoringDTO.setAttachmentList(attachmentList);
-	generalMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
-	
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 	MonitoringUtil.setUpMonitoring(request, qaService, qaContent);
 
@@ -329,17 +318,7 @@
 	}
 	/* ... till here */
 
-	/** getting instructions screen content from here... */
-	generalMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	generalMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	generalMonitoringDTO.setAttachmentList(attachmentList);
-	generalMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
-	
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
 	MonitoringUtil.setUpMonitoring(request, qaService, qaContent);
@@ -424,17 +403,7 @@
 	}
 	request.setAttribute(QaAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
 
-	/** getting instructions screen content from here... */
-	generalMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	generalMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	generalMonitoringDTO.setAttachmentList(attachmentList);
-	generalMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
-	
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
 	List<ReflectionDTO> reflectionDTOs = qaService.getReflectList(qaContent, null);
@@ -542,16 +511,6 @@
 	}
 	/* ... till here */
 
-	/* getting instructions screen content from here... */
-	generalMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	generalMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
-	
-	generalMonitoringDTO.setAttachmentList(attachmentList);
-	generalMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/* ...till here */
-
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
 	MonitoringUtil.setUpMonitoring(request, qaService, qaContent);
@@ -607,17 +566,7 @@
 	    generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	generalMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	generalMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	generalMonitoringDTO.setAttachmentList(attachmentList);
-	generalMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
-	
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
 	List listQuestionContentDTO = new LinkedList();
@@ -1360,16 +1309,6 @@
 
 	generalMonitoringDTO.setEditResponse(new Boolean(setEditResponse).toString());
 
-	/* getting instructions screen content from here... */
-	generalMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	generalMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
-	
-	generalMonitoringDTO.setAttachmentList(attachmentList);
-	generalMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/* ...till here * */
-
 	if (generalLearnerFlowDTO != null) {
 	    generalLearnerFlowDTO.setListMonitoredAnswersContainerDTO(listMonitoredAnswersContainerDTO);
 
@@ -1447,11 +1386,7 @@
 	if (isContentInUse == true) {
 	    editActivityDTO.setMonitoredContentInUse(new Boolean(true).toString());
 	}
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	generalMonitoringDTO.setAttachmentList(attachmentList);
-	
 
 	request.setAttribute(QaAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
@@ -1842,9 +1777,6 @@
 	prepareEditActivityScreenData(request, qaContent);
 
 	GeneralMonitoringDTO generalMonitoringDTO = new GeneralMonitoringDTO();
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
-	
-	generalMonitoringDTO.setAttachmentList(attachmentList);
 
 	if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
 	    generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
@@ -2022,14 +1954,7 @@
 	} else {
 	    qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
-
-	qaGeneralMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaGeneralMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	qaGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	
 
 	
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, qaGeneralMonitoringDTO);
@@ -2227,14 +2152,7 @@
 	    qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 	qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
-
-	qaGeneralMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaGeneralMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	qaGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	
 
 	
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, qaGeneralMonitoringDTO);
@@ -2382,14 +2300,7 @@
 	} else {
 	    qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
-
-	qaGeneralMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaGeneralMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	qaGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	
 
 	qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 	
@@ -2477,14 +2388,7 @@
 	} else {
 	    qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
-
-	qaGeneralMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaGeneralMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	qaGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	
 
 	qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 	
@@ -2601,15 +2505,6 @@
 	} else {
 	    qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
-
-	qaGeneralMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaGeneralMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
-	
-	qaGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	
-
 	qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 	
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, qaGeneralMonitoringDTO);
@@ -2753,14 +2648,7 @@
 	} else {
 	    qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
-
-	qaGeneralMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaGeneralMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	qaGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	
 
 	qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 	
@@ -2888,14 +2776,7 @@
 	} else {
 	    qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
-
-	qaGeneralMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaGeneralMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	qaGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	
 
 	qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 	
@@ -3025,14 +2906,7 @@
 	} else {
 	    qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
-
-	qaGeneralMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaGeneralMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
 	
-	qaGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	
 
 	qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 	
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v
diff -u -r1.62 -r1.63
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	13 Nov 2013 15:38:47 -0000	1.62
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	17 Jan 2014 22:04:43 -0000	1.63
@@ -25,7 +25,6 @@
 package org.lamsfoundation.lams.tool.qa.web;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -122,16 +121,6 @@
 	qaMonitoringForm.setActiveModule(MONITORING);
 	qaMonitoringForm.setEditResponse(new Boolean(false).toString());
 
-	/** getting instructions screen content from here... */
-	generalMonitoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	generalMonitoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
-	
-	generalMonitoringDTO.setAttachmentList(attachmentList);
-	generalMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	EditActivityDTO editActivityDTO = new EditActivityDTO();
 	boolean isContentInUse = qaContent.isContentLocked();
 	if (isContentInUse == true) {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	4 Jul 2013 10:27:29 -0000	1.9
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	17 Jan 2014 22:04:43 -0000	1.10
@@ -30,7 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 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;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v
diff -u -r1.78 -r1.79
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	8 Jan 2014 17:50:55 -0000	1.78
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	17 Jan 2014 22:04:43 -0000	1.79
@@ -124,7 +124,6 @@
 package org.lamsfoundation.lams.tool.qa.web;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -236,8 +235,6 @@
 
 	SessionMap sessionMap = new SessionMap();
 	List sequentialCheckedCa = new LinkedList();
-	sessionMap.put(QaAppConstants.ATTACHMENT_LIST_KEY, new ArrayList());
-	sessionMap.put(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY, new ArrayList());
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, "");
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, "");
 	qaAuthoringForm.setHttpSessionID(sessionMap.getSessionID());
@@ -302,20 +299,6 @@
 		    strToolContentID).longValue(), false, qaService, qaGeneralAuthoringDTO, sessionMap);
 	}
 
-	if (qaGeneralAuthoringDTO.getOnlineInstructions() == null
-		|| qaGeneralAuthoringDTO.getOnlineInstructions().length() == 0) {
-	    qaGeneralAuthoringDTO.setOnlineInstructions(QaAppConstants.DEFAULT_ONLINE_INST);
-	    qaAuthoringForm.setOnlineInstructions(QaAppConstants.DEFAULT_ONLINE_INST);
-	    sessionMap.put(QaAppConstants.ONLINE_INSTRUCTIONS_KEY, QaAppConstants.DEFAULT_ONLINE_INST);
-	}
-
-	if (qaGeneralAuthoringDTO.getOfflineInstructions() == null
-		|| qaGeneralAuthoringDTO.getOfflineInstructions().length() == 0) {
-	    qaGeneralAuthoringDTO.setOfflineInstructions(QaAppConstants.DEFAULT_OFFLINE_INST);
-	    qaAuthoringForm.setOfflineInstructions(QaAppConstants.DEFAULT_OFFLINE_INST);
-	    sessionMap.put(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY, QaAppConstants.DEFAULT_OFFLINE_INST);
-	}
-
 	SortedSet<QaCondition> conditionList = getQaConditionList(sessionMap);
 	conditionList.clear();
 	conditionList.addAll(qaContent.getConditions());
@@ -373,13 +356,6 @@
 	qaAuthoringForm.setReflectionSubject(qaContent.getReflectionSubject());
 	qaGeneralAuthoringDTO.setReflectionSubject(qaContent.getReflectionSubject());
 
-	List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
-	qaGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	qaGeneralAuthoringDTO.setDeletedAttachmentList(new ArrayList());
-
-	sessionMap.put(QaAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
-	sessionMap.put(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY, new ArrayList());
-
 	qaGeneralAuthoringDTO.setIsDefineLater(new Boolean(qaContent.isDefineLater()).toString());
 
 	qaGeneralAuthoringDTO.setActivityTitle(qaContent.getTitle());
@@ -437,14 +413,6 @@
 
 	}
 
-	qaGeneralAuthoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaGeneralAuthoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
-
-	qaAuthoringForm.setOnlineInstructions(qaContent.getOnlineInstructions());
-	qaAuthoringForm.setOfflineInstructions(qaContent.getOfflineInstructions());
-	sessionMap.put(QaAppConstants.ONLINE_INSTRUCTIONS_KEY, qaContent.getOnlineInstructions());
-	sessionMap.put(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY, qaContent.getOfflineInstructions());
-
 	qaAuthoringForm.resetUserAction();
 	
 	return qaContent;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java	8 Jan 2014 17:50:55 -0000	1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java	17 Jan 2014 22:04:44 -0000	1.4
@@ -25,7 +25,6 @@
 
 /* ActionForm for the Authoring environment*/
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 
@@ -41,8 +40,6 @@
     protected String removeAllContent;
     protected String submitAllContent;
     protected String submitTabDone;
-    protected String submitOfflineFile;
-    protected String submitOnlineFile;
     protected String dispatch;
     protected String currentTab;
 
@@ -59,12 +56,6 @@
     protected String questionIndex;
     protected String isRemoveContent;
 
-    /* instructions content */
-    protected String onlineInstructions;
-    protected String offlineInstructions;
-    protected FormFile theOfflineFile;
-    protected FormFile theOnlineFile;
-
     protected String toolContentID;
     /* advanced content */
     protected String synchInMonitor;
@@ -106,8 +97,6 @@
 	this.removeAllContent = null;
 	this.submitAllContent = null;
 	this.submitTabDone = null;
-	this.submitOfflineFile = null;
-	this.submitOnlineFile = null;
 
 	this.summaryMonitoring = null;
 	this.instructionsMonitoring = null;
@@ -124,8 +113,6 @@
 	this.removeAllContent = null;
 	this.submitAllContent = null;
 	this.submitTabDone = null;
-	this.submitOfflineFile = null;
-	this.submitOnlineFile = null;
 
 	this.choice = null;
 	this.choiceBasic = null;
@@ -137,9 +124,6 @@
 	this.questionIndex = null;
 	this.isRemoveContent = null;
 
-	this.onlineInstructions = null;
-	this.offlineInstructions = null;
-
 	this.endLearningMessage = null;
 	this.synchInMonitor = null;
 	this.reportTitle = null;
@@ -177,8 +161,8 @@
 		.append("activeModule: ", activeModule).append("defaultContentIdStr: ", defaultContentIdStr)
 		.append("title: ", title).append("instructions: ", instructions).append("reportTitle: ", reportTitle)
 		.append("monitoringReportTitle: ", monitoringReportTitle)
-		.append("endLearningMessage: ", endLearningMessage).append("onlineInstructions: ", onlineInstructions)
-		.append("offlineInstructions: ", offlineInstructions).append("usernameVisible: ", usernameVisible)
+		.append("endLearningMessage: ", endLearningMessage)
+		.append("usernameVisible: ", usernameVisible)
 		.append("allowRateAnswers: ", allowRateAnswers).append("showOtherAnswers: ", showOtherAnswers)
 		.append("synchInMonitor: ", synchInMonitor).append("questionsSequenced: ", questionsSequenced)
 		.append("lockWhenFinished: ", lockWhenFinished).append("reflect: ", reflect)
@@ -306,36 +290,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 syncInMonitor.
      */
     public String getSynchInMonitor() {
@@ -591,66 +545,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 dispatch.
      */
     public String getDispatch() {
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v
diff -u -r1.50 -r1.51
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	8 Jan 2014 17:50:56 -0000	1.50
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	17 Jan 2014 22:04:44 -0000	1.51
@@ -262,8 +262,8 @@
 	  	/>
 	  	
 	  	<forward
-		    name="runOffline"
-	        path="/learning/RunOffline.jsp"
+		    name="submissionDeadline"
+	        path="/learning/submissionDeadline.jsp"
 		    redirect="false"
 	  	/>
 	  	
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp,v
diff -u -r1.31 -r1.32
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	28 Feb 2011 12:21:58 -0000	1.31
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	17 Jan 2014 22:04:44 -0000	1.32
@@ -32,7 +32,6 @@
 		Set tabs = new LinkedHashSet();
 		tabs.add("label.basic");
 		tabs.add("label.advanced");
-		tabs.add("label.instructions");
 		tabs.add("label.conditions");
 		pageContext.setAttribute("tabs", tabs);
 		
@@ -141,13 +140,9 @@
 			<!-- 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) -->
 
-			<!-- tab content 4 (Conditions) -->
-			<lams:TabBody id="4" titleKey="label.conditions" page="conditions.jsp" />
+			<!-- tab content 3 (Conditions) -->
+			<lams:TabBody id="3" titleKey="label.conditions" page="conditions.jsp" />
 			<!-- end of content (Conditions) -->
 			
 			<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
Fisheye: Tag 1.23 refers to a dead (removed) revision in file `lams_tool_laqa/web/authoring/InstructionsContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.36 -r1.37
--- lams_tool_laqa/web/learning/AnswersContent.jsp	8 Jan 2014 17:50:56 -0000	1.36
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	17 Jan 2014 22:04:44 -0000	1.37
@@ -150,57 +150,47 @@
 				</p>
 			</logic:messagesPresent>
 
-			<c:if test="${generalLearnerFlowDTO.activityOffline == 'true'}">
-				<h3>
-				   <fmt:message key="label.learning.forceOfflineMessage" />
-				</h3>
-			</c:if>
-
-
-			<c:if test="${generalLearnerFlowDTO.activityOffline == 'false'}">
 				<p>
 				  <c:out value="${generalLearnerFlowDTO.activityInstructions}"
 						escapeXml="false" />
 				</p>
-				<c:choose>
+				
+			<c:choose>
+				<c:when test="${(generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential') && hasEditRight}">
 
-					<c:when
-						test="${(generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential') && hasEditRight}">
-
-						<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
-							<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}">
-								<p><fmt:message key="label.feedback.seq" />
+					<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
+						<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}">
+							<p><fmt:message key="label.feedback.seq" />
 									
-									<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+								<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
 									
-									<fmt:message key="label.questions.simple" /></p>
+								<fmt:message key="label.questions.simple" /></p>
 								
-							</c:if>
 						</c:if>
+					</c:if>
+					
+					<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}">
+						<p>
+							<fmt:message key="label.questions.remaining" />
+							<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+						</p>
+					</c:if>
 
-						<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}">
-							<p>
-								<fmt:message key="label.questions.remaining" />
-								<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
-							</p>
-						</c:if>
+					<jsp:include page="/learning/SequentialAnswersContent.jsp" />
+				</c:when>
 
-						<jsp:include page="/learning/SequentialAnswersContent.jsp" />
-					</c:when>
+				<c:otherwise>
 
-					<c:otherwise>
+					<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
+						<fmt:message key="label.feedback.combined" /> &nbsp <c:out
+							value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+						<fmt:message key="label.questions.simple" />
+					</c:if>						
 
-						<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
-							<fmt:message key="label.feedback.combined" /> &nbsp <c:out
-								value="${generalLearnerFlowDTO.remainingQuestionCount}" />
-							<fmt:message key="label.questions.simple" />
-						</c:if>						
+					<jsp:include page="/learning/CombinedAnswersContent.jsp" />
+				</c:otherwise>
+			</c:choose>
 
-						<jsp:include page="/learning/CombinedAnswersContent.jsp" />
-					</c:otherwise>
-				</c:choose>
-			</c:if>
-
 		</html:form>
 	</div>
 
Fisheye: Tag 1.23 refers to a dead (removed) revision in file `lams_tool_laqa/web/learning/RunOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/learning/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/learning/submissionDeadline.jsp	17 Jan 2014 22:04:44 -0000	1.1
@@ -0,0 +1,100 @@
+<!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[generalLearnerFlowDTO.httpSessionID]}" />
+
+<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 submitLearningMethod(actionMethod) 
+		{
+			if (actionMethod == 'endLearning') {
+				document.getElementById("finishButton").disabled = true;
+			}
+			document.QaLearningForm.method.value=actionMethod; 
+			document.QaLearningForm.submit();
+		}
+		
+		function submitMethod(actionMethod) 
+		{
+			submitLearningMethod(actionMethod);
+		}
+	</script>
+</lams:head>
+
+<body class="stripes">
+
+	<html:form action="/learning?validate=false"
+		method="POST" styleId="form">
+		<html:hidden property="method" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+		<html:hidden property="httpSessionID" />
+		<html:hidden property="totalQuestionCount" />
+
+		<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="${sessionMap.submissionDeadline}" /></fmt:param>
+				</fmt:message>
+			</div>
+
+			<div class="space-bottom-top align-right">
+
+				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
+					<html:link href="#nogo" property="endLearning" styleId="finishButton"
+						onclick="javascript:submitMethod('endLearning');return false"
+						styleClass="button">
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="button.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="button.endLearning" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
+					</html:link>
+				</c:if>
+
+				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
+					<html:button property="forwardtoReflection"
+						onclick="javascript:submitMethod('forwardtoReflection');"
+						styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:if>
+
+			</div>
+		</div>
+	</html:form>
+	<div id="footer"></div>
+</body>
+</lams:html>
+
+
+
+
+
+
+
+
Index: lams_tool_laqa/web/learning/mobile/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/AnswersContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/learning/mobile/AnswersContent.jsp	8 Jan 2014 17:50:54 -0000	1.4
+++ lams_tool_laqa/web/learning/mobile/AnswersContent.jsp	17 Jan 2014 22:04:44 -0000	1.5
@@ -155,50 +155,43 @@
          			</html:messages> 
 				</p>
 			</logic:messagesPresent>
+			
+			<p>
+				<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false" />
+			</p>
+			
+			<c:choose>
+				<c:when test="${(generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential') && hasEditRight}">
 
-			<c:if test="${generalLearnerFlowDTO.activityOffline == 'true'}">
-				<h3>
-				   <fmt:message key="label.learning.forceOfflineMessage" />
-				</h3>
-			</c:if>
-
-			<c:if test="${generalLearnerFlowDTO.activityOffline == 'false'}">
-				<p>
-				  <c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false" />
-				</p>
-				<c:choose>
-					<c:when test="${(generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential') && hasEditRight}">
-
-						<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
-							<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}">
-								<p><fmt:message key="label.feedback.seq" />
-									<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
-									<fmt:message key="label.questions.simple" />
-								</p>
-							</c:if>
-						</c:if>
-
-						<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}">
-							<p>
-								<fmt:message key="label.questions.remaining" />
+					<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
+						<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}">
+							<p><fmt:message key="label.feedback.seq" />
 								<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+								<fmt:message key="label.questions.simple" />
 							</p>
 						</c:if>
+					</c:if>
 
-						<jsp:include page="/learning/mobile/SequentialAnswersContent.jsp" />
-					</c:when>
+					<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}">
+						<p>
+							<fmt:message key="label.questions.remaining" />
+							<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+						</p>
+					</c:if>
 
-					<c:otherwise>
-						<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
-							<fmt:message key="label.feedback.combined" /> &nbsp <c:out
-								value="${generalLearnerFlowDTO.remainingQuestionCount}" />
-							<fmt:message key="label.questions.simple" />
-						</c:if>						
-						<jsp:include page="/learning/mobile/CombinedAnswersContent.jsp" />
-					</c:otherwise>
-				</c:choose>
-			</c:if>
+					<jsp:include page="/learning/mobile/SequentialAnswersContent.jsp" />
+				</c:when>
 
+				<c:otherwise>
+					<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
+						<fmt:message key="label.feedback.combined" /> &nbsp <c:out
+							value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+						<fmt:message key="label.questions.simple" />
+					</c:if>						
+					<jsp:include page="/learning/mobile/CombinedAnswersContent.jsp" />
+				</c:otherwise>
+			</c:choose>
+
 		</html:form>
 
 </div>
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_laqa/web/learning/mobile/RunOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/learning/mobile/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/learning/mobile/submissionDeadline.jsp	17 Jan 2014 22:04:43 -0000	1.1
@@ -0,0 +1,99 @@
+
+<!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>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
+
+<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 submitLearningMethod(actionMethod){
+			if (actionMethod == 'endLearning') {
+				document.getElementById("finishButton").disabled = true;
+			}
+			document.QaLearningForm.method.value=actionMethod; 
+			document.QaLearningForm.submit();
+		}
+		
+		function submitMethod(actionMethod){
+			submitLearningMethod(actionMethod);
+		}
+	</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 -->
+
+	<div data-role="content">	
+		<html:form action="/learning?validate=false" method="POST" styleId="form">
+			<html:hidden property="method" />
+			<html:hidden property="toolSessionID" />
+			<html:hidden property="userID" />
+			<html:hidden property="httpSessionID" />
+			<html:hidden property="totalQuestionCount" />
+
+			<div class="warning">
+				<fmt:message key="authoring.info.teacher.set.restriction" >
+					<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+				</fmt:message>
+			</div>
+					
+			<div class="space-bottom-top align-right">
+
+				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
+					<html:link href="#nogo" property="endLearning" styleId="finishButton"
+						onclick="javascript:submitMethod('endLearning');return false"
+						styleClass="button">
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="button.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="button.endLearning" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
+					</html:link>
+				</c:if>
+
+				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
+					<html:button property="forwardtoReflection"
+						onclick="javascript:submitMethod('forwardtoReflection');"
+						styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:if>
+
+			</div>
+		</html:form>
+	</div>
+	
+	<div data-role="footer" data-theme="b">
+		<h2>&nbsp;</h2>
+	</div><!-- /footer -->
+
+</div>
+</body>
+</lams:html>
Fisheye: Tag 1.19 refers to a dead (removed) revision in file `lams_tool_laqa/web/monitoring/Instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.35 -r1.36
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	19 Feb 2013 10:51:15 -0000	1.35
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	17 Jan 2014 22:04:44 -0000	1.36
@@ -29,7 +29,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);
@@ -214,9 +213,8 @@
 		<lams:help toolSignature="<%= QaAppConstants.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_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/xdoclet/struts-actions.xml,v
diff -u -r1.34 -r1.35
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	18 Aug 2009 04:29:08 -0000	1.34
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	17 Jan 2014 22:06:34 -0000	1.35
@@ -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.rsrc.web.action.AuthoringAction"
-			name="resourceForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOnlineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/uploadOfflineFile"
-			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
-			name="resourceForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOfflineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/deleteOnlineFile"
-			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
-			name="resourceForm" 
-			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.rsrc.web.action.AuthoringAction"
-			name="resourceForm" 
-			scope="request" 
-			validate="false"
-			parameter="deleteOfflineFile">
-			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
-		</action>
 		<!-- ==========  Resource Item : URL ========== -->
 		<action path="/authoring/newItemInit"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
@@ -186,8 +153,7 @@
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			parameter="start" >
 			<forward name="success" path="/pages/learning/start.jsp" />
-			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
-			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />			
+			<forward name="defineLater" path="/pages/learning/definelater.jsp" />	
 		</action>
 		<!-- <action path="/learning/completeItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v
diff -u -r1.39 -r1.40
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	10 Feb 2011 23:05:45 -0000	1.39
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	17 Jan 2014 22:06:34 -0000	1.40
@@ -63,8 +63,6 @@
 
     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";
@@ -78,12 +76,8 @@
 
     public static final String ATTR_RESOURCE_ITEM_LIST = "resourceList";
 
-    public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
-
     public static final String ATTR_DELETED_RESOURCE_ITEM_LIST = "deleteResourceList";
 
-    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";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml,v
diff -u -r1.18 -r1.19
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	2 Aug 2009 20:14:54 -0000	1.18
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	17 Jan 2014 22:06:34 -0000	1.19
@@ -28,12 +28,6 @@
         </property>
     </bean>
 
-   <bean id="resourceAttachmentDao" class="org.lamsfoundation.lams.tool.rsrc.dao.hibernate.ResourceAttachmentDAOHibernate">
-        <property name="sessionFactory">
-            <ref bean="coreSessionFactory"/>
-        </property>
-    </bean>
-
    <bean id="resourceUserDao" class="org.lamsfoundation.lams.tool.rsrc.dao.hibernate.ResourceUserDAOHibernate">
         <property name="sessionFactory">
             <ref bean="coreSessionFactory"/>
@@ -66,9 +60,6 @@
         <property name="resourceItemVisitDao">
             <ref local="resourceItemVisitDao"/>
         </property>
-        <property name="resourceAttachmentDao">
-            <ref local="resourceAttachmentDao"/>
-        </property>
         <property name="resourceUserDao">
             <ref local="resourceUserDao"/>
         </property>
@@ -121,8 +112,6 @@
                 <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="setAsDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="setAsRunOffline">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>
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceAttachmentDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20140102.sql	17 Jan 2014 22:06:34 -0000	1.1
@@ -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_larsrc11_resource DROP COLUMN online_instructions;
+ALTER TABLE tl_larsrc11_resource DROP COLUMN offline_instructions;
+ALTER TABLE tl_larsrc11_resource DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_larsrc11_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='larsrc11';
+
+----------------------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_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java,v
diff -u -r1.20 -r1.21
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	3 Sep 2008 02:11:20 -0000	1.20
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	17 Jan 2014 22:06:34 -0000	1.21
@@ -59,7 +59,6 @@
 	private String instructions;
 
 	//advance
-	private boolean runOffline;
 
 	private boolean runAuto;
 
@@ -77,13 +76,6 @@
 
 	private boolean notifyTeachersOnAssigmentSumbit;
 
-	//instructions
-	private String onlineInstructions;
-
-	private String offlineInstructions;
-
-	private Set attachments;
-
 	//general infomation
 	private Date created;
 
@@ -99,30 +91,22 @@
 	private String reflectInstructions;
 
 	//*************** NON Persist Fields ********************
-	private IToolContentHandler toolContentHandler;
 
 	private String miniViewNumberStr;
 
-	private List<ResourceAttachment> onlineFileList;
-
-	private List<ResourceAttachment> offlineFileList;
-
 	/**
 	 * Default contruction method. 
 	 *
 	 */
 	public Resource() {
-		attachments = new HashSet();
 		resourceItems = new HashSet();
 	}
 
 	//  **********************************************************
 	//		Function method for Resource
 	//  **********************************************************
-	public static Resource newInstance(Resource defaultContent, Long contentId,
-			ResourceToolContentHandler resourceToolContentHandler) {
+	public static Resource newInstance(Resource defaultContent, Long contentId) {
 		Resource toContent = new Resource();
-		defaultContent.toolContentHandler = resourceToolContentHandler;
 		toContent = (Resource) defaultContent.clone();
 		toContent.setContentId(contentId);
 
@@ -155,19 +139,6 @@
 				}
 				resource.resourceItems = set;
 			}
-			//clone attachment
-			if (attachments != null) {
-				Iterator iter = attachments.iterator();
-				Set set = new HashSet();
-				while (iter.hasNext()) {
-					ResourceAttachment file = (ResourceAttachment) iter.next();
-					ResourceAttachment newFile = (ResourceAttachment) file.clone();
-					//  				just clone old file without duplicate it in repository
-
-					set.add(newFile);
-				}
-				resource.attachments = set;
-			}
 			//clone ReourceUser as well
 			if (createdBy != null) {
 				resource.setCreatedBy((ResourceUser) createdBy.clone());
@@ -192,15 +163,13 @@
 		final Resource genericEntity = (Resource) 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).append(updated,
+				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();
 	}
 
 	/**
@@ -215,22 +184,6 @@
 		this.setUpdated(new Date(now));
 	}
 
-	public void toDTO() {
-		onlineFileList = new ArrayList<ResourceAttachment>();
-		offlineFileList = new ArrayList<ResourceAttachment>();
-		Set<ResourceAttachment> fileSet = this.getAttachments();
-		if (fileSet != null) {
-			for (ResourceAttachment file : fileSet) {
-				if (StringUtils.equalsIgnoreCase(file.getFileType(), IToolContentHandler.TYPE_OFFLINE)) {
-					offlineFileList.add(file);
-				}
-				else {
-					onlineFileList.add(file);
-				}
-			}
-		}
-	}
-
 	//**********************************************************
 	// get/set methods
 	//**********************************************************
@@ -321,26 +274,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
@@ -374,59 +307,6 @@
 	}
 
 	/**
-	 * @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="resource_uid"
-	 * @hibernate.collection-one-to-many
-	 * 			class="org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment"
-	 *
-	 * @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"
@@ -542,26 +422,6 @@
 		miniViewNumberStr = minViewNumber;
 	}
 
-	public List<ResourceAttachment> getOfflineFileList() {
-		return offlineFileList;
-	}
-
-	public void setOfflineFileList(List<ResourceAttachment> offlineFileList) {
-		this.offlineFileList = offlineFileList;
-	}
-
-	public List<ResourceAttachment> getOnlineFileList() {
-		return onlineFileList;
-	}
-
-	public void setOnlineFileList(List<ResourceAttachment> onlineFileList) {
-		this.onlineFileList = onlineFileList;
-	}
-
-	public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-		this.toolContentHandler = toolContentHandler;
-	}
-
 	/**
 	 * @hibernate.property column="reflect_instructions"
 	 * @return
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java,v
diff -u -r1.27 -r1.28
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	10 Feb 2011 23:05:45 -0000	1.27
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	17 Jan 2014 22:06:33 -0000	1.28
@@ -35,7 +35,6 @@
 import org.lamsfoundation.lams.tool.rsrc.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.rsrc.dto.Summary;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
-import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
@@ -85,16 +84,6 @@
     List getAuthoredItems(Long resourceUid);
 
     /**
-     * Upload instruciton file into repository.
-     * 
-     * @param file
-     * @param type
-     * @return
-     * @throws UploadResourceFileException
-     */
-    ResourceAttachment uploadInstructionFile(FormFile file, String type) throws UploadResourceFileException;
-
-    /**
      * Upload resource item file to repository. i.e., single file, websize zip file, or learning object zip file.
      * 
      * @param item
@@ -140,14 +129,6 @@
     void saveOrUpdateResource(Resource Resource);
 
     /**
-     * Delete reource attachment(i.e., offline/online instruction file) from database. This method does not delete the
-     * file from repository.
-     * 
-     * @param attachmentUid
-     */
-    void deleteResourceAttachment(Long attachmentUid);
-
-    /**
      * Delete resoruce item from database.
      * 
      * @param uid
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceImportContentVersionFilter.java	17 Jan 2014 22:06:33 -0000	1.1
@@ -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: ResourceImportContentVersionFilter.java,v 1.1 2014/01/17 22:06:33 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.rsrc.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.rsrc.model.Resource;
+
+/**
+ * Import filter class for different version of Resource content.
+ */
+public class ResourceImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20131128 version content to 20140102 version tool server.
+     */
+    public void up20131128To20140102() {
+	this.removeField(Resource.class, "runOffline");
+	this.removeField(Resource.class, "onlineInstructions");
+	this.removeField(Resource.class, "offlineInstructions");
+	this.removeField(Resource.class, "attachments");
+    }
+}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v
diff -u -r1.67 -r1.68
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	29 Jul 2013 23:11:39 -0000	1.67
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	17 Jan 2014 22:06:33 -0000	1.68
@@ -78,7 +78,6 @@
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
-import org.lamsfoundation.lams.tool.rsrc.dao.ResourceAttachmentDAO;
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceDAO;
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemDAO;
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemVisitDAO;
@@ -91,7 +90,6 @@
 import org.lamsfoundation.lams.tool.rsrc.ims.ImscpApplicationException;
 import org.lamsfoundation.lams.tool.rsrc.ims.SimpleContentPackageConverter;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
-import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemVisitLog;
@@ -126,8 +124,6 @@
 
     private ResourceItemDAO resourceItemDao;
 
-    private ResourceAttachmentDAO resourceAttachmentDao;
-
     private ResourceUserDAO resourceUserDao;
 
     private ResourceSessionDAO resourceSessionDao;
@@ -254,35 +250,14 @@
 	Resource defaultContent = getDefaultResource();
 	// save default content by given ID.
 	Resource content = new Resource();
-	content = Resource.newInstance(defaultContent, contentId, resourceToolContentHandler);
+	content = Resource.newInstance(defaultContent, contentId);
 	return content;
     }
 
     public List getAuthoredItems(Long resourceUid) {
 	return resourceItemDao.getAuthoringItems(resourceUid);
     }
 
-    public ResourceAttachment uploadInstructionFile(FormFile uploadFile, String fileType)
-	    throws UploadResourceFileException {
-	if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
-	    throw new UploadResourceFileException(messageService.getMessage("error.msg.upload.file.not.found",
-		    new Object[] { uploadFile }));
-	}
-
-	// upload file to repository
-	NodeKey nodeKey = processFile(uploadFile, fileType);
-
-	// create new attachement
-	ResourceAttachment file = new ResourceAttachment();
-	file.setFileType(fileType);
-	file.setFileUuid(nodeKey.getUuid());
-	file.setFileVersionId(nodeKey.getVersion());
-	file.setFileName(uploadFile.getFileName());
-	file.setCreated(new Date());
-
-	return file;
-    }
-
     public void createUser(ResourceUser resourceUser) {
 	resourceUserDao.saveObject(resourceUser);
     }
@@ -313,11 +288,6 @@
 	resourceDao.saveObject(resource);
     }
 
-    public void deleteResourceAttachment(Long attachmentUid) {
-	resourceAttachmentDao.removeObject(ResourceAttachment.class, attachmentUid);
-
-    }
-
     public void saveOrUpdateResourceItem(ResourceItem item) {
 	resourceItemDao.saveObject(item);
     }
@@ -690,13 +660,12 @@
      * @throws RepositoryCheckedException
      * @throws InvalidParameterException
      */
-    private NodeKey processFile(FormFile file, String fileType) throws UploadResourceFileException {
+    private NodeKey processFile(FormFile file) throws UploadResourceFileException {
 	NodeKey node = null;
 	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
 	    String fileName = file.getFileName();
 	    try {
-		node = resourceToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType(),
-			fileType);
+		node = resourceToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType());
 	    } catch (InvalidParameterException e) {
 		throw new UploadResourceFileException(messageService.getMessage("error.msg.invaid.param.upload"));
 	    } catch (FileNotFoundException e) {
@@ -729,7 +698,7 @@
 	    String fileType = file.getContentType();
 	    // For file only upload one sigle file
 	    if (item.getType() == ResourceConstants.RESOURCE_TYPE_FILE) {
-		NodeKey nodeKey = processFile(file, IToolContentHandler.TYPE_ONLINE);
+		NodeKey nodeKey = processFile(file);
 		item.setFileUuid(nodeKey.getUuid());
 		item.setFileVersionId(nodeKey.getVersion());
 	    }
@@ -837,10 +806,6 @@
 	this.repositoryService = repositoryService;
     }
 
-    public void setResourceAttachmentDao(ResourceAttachmentDAO resourceAttachmentDao) {
-	this.resourceAttachmentDao = resourceAttachmentDao;
-    }
-
     public void setResourceDao(ResourceDAO resourceDao) {
 	this.resourceDao = resourceDao;
     }
@@ -891,14 +856,9 @@
 	}
 
 	// set ResourceToolContentHandler as null to avoid copy file node in repository again.
-	toolContentObj = Resource.newInstance(toolContentObj, toolContentId, null);
-	toolContentObj.setToolContentHandler(null);
-	toolContentObj.setOfflineFileList(null);
-	toolContentObj.setOnlineFileList(null);
+	toolContentObj = Resource.newInstance(toolContentObj, toolContentId);
 	toolContentObj.setMiniViewNumberStr(null);
 	try {
-	    exportContentService.registerFileClassForExport(ResourceAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.registerFileClassForExport(ResourceItem.class.getName(), "fileUuid", "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, resourceToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
@@ -910,8 +870,9 @@
 	    String toVersion) throws ToolException {
 
 	try {
-	    exportContentService.registerFileClassForImport(ResourceAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(ResourceImportContentVersionFilter.class);
+	
 	    exportContentService.registerFileClassForImport(ResourceItem.class.getName(), "fileUuid", "fileVersionId",
 		    "fileName", "fileType", null, "initialItem");
 
@@ -988,7 +949,7 @@
 	    }
 	}
 
-	Resource toContent = Resource.newInstance(resource, toContentId, resourceToolContentHandler);
+	Resource toContent = Resource.newInstance(resource, toContentId);
 	resourceDao.saveObject(toContent);
 
 	// save resource items as well
@@ -1005,23 +966,7 @@
     public String getToolContentTitle(Long toolContentId) {
 	return getResourceByContentId(toolContentId).getTitle();
     }
-    
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Resource resource = resourceDao.getByContentId(toolContentId);
-	if (resource == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	resource.setDefineLater(value);
-    }
 
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Resource resource = resourceDao.getByContentId(toolContentId);
-	if (resource == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	resource.setRunOffline(value);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	Resource resource = resourceDao.getByContentId(toolContentId);
@@ -1118,9 +1063,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);
 	    toolContentObj.setReflectOnActivity(Boolean.FALSE);
 	    toolContentObj.setReflectInstructions(null);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v
diff -u -r1.59 -r1.60
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	28 Nov 2013 18:39:48 -0000	1.59
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	17 Jan 2014 22:06:33 -0000	1.60
@@ -62,7 +62,6 @@
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
-import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
@@ -125,22 +124,7 @@
 	if (param.equals("initPage")) {
 	    return initPage(mapping, form, request, response);
 	}
-
-	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 resource item function
 	// ---------------------------
 	if (param.equals("newItemInit")) {
@@ -426,11 +410,6 @@
 	    }
 
 	    resourceForm.setResource(resource);
-
-	    // initialize instruction attachment list
-	    List attachmentList = getAttachmentList(sessionMap);
-	    attachmentList.clear();
-	    attachmentList.addAll(resource.getAttachments());
 	} catch (Exception e) {
 	    AuthoringAction.log.error(e);
 	    throw new ServletException(e);
@@ -574,53 +553,11 @@
 
 	resourcePO.setCreatedBy(resourceUser);
 
-	// **********************************Handle Authoring Instruction
-	// Attachement *********************
-	// merge attachment info
-	// so far, attPOSet will be empty if content is existed. because
-	// PropertyUtils.copyProperties() is executed
-	Set attPOSet = resourcePO.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()) {
-	    ResourceAttachment newAtt = (ResourceAttachment) 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()) {
-	    ResourceAttachment delAtt = (ResourceAttachment) 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()) {
-		    ResourceAttachment att = (ResourceAttachment) attIter.next();
-		    if (delAtt.getUid().equals(att.getUid())) {
-			attIter.remove();
-			break;
-		    }
-		}
-		service.deleteResourceAttachment(delAtt.getUid());
-	    }// end remove from persist value
-	}
-
-	// copy back
-	resourcePO.setAttachments(attPOSet);
 	// ************************* Handle resource items *******************
 	// Handle resource items
 	Set itemList = new LinkedHashSet();
 	SortedSet topics = getResourceItemList(sessionMap);
-	iter = topics.iterator();
+	Iterator iter = topics.iterator();
 	while (iter.hasNext()) {
 	    ResourceItem item = (ResourceItem) iter.next();
 	    if (item != null) {
@@ -658,9 +595,6 @@
 	// finally persist resourcePO again
 	service.saveOrUpdateResource(resourcePO);
 
-	// initialize attachmentList again
-	attachmentList = getAttachmentList(sessionMap);
-	attachmentList.addAll(resource.getAttachments());
 	resourceForm.setResource(resourcePO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
@@ -671,163 +605,6 @@
 	}
     }
 
-    /**
-     * Handle upload online instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws UploadResourceFileException
-     */
-    public ActionForward uploadOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
-	    throws UploadResourceFileException {
-	return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    /**
-     * Handle upload offline instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws UploadResourceFileException
-     */
-    public ActionForward uploadOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
-	    throws UploadResourceFileException {
-	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 UploadResourceFileException
-     */
-    private ActionForward uploadFile(ActionMapping mapping, ActionForm form, String type, HttpServletRequest request) throws UploadResourceFileException {
-
-	ResourceForm resourceForm = (ResourceForm) form;
-	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(resourceForm.getSessionMapID());
-
-	FormFile file;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    file = resourceForm.getOfflineFile();
-	} else {
-	    file = resourceForm.getOnlineFile();
-	}
-
-	if (file == null || StringUtils.isBlank(file.getFileName())) {
-	    return mapping.findForward(ResourceConstants.SUCCESS);
-	}
-
-	// validate file size
-	ActionMessages errors = new ActionMessages();
-	FileValidatorUtil.validateFileSize(file, true, errors);
-	if (!errors.isEmpty()) {
-	    this.saveErrors(request, errors);
-	    return mapping.findForward(ResourceConstants.SUCCESS);
-	}
-
-	IResourceService service = getResourceService();
-	// upload to repository
-	ResourceAttachment 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();
-	ResourceAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (ResourceAttachment) 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(ResourceConstants.SUCCESS);
-
-    }
-
-    /**
-     * Delete offline instruction file from current Resource 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 Resource 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, ResourceConstants.PARAM_FILE_VERSION_ID));
-	Long uuID = new Long(WebUtil.readLongParam(request, ResourceConstants.PARAM_FILE_UUID));
-
-	// get back sessionMAP
-	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.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();
-	ResourceAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (ResourceAttachment) 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(ResourceConstants.ATTR_FILE_TYPE_FLAG, type);
-	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(ResourceConstants.SUCCESS);
-
-    }
-
     // *************************************************************************************
     // Private method
     // *************************************************************************************
@@ -840,22 +617,6 @@
     }
 
     /**
-     * @param request
-     * @return
-     */
-    private List getAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, ResourceConstants.ATT_ATTACHMENT_LIST);
-    }
-
-    /**
-     * @param request
-     * @return
-     */
-    private List getDeletedAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, ResourceConstants.ATTR_DELETED_ATTACHMENT_LIST);
-    }
-
-    /**
      * List save current resource items.
      * 
      * @param request
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v
diff -u -r1.38 -r1.39
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	4 Jul 2013 11:34:54 -0000	1.38
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	17 Jan 2014 22:06:34 -0000	1.39
@@ -234,14 +234,6 @@
 		request, getServlet().getServletContext());
 	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
 
-	// add run offline support
-	if (resource.getRunOffline()) {
-	    sessionMap.put(ResourceConstants.PARAM_RUN_OFFLINE, true);
-	    return mapping.findForward("runOffline");
-	} else {
-	    sessionMap.put(ResourceConstants.PARAM_RUN_OFFLINE, false);
-	}
-
 	// init resource item list
 	SortedSet<ResourceItem> resourceItemList = getResourceItemList(sessionMap);
 	resourceItemList.clear();
@@ -508,9 +500,7 @@
 	IResourceService service = getResourceService();
 	int miniViewFlag = service.checkMiniView(sessionId, userID);
 	// 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(ResourceConstants.PARAM_RUN_OFFLINE);
-	if (miniViewFlag > 0 && !runOffline) {
+	if (miniViewFlag > 0) {
 	    ActionErrors errors = new ActionErrors();
 	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("lable.learning.minimum.view.number.less",
 		    miniViewFlag));
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java,v
diff -u -r1.19 -r1.20
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	10 Feb 2011 23:05:45 -0000	1.19
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	17 Jan 2014 22:06:34 -0000	1.20
@@ -152,7 +152,6 @@
 	List<List<Summary>> groupList = service.getSummary(contentId);
 
 	Resource resource = service.getResourceByContentId(contentId);
-	resource.toDTO();
 
 	Map<Long, Set<ReflectDTO>> relectList = service.getReflectList(contentId, false);
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java,v
diff -u -r1.12 -r1.13
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	17 Sep 2006 06:25:39 -0000	1.12
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	17 Jan 2014 22:06:33 -0000	1.13
@@ -23,120 +23,107 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.rsrc.web.form;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
-import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
 
 /**
- *
- * 	Resource Form.
- *	@struts.form name="resourceForm"
- *
- * User: Dapeng.Ni
+ * 
+ * Resource Form.
+ * 
+ * @struts.form name="resourceForm"
+ * 
+ *              User: Dapeng.Ni
  */
-public class ResourceForm extends ActionForm  {
-	private static final long serialVersionUID = 3599879328307492312L;
+public class ResourceForm extends ActionForm {
+    private static final long serialVersionUID = 3599879328307492312L;
 
-	private static Logger logger = Logger.getLogger(ResourceForm.class.getName());
+    private static Logger logger = Logger.getLogger(ResourceForm.class.getName());
 
-	//Forum fields
-	private String sessionMapID;
-	private String contentFolderID;
-	private int currentTab;
+    // Forum fields
+    private String sessionMapID;
+    private String contentFolderID;
+    private int currentTab;
     private FormFile offlineFile;
     private FormFile onlineFile;
 
     private Resource resource;
-    
-    public ResourceForm(){
-    	resource = new Resource();
-    	resource.setTitle("Shared Resource");
-    	currentTab = 1;
+
+    public ResourceForm() {
+	resource = new Resource();
+	resource.setTitle("Shared Resource");
+	currentTab = 1;
     }
-	
-	public void setResource(Resource resource) {
-        this.resource = resource;
-        //set Form special varaible from given forum
-        if(resource == null){
-        	logger.error("Initial ResourceForum failed by null value of Resource.");
-        }
+
+    public void setResource(Resource resource) {
+	this.resource = resource;
+	// set Form special varaible from given forum
+	if (resource == null) {
+	    logger.error("Initial ResourceForum failed by null value of Resource.");
 	}
-    public void reset(ActionMapping mapping, HttpServletRequest request){
-    	String param = mapping.getParameter();
-    	//if it is start page, all data read out from database or current session
-    	//so need not reset checkbox to refresh value!
-    	if(!StringUtils.equals(param,"start") && !StringUtils.equals(param,"initPage")){
-	    	resource.setAllowAddFiles(false);
-	    	resource.setAllowAddUrls(false);
-	    	resource.setLockWhenFinished(false);
-	    	resource.setDefineLater(false);
-	    	resource.setRunAuto(false);
-	    	resource.setRunOffline(false);
-	    	resource.setReflectOnActivity(false);
-    	}
     }
 
-	public int getCurrentTab() {
-		return currentTab;
+    public void reset(ActionMapping mapping, HttpServletRequest request) {
+	String param = mapping.getParameter();
+	// if it is start page, all data read out from database or current session
+	// so need not reset checkbox to refresh value!
+	if (!StringUtils.equals(param, "start") && !StringUtils.equals(param, "initPage")) {
+	    resource.setAllowAddFiles(false);
+	    resource.setAllowAddUrls(false);
+	    resource.setLockWhenFinished(false);
+	    resource.setDefineLater(false);
+	    resource.setRunAuto(false);
+	    resource.setReflectOnActivity(false);
 	}
+    }
 
+    public int getCurrentTab() {
+	return currentTab;
+    }
 
-	public void setCurrentTab(int currentTab) {
-		this.currentTab = currentTab;
-	}
+    public void setCurrentTab(int currentTab) {
+	this.currentTab = currentTab;
+    }
 
+    public FormFile getOfflineFile() {
+	return offlineFile;
+    }
 
-	public FormFile getOfflineFile() {
-		return offlineFile;
-	}
+    public void setOfflineFile(FormFile offlineFile) {
+	this.offlineFile = offlineFile;
+    }
 
+    public FormFile getOnlineFile() {
+	return onlineFile;
+    }
 
-	public void setOfflineFile(FormFile offlineFile) {
-		this.offlineFile = offlineFile;
-	}
+    public void setOnlineFile(FormFile onlineFile) {
+	this.onlineFile = onlineFile;
+    }
 
+    public Resource getResource() {
+	return resource;
+    }
 
-	public FormFile getOnlineFile() {
-		return onlineFile;
-	}
+    public String getSessionMapID() {
+	return sessionMapID;
+    }
 
+    public void setSessionMapID(String sessionMapID) {
+	this.sessionMapID = sessionMapID;
+    }
 
-	public void setOnlineFile(FormFile onlineFile) {
-		this.onlineFile = onlineFile;
-	}
+    public String getContentFolderID() {
+	return contentFolderID;
+    }
 
+    public void setContentFolderID(String contentFolderID) {
+	this.contentFolderID = contentFolderID;
+    }
 
-	public Resource getResource() {
-		return resource;
-	}
-
-	public String getSessionMapID() {
-		return sessionMapID;
-	}
-
-	public void setSessionMapID(String sessionMapID) {
-		this.sessionMapID = sessionMapID;
-	}
-
-	public String getContentFolderID() {
-		return contentFolderID;
-	}
-
-	public void setContentFolderID(String contentFolderID) {
-		this.contentFolderID = contentFolderID;
-	}
-
-
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java,v
diff -u -r1.14 -r1.15
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java	6 Jan 2014 08:42:22 -0000	1.14
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java	17 Jan 2014 22:06:34 -0000	1.15
@@ -112,29 +112,7 @@
 
 		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 {
 
-        	Resource content = null;
-            if ( toolContentID != null ) {
-            	content = service.getResourceByContentId(toolContentID);
-            } else {
-            	ResourceSession session=service.getResourceSessionBySessionId(toolSessionID);
-            	if ( session != null )
-            		content = session.getResource();
-            }
-            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 ResourceApplicationException {
 
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/authoring.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	28 Jul 2009 14:19:56 -0000	1.29
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	17 Jan 2014 22:06:34 -0000	1.30
@@ -31,18 +31,7 @@
 	    	//for advanceTab
 	    	if(tabId == 2)
 	    		changeViewNum(-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 changeViewNum(initVal){
 			var tb = document.getElementById("itemTable");
@@ -91,7 +80,6 @@
 		<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:Tabs></div>
 		<!-- start tabs -->
 <div id="content">
@@ -116,11 +104,7 @@
 			<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) -->
 
-
 			<!-- Button Row -->
 			<%--  Default value 
 				cancelButtonLabelKey="label.authoring.cancel.button"
Fisheye: Tag 1.14 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/authoring/parts/instructionfilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.17 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/learning/runoffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/learning/mobile/runoffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	2 May 2008 07:43:35 -0000	1.18
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	17 Jan 2014 22:06:33 -0000	1.19
@@ -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="<%= ResourceConstants.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_leader/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties	8 Jan 2014 20:13:50 -0000	1.1
+++ lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties	17 Jan 2014 22:06:30 -0000	1.2
@@ -4,7 +4,7 @@
 
  # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Aug 30 09:17:50 CST 2012 
  
-#=================== labels for Notebook =================# 
+#=================== labels for Leaderselection =================# 
 
 tool.display.name  =Leader Selection
 tool.description  =Leader Selection Tool
@@ -15,9 +15,7 @@
 button.basic  =Basic
 label.authoring.basic.title  =Title:
 label.authoring.basic.instructions  =Instructions:
-message.unsavedChanges  =Page contains unsaved changes
 message.defineLaterSet  =Please wait for the instructor to complete the contents of this activity
-message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 pageTitle.monitoring  =Leader Selection Monitoring
 button.summary  =Summary
 button.editActivity  =Edit Activity
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	8 Jan 2014 20:13:51 -0000	1.1
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	17 Jan 2014 22:06:30 -0000	1.2
@@ -49,8 +49,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>
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20140102.sql	17 Jan 2014 22:06:30 -0000	1.1
@@ -0,0 +1,16 @@
+-- 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_lalead11_leaderselection DROP COLUMN run_offline;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lalead11';
+
+----------------------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_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java	8 Jan 2014 20:13:46 -0000	1.1
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java	17 Jan 2014 22:06:30 -0000	1.2
@@ -56,8 +56,6 @@
 
     private String instructions;
 
-    private boolean runOffline;
-
     private boolean contentInUse;
 
     private boolean defineLater;
@@ -140,18 +138,6 @@
     }
 
     /**
-     * @hibernate.property column="run_offline" length="1"
-     * 
-     */
-    public boolean isRunOffline() {
-	return runOffline;
-    }
-
-    public void setRunOffline(boolean runOffline) {
-	this.runOffline = runOffline;
-    }
-
-    /**
      * @hibernate.property column="content_in_use" length="1"
      * 
      */
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionImportContentVersionFilter.java	17 Jan 2014 22:06:30 -0000	1.1
@@ -0,0 +1,40 @@
+/**************************************************************** 
+ * 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: LeaderselectionImportContentVersionFilter.java,v 1.1 2014/01/17 22:06:30 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.leaderselection.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.leaderselection.model.Leaderselection;
+
+/**
+ * Import filter class for different version of Leaderselection content.
+ */
+public class LeaderselectionImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20130422 version content to 20140102 version tool server.
+     */
+    public void up20130422To20140102() {
+	this.removeField(Leaderselection.class, "runOffline");
+    }
+}
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	8 Jan 2014 20:13:49 -0000	1.1
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	17 Jan 2014 22:06:30 -0000	1.2
@@ -24,22 +24,15 @@
 
 package org.lamsfoundation.lams.tool.leaderselection.service;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.Hashtable;
 import java.util.List;
 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;
@@ -70,7 +63,6 @@
 import org.lamsfoundation.lams.tool.leaderselection.util.LeaderselectionToolContentHandler;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
  * An implementation of the ILeaderselectionService interface.
@@ -81,7 +73,7 @@
 public class LeaderselectionService implements ToolSessionManager, ToolContentManager, ILeaderselectionService,
 	ToolContentImport102Manager {
 
-    static Logger logger = Logger.getLogger(LeaderselectionService.class.getName());
+    private static Logger logger = Logger.getLogger(LeaderselectionService.class.getName());
 
     private ILeaderselectionDAO leaderselectionDAO = null;
 
@@ -184,26 +176,6 @@
     }
 
     @Override
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Leaderselection content = leaderselectionDAO.getByContentId(toolContentId);
-	if (content == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	content.setDefineLater(value);
-	leaderselectionDAO.saveOrUpdate(content);
-    }
-
-    @Override
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Leaderselection content = leaderselectionDAO.getByContentId(toolContentId);
-	if (content == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	content.setRunOffline(value);
-	leaderselectionDAO.saveOrUpdate(content);
-    }
-
-    @Override
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
     }
@@ -233,6 +205,8 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(LeaderselectionImportContentVersionFilter.class);
 
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath,
 		    leaderselectionToolContentHandler, fromVersion, toVersion);
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java	8 Jan 2014 20:13:51 -0000	1.1
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java	17 Jan 2014 22:06:30 -0000	1.2
@@ -56,7 +56,6 @@
 /**
  * @struts.action path="/learning" parameter="dispatch" scope="request"
  * @struts.action-forward name="leaderselection" 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 {
@@ -101,11 +100,6 @@
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet()
 		.getServletContext());
 
-	// check runOffline
-	if (content.isRunOffline()) {
-	    return mapping.findForward("runOffline");
-	}
-
 	LeaderselectionUser user;
 	if (mode.equals(ToolAccessMode.TEACHER)) {
 	    Long userID = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false);
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/servlets/ExportServlet.java,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/servlets/ExportServlet.java	8 Jan 2014 20:13:46 -0000	1.1
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/servlets/ExportServlet.java	17 Jan 2014 22:06:30 -0000	1.2
@@ -82,30 +82,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 (leaderselectionService == null) {
-		leaderselectionService = LeaderselectionServiceProxy.getLeaderselectionService(getServletContext());
-	    }
-
-	    Leaderselection content = null;
-	    if (toolContentID != null) {
-		content = leaderselectionService.getContentByContentId(toolContentID);
-	    } else {
-		LeaderselectionSession session = leaderselectionService.getSessionBySessionId(toolSessionID);
-		if (session != null)
-		    content = session.getLeaderselection();
-	    }
-	    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 LeaderselectionException {
 
Index: lams_tool_leader/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/WEB-INF/tiles-defs.xml	8 Jan 2014 20:13:48 -0000	1.1
+++ lams_tool_leader/web/WEB-INF/tiles-defs.xml	17 Jan 2014 22:06:30 -0000	1.2
@@ -63,11 +63,6 @@
 		<put name="body" value="/pages/learning/leaderselection.jsp" />
 		<put name="bodyMobile" value="/pages/learning/mobile/leaderselection.jsp"/>
 	</definition>
-
-	<definition name="tiles:/learning/runOffline" extends="tiles:/layout:learning">
-		<put name="body" value="/pages/learning/runOffline.jsp" />
-		<put name="bodyMobile" value="/pages/learning/mobile/runOffline.jsp"/>
-	</definition>
 	
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/defineLater.jsp" />
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tags/DefineLater.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	8 Jan 2014 20:13:47 -0000	1.1
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	17 Jan 2014 22:06:30 -0000	1.2
@@ -436,10 +436,6 @@
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>DefineLater</name>
-		<path>/WEB-INF/tags/DefineLater.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_leader/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/authoring/authoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/pages/authoring/authoring.jsp	8 Jan 2014 20:13:51 -0000	1.1
+++ lams_tool_leader/web/pages/authoring/authoring.jsp	17 Jan 2014 22:06:30 -0000	1.2
@@ -28,9 +28,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">
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_leader/web/pages/learning/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_leader/web/pages/learning/mobile/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	3 Apr 2009 00:00:31 -0000	1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	17 Jan 2014 22:06:37 -0000	1.2
@@ -25,7 +25,6 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.tool.mindmap.service.MindmapService">
-				<property name="mindmapAttachmentDAO"><ref bean="mindmapAttachmentDAO"/></property>
 				<property name="mindmapSessionDAO"><ref bean="mindmapSessionDAO"/></property>
 				<property name="mindmapUserDAO"><ref bean="mindmapUserDAO"/></property>
 				<property name="mindmapNodeDAO"><ref bean="mindmapNodeDAO"/></property>
@@ -38,7 +37,6 @@
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="mindmapOutputFactory"><ref bean="mindmapOutputFactory"/></property>
-		   		<property name="repositoryService"><ref bean="repositoryService"/></property>
 		   		<property name="mindmapMessageService"><ref bean="mindmapMessageService"/></property>
 			</bean>
 		</property>
@@ -53,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>
@@ -86,10 +82,6 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
-	<bean id="mindmapAttachmentDAO" class="org.lamsfoundation.lams.tool.mindmap.dao.hibernate.MindmapAttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
  	<bean id="mindmapToolContentHandler" class="org.lamsfoundation.lams.tool.mindmap.util.MindmapToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean>  
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapDAO.java	3 Apr 2009 00:00:38 -0000	1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapDAO.java	17 Jan 2014 22:06:36 -0000	1.2
@@ -39,7 +39,5 @@
 
     void saveOrUpdate(Mindmap toContent);
 
-    void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type);
-
     void releaseFromCache(Object o);
 }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java	3 Apr 2009 00:00:30 -0000	1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java	17 Jan 2014 22:06:37 -0000	1.2
@@ -26,22 +26,16 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapDAO;
 import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
-import org.lamsfoundation.lams.tool.mindmap.model.MindmapAttachment;
-import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
  * DAO for accessing the Mindmap objects - Hibernate specific code.
  */
 public class MindmapDAO extends BaseDAO implements IMindmapDAO {
 
     private static final String FIND_MINDMAP_BY_CONTENTID = "from Mindmap mindmap where mindmap.toolContentId = ?";
-
-    private static final String FIND_INSTRUCTION_FILE = "from " + MindmapAttachment.class.getName()
-	    + " as i where tool_content_id=? and i.file_uuid=? and i.file_version_id=? and i.file_type=?";
     
     private static final String FIND_MINDMAP_BY_UID =
 	"from Mindmap mindmap where mindmap.uid = ?";
@@ -69,22 +63,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(MindmapDAO.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) {
-		MindmapAttachment file = (MindmapAttachment) list.get(0);
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.delete(file);
-		templ.flush();
-	    }
-	}
-
-    }
-
     public void releaseFromCache(Object o) {
 	getSession().evict(o);
 
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java	12 May 2009 01:39:01 -0000	1.3
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java	17 Jan 2014 22:06:37 -0000	1.4
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.tool.mindmap.dao.hibernate;
 
 import java.util.List;
+
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapRequestDAO;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapRequest;
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20140102.sql	17 Jan 2014 22:06:37 -0000	1.1
@@ -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_lamind10_mindmap DROP COLUMN online_instructions;
+ALTER TABLE tl_lamind10_mindmap DROP COLUMN offline_instructions;
+ALTER TABLE tl_lamind10_mindmap DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lamind10_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lamind10';
+
+----------------------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 1.2 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapDTO.java	14 Apr 2009 00:46:15 -0000	1.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapDTO.java	17 Jan 2014 22:06:36 -0000	1.3
@@ -30,9 +30,7 @@
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
-import org.lamsfoundation.lams.tool.mindmap.model.MindmapAttachment;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession;
 
 public class MindmapDTO {
@@ -42,14 +40,10 @@
     public Long toolContentId;
     public String title;
     public String instructions;
-    public String onlineInstructions;
-    public String offlineInstructions;
     public boolean defineLater;
     public boolean contentInUse;
     public boolean lockOnFinish;
     public boolean multiUserMode;
-    public Set<MindmapAttachmentDTO> onlineInstructionsFiles;
-    public Set<MindmapAttachmentDTO> offlineInstructionsFiles;
     public Set<MindmapSessionDTO> sessionDTOs = new TreeSet<MindmapSessionDTO>();
     public Long currentTab;
     // reflection
@@ -64,31 +58,12 @@
 	toolContentId = mindmap.getToolContentId();
 	title = mindmap.getTitle();
 	instructions = mindmap.getInstructions();
-	onlineInstructions = mindmap.getOnlineInstructions();
-	offlineInstructions = mindmap.getOfflineInstructions();
 	contentInUse = mindmap.isContentInUse();
 	lockOnFinish = mindmap.isLockOnFinished();
 	multiUserMode = mindmap.isMultiUserMode();
 	reflectOnActivity = mindmap.isReflectOnActivity();
 	reflectInstructions = mindmap.getReflectInstructions();
 
-	onlineInstructionsFiles = new TreeSet<MindmapAttachmentDTO>();
-	offlineInstructionsFiles = new TreeSet<MindmapAttachmentDTO>();
-
-	for (Iterator i = mindmap.getMindmapAttachments().iterator(); i.hasNext();) {
-	    MindmapAttachment att = (MindmapAttachment) i.next();
-	    if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) {
-		MindmapAttachmentDTO attDTO = new MindmapAttachmentDTO(att);
-		offlineInstructionsFiles.add(attDTO);
-	    } else if (att.getFileType().equals(IToolContentHandler.TYPE_ONLINE)) {
-		MindmapAttachmentDTO attDTO = new MindmapAttachmentDTO(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 iter = mindmap.getMindmapSessions().iterator(); iter.hasNext();) {
 	    MindmapSession session = (MindmapSession) iter.next();
 	    MindmapSessionDTO sessionDTO = new MindmapSessionDTO(session);
@@ -114,38 +89,6 @@
 	this.instructions = instructions;
     }
 
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    public Set<MindmapAttachmentDTO> getOfflineInstructionsFiles() {
-	return offlineInstructionsFiles;
-    }
-
-    public void setOfflineInstructionsFiles(Set<MindmapAttachmentDTO> offlineInstructionsFiles) {
-	this.offlineInstructionsFiles = offlineInstructionsFiles;
-    }
-
-    public String getOnlineInstructions() {
-	return onlineInstructions;
-    }
-
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
-    public Set<MindmapAttachmentDTO> getOnlineInstructionsFiles() {
-	return onlineInstructionsFiles;
-    }
-
-    public void setOnlineInstructionsFiles(Set<MindmapAttachmentDTO> onlineInstructionsFiles) {
-	this.onlineInstructionsFiles = onlineInstructionsFiles;
-    }
-
     public String getTitle() {
 	return title;
     }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java,v
diff -u -r1.4 -r1.5
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java	18 May 2011 16:43:24 -0000	1.4
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java	17 Jan 2014 22:06:37 -0000	1.5
@@ -26,12 +26,11 @@
 
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; //import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.mindmap.service.MindmapService;
+//import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 
 /**
  * @hibernate.class table="tl_lamind10_mindmap"
@@ -49,24 +48,17 @@
     private Long createBy;
     private String title;
     private String instructions;
-    private boolean runOffline;
     private boolean lockOnFinished;
     private boolean multiUserMode;
-    private String onlineInstructions;
-    private String offlineInstructions;
     private boolean contentInUse;
     private boolean defineLater;
     private Long toolContentId;
-    private String mindmapExportContent; 
-    private Set mindmapAttachments;
+    private String mindmapExportContent;
     private Set mindmapSessions;
 
     private boolean reflectOnActivity;
     private String reflectInstructions;
 
-    // *********** NON Persisit fields
-    private IToolContentHandler toolContentHandler;
-
     // Constructors
 
     /** default constructor */
@@ -75,22 +67,17 @@
 
     /** full constructor */
     public Mindmap(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 mindmapAttachments, Set mindmapSessions) {
+	    boolean lockOnFinished, boolean filteringEnabled, String filterKeywords, boolean contentInUse,
+	    boolean defineLater, Long toolContentId, Set mindmapSessions) {
 	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.mindmapAttachments = mindmapAttachments;
 	this.mindmapSessions = mindmapSessions;
     }
 
@@ -187,18 +174,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"
      * 
      */
@@ -223,30 +198,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"
      * 
      */
@@ -315,20 +266,6 @@
     }
 
     /**
-     * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
-     * @hibernate.collection-key column="mindmap_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.mindmap.model.MindmapAttachment"
-     * 
-     */
-    public Set getMindmapAttachments() {
-	return mindmapAttachments;
-    }
-
-    public void setMindmapAttachments(Set mindmapAttachments) {
-	this.mindmapAttachments = mindmapAttachments;
-    }
-
-    /**
      * @hibernate.set lazy="true" inverse="true" cascade="none"
      * @hibernate.collection-key column="mindmap_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.mindmap.model.MindmapSession"
@@ -384,10 +321,8 @@
 	return result;
     }
 
-    public static Mindmap newInstance(Mindmap fromContent, Long toContentId,
-	    IToolContentHandler mindmapToolContentHandler) {
+    public static Mindmap newInstance(Mindmap fromContent, Long toContentId) {
 	Mindmap toContent = new Mindmap();
-	fromContent.toolContentHandler = mindmapToolContentHandler;
 	toContent = (Mindmap) fromContent.clone();
 	toContent.setToolContentId(toContentId);
 	toContent.setCreateDate(new Date());
@@ -402,17 +337,6 @@
 	    mindmap = (Mindmap) super.clone();
 	    mindmap.setUid(null);
 
-	    if (mindmapAttachments != null) {
-		// create a copy of the attachments
-		Iterator iter = mindmapAttachments.iterator();
-		Set<MindmapAttachment> set = new HashSet<MindmapAttachment>();
-		while (iter.hasNext()) {
-		    MindmapAttachment originalFile = (MindmapAttachment) iter.next();
-		    MindmapAttachment newFile = (MindmapAttachment) originalFile.clone();
-		    set.add(newFile);
-		}
-		mindmap.mindmapAttachments = set;
-	    }
 	    // create an empty set for the mindmapSession
 	    mindmap.mindmapSessions = new HashSet();
 
@@ -421,12 +345,4 @@
 	}
 	return mindmap;
     }
-
-    public IToolContentHandler getToolContentHandler() {
-	return toolContentHandler;
-    }
-
-    public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-	this.toolContentHandler = toolContentHandler;
-    }
 }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java,v
diff -u -r1.4 -r1.5
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java	12 May 2009 01:39:00 -0000	1.4
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java	17 Jan 2014 22:06:37 -0000	1.5
@@ -25,15 +25,13 @@
 package org.lamsfoundation.lams.tool.mindmap.service;
 
 import java.util.List;
-import org.apache.struts.upload.FormFile;
+
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
-import org.lamsfoundation.lams.tool.mindmap.model.MindmapAttachment;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapRequest;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser;
-import org.lamsfoundation.lams.tool.mindmap.util.MindmapException;
 import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeModel;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.MessageService;
@@ -53,12 +51,6 @@
 
     public Mindmap getMindmapByUid(Long Uid);
 
-    public MindmapAttachment uploadFileToContent(Long toolContentId, FormFile file, String type);
-
-    public void deleteFromRepository(Long uuid, Long versionID) throws MindmapException;
-
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type);
-
     public void saveOrUpdateMindmap(Mindmap mindmap);
 
     public MindmapSession getSessionBySessionId(Long toolSessionId);
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapImportContentVersionFilter.java	17 Jan 2014 22:06:37 -0000	1.1
@@ -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: MindmapImportContentVersionFilter.java,v 1.1 2014/01/17 22:06:37 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.mindmap.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
+
+/**
+ * Import filter class for different version of Mindmap content.
+ */
+public class MindmapImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20110414 version content to 20140102 version tool server.
+     */
+    public void up20110414To20140102() {
+	this.removeField(Mindmap.class, "runOffline");
+	this.removeField(Mindmap.class, "onlineInstructions");
+	this.removeField(Mindmap.class, "offlineInstructions");
+	this.removeField(Mindmap.class, "mindmapAttachments");
+    }
+}
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java,v
diff -u -r1.10 -r1.11
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	29 Jul 2013 23:11:45 -0000	1.10
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	17 Jan 2014 22:06:37 -0000	1.11
@@ -24,30 +24,15 @@
 
 package org.lamsfoundation.lams.tool.mindmap.service;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
-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.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -63,21 +48,18 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapAttachmentDAO;
 import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapDAO;
 import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapNodeDAO;
 import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapRequestDAO;
 import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapSessionDAO;
 import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapUserDAO;
 import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
-import org.lamsfoundation.lams.tool.mindmap.model.MindmapAttachment;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapRequest;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser;
 import org.lamsfoundation.lams.tool.mindmap.util.MindmapConstants;
 import org.lamsfoundation.lams.tool.mindmap.util.MindmapException;
-import org.lamsfoundation.lams.tool.mindmap.util.MindmapToolContentHandler;
 import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeConceptModel;
 import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeModel;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
@@ -97,18 +79,14 @@
 
     static Logger logger = Logger.getLogger(MindmapService.class.getName());
 
-    boolean exp = false;
-
     private IMindmapDAO mindmapDAO = null;
     private IMindmapSessionDAO mindmapSessionDAO = null;
     private IMindmapUserDAO mindmapUserDAO = null;
-    private IMindmapAttachmentDAO mindmapAttachmentDAO = null;
     private IMindmapNodeDAO mindmapNodeDAO = null;
     private IMindmapRequestDAO mindmapRequestDAO = null;
     private ILearnerService learnerService;
     private ILamsToolService toolService;
     private IToolContentHandler mindmapToolContentHandler = null;
-    private IRepositoryService repositoryService = null;
     private IAuditService auditService = null;
     private IExportToolContentService exportContentService;
     private ICoreNotebookService coreNotebookService;
@@ -215,7 +193,7 @@
 	    fromContent = getDefaultContent();
 	}
 
-	Mindmap toContent = Mindmap.newInstance(fromContent, toContentId, mindmapToolContentHandler);
+	Mindmap toContent = Mindmap.newInstance(fromContent, toContentId);
 	mindmapDAO.saveOrUpdate(toContent);
 
 	/* Copying Mindmap Nodes */
@@ -393,24 +371,6 @@
 	return languageOutput;
     }
 
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Mindmap mindmap = mindmapDAO.getByContentId(toolContentId);
-	if (mindmap == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	mindmap.setDefineLater(value);
-	mindmapDAO.saveOrUpdate(mindmap);
-    }
-
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Mindmap mindmap = mindmapDAO.getByContentId(toolContentId);
-	if (mindmap == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	mindmap.setRunOffline(value);
-	mindmapDAO.saveOrUpdate(mindmap);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	// TODO Auto-generated method stub
@@ -451,20 +411,12 @@
 	    mindmapContent = xstream.toXML(currentNodeModel);
 	}
 
-	// set ResourceToolContentHandler as null to avoid copy file node in repository again.
-	mindmap = Mindmap.newInstance(mindmap, toolContentId, null);
+	mindmap = Mindmap.newInstance(mindmap, toolContentId);
 
 	mindmap.setMindmapExportContent(mindmapContent);
-	mindmap.setToolContentHandler(null);
 	mindmap.setMindmapSessions(null);
-	Set<MindmapAttachment> atts = mindmap.getMindmapAttachments();
-	for (MindmapAttachment att : atts) {
-	    att.setMindmap(null);
-	}
 
 	try {
-	    exportContentService.registerFileClassForExport(MindmapAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, mindmap, mindmapToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -480,9 +432,9 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(MindmapAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(MindmapImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, mindmapToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof Mindmap)) {
@@ -596,7 +548,7 @@
 	Mindmap defaultContent = getDefaultContent();
 	// create new mindmap using the newContentID
 	Mindmap newContent = new Mindmap();
-	newContent = Mindmap.newInstance(defaultContent, newContentID, mindmapToolContentHandler);
+	newContent = Mindmap.newInstance(defaultContent, newContentID);
 	mindmapDAO.saveOrUpdate(newContent);
 	return newContent;
     }
@@ -637,32 +589,6 @@
 	return mindmapUserDAO.getByUID(uid);
     }
 
-    public MindmapAttachment uploadFileToContent(Long toolContentId, FormFile file, String type) {
-	if (file == null || StringUtils.isEmpty(file.getFileName())) {
-	    throw new MindmapException("Could not find upload file: " + file);
-	}
-
-	NodeKey nodeKey = processFile(file, type);
-	MindmapAttachment attachment = new MindmapAttachment(nodeKey.getVersion(), type, file.getFileName(), nodeKey
-		.getUuid(), new Date());
-	return attachment;
-    }
-
-    public void deleteFromRepository(Long uuid, Long versionID) throws MindmapException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new MindmapException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type) {
-	mindmapDAO.deleteInstructionFile(contentID, uuid, versionID, type);
-
-    }
-
     public void saveOrUpdateMindmap(Mindmap mindmap) {
 	mindmapDAO.saveOrUpdate(mindmap);
     }
@@ -693,53 +619,6 @@
 	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 = getMindmapToolContentHandler().uploadFile(file.getInputStream(), fileName,
-			file.getContentType(), type);
-	    } catch (InvalidParameterException e) {
-		throw new MindmapException("InvalidParameterException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (FileNotFoundException e) {
-		throw new MindmapException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-	    } catch (RepositoryCheckedException e) {
-		throw new MindmapException("RepositoryCheckedException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (IOException e) {
-		throw new MindmapException("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 MindmapException {
-	ICredentials credentials = new SimpleCredentials(MindmapToolContentHandler.repositoryUser,
-		MindmapToolContentHandler.repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials, MindmapToolContentHandler.repositoryWorkspaceName);
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new MindmapException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new MindmapException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new MindmapException("Login failed." + e.getMessage());
-	}
-    }
-
     /* ===============Methods implemented from ToolContentImport102Manager =============== */
 
     /**
@@ -755,15 +634,11 @@
 	mindmap.setInstructions(WebUtil.convertNewlines((String) importValues
 		.get(ToolContentImport102Manager.CONTENT_BODY)));
 	mindmap.setLockOnFinished(Boolean.TRUE);
-	mindmap.setOfflineInstructions(null);
-	mindmap.setOnlineInstructions(null);
-	mindmap.setRunOffline(Boolean.FALSE);
 	mindmap.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 	mindmap.setToolContentId(toolContentId);
 	mindmap.setUpdateDate(now);
 	// mindmap.setAllowRichEditor(Boolean.FALSE);
 	// leave as empty, no need to set them to anything.
-	// setMindmapAttachments(Set mindmapAttachments);
 	// setMindmapSessions(Set mindmapSessions);
 	mindmapDAO.saveOrUpdate(mindmap);
     }
@@ -786,22 +661,6 @@
     // =========================================================================================
     /* Used by Spring to "inject" the linked objects */
 
-    public IRepositoryService getRepositoryService() {
-	return repositoryService;
-    }
-
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
-    public IMindmapAttachmentDAO getMindmapAttachmentDAO() {
-	return mindmapAttachmentDAO;
-    }
-
-    public void setMindmapAttachmentDAO(IMindmapAttachmentDAO attachmentDAO) {
-	mindmapAttachmentDAO = attachmentDAO;
-    }
-
     public IMindmapDAO getMindmapDAO() {
 	return mindmapDAO;
     }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java,v
diff -u -r1.2 -r1.3
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java	18 May 2011 16:43:24 -0000	1.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java	17 Jan 2014 22:06:36 -0000	1.3
@@ -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_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/NodeModel.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/NodeModel.java,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/NodeModel.java	3 Apr 2009 00:00:30 -0000	1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/NodeModel.java	17 Jan 2014 22:06:36 -0000	1.2
@@ -27,7 +27,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeConceptModel;
 
 /**
  * XML Model Class for Mindmap Node
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/NotifyRequestModel.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/NotifyRequestModel.java,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/NotifyRequestModel.java	3 Apr 2009 00:00:30 -0000	1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/NotifyRequestModel.java	17 Jan 2014 22:06:36 -0000	1.2
@@ -25,7 +25,6 @@
 
 package org.lamsfoundation.lams.tool.mindmap.util.xmlmodel;
 
-import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeConceptModel;
 
 /**
  * XML Model Class for Notify Request (Actions sent by Flash) in Mindmap.
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java	18 May 2009 01:18:17 -0000	1.4
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java	17 Jan 2014 22:06:36 -0000	1.5
@@ -26,11 +26,7 @@
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -40,13 +36,9 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-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.mindmap.model.Mindmap;
-import org.lamsfoundation.lams.tool.mindmap.model.MindmapAttachment;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser;
 import org.lamsfoundation.lams.tool.mindmap.service.IMindmapService;
@@ -57,7 +49,6 @@
 import org.lamsfoundation.lams.tool.mindmap.web.forms.AuthoringForm;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
-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;
@@ -83,11 +74,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
@@ -251,24 +237,6 @@
 	// update mindmap content using form inputs.
 	ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE);
 	updateMindmap(mindmap, authForm, mode);
-
-	// remove attachments marked for deletion.
-	Set<MindmapAttachment> attachments = mindmap.getMindmapAttachments();
-	if (attachments == null) {
-	    attachments = new HashSet<MindmapAttachment>();
-	}
-
-	for (MindmapAttachment 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
-	mindmap.setMindmapAttachments(attachments);
 	
 	// set the update date
 	mindmap.setUpdateDate(new Date());
@@ -318,156 +286,6 @@
 	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<MindmapAttachment> unsavedFiles;
-	List<MindmapAttachment> 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(MindmapConstants.ATTR_SESSION_MAP, map);
-	    this.saveErrors(request, errors);
-	    return mapping.findForward("success");
-	}
-
-	if (file.getFileName().length() != 0) {
-
-	    // upload file to repository
-	    MindmapAttachment newAtt = mindmapService.uploadFileToContent((Long) map
-		    .get(AuthoringAction.KEY_TOOL_CONTENT_ID), file, type);
-
-	    // Add attachment to unsavedFiles
-	    // check to see if file with same name exists
-	    MindmapAttachment currAtt;
-	    Iterator iter = savedFiles.iterator();
-	    while (iter.hasNext()) {
-		currAtt = (MindmapAttachment) 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(MindmapConstants.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()) {
-	    MindmapAttachment att = (MindmapAttachment) 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(MindmapConstants.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()) {
-	    MindmapAttachment att = (MindmapAttachment) iter.next();
-
-	    if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-		// delete from repository and list
-		mindmapService.deleteFromRepository(att.getFileUuid(), att.getFileVersionId());
-		iter.remove();
-		break;
-	    }
-	}
-
-	request.setAttribute(MindmapConstants.ATTR_SESSION_MAP, map);
-	request.setAttribute("unsavedChanges", new Boolean(true));
-
-	return mapping.findForward("success");
-    }
-
     /**
      * Updates Mindmap content using AuthoringForm inputs.
      * 
@@ -479,8 +297,6 @@
 	mindmap.setTitle(authForm.getTitle());
 	mindmap.setInstructions(authForm.getInstructions());
 	if (mode.isAuthor()) { // Teacher cannot modify following
-	    mindmap.setOfflineInstructions(authForm.getOfflineInstruction());
-	    mindmap.setOnlineInstructions(authForm.getOnlineInstruction());
 	    mindmap.setLockOnFinished(authForm.isLockOnFinished());
 	    mindmap.setMultiUserMode(authForm.isMultiUserMode());
 	    // reflection
@@ -498,8 +314,6 @@
     private void updateAuthForm(AuthoringForm authForm, Mindmap mindmap) {
 	authForm.setTitle(mindmap.getTitle());
 	authForm.setInstructions(mindmap.getInstructions());
-	authForm.setOnlineInstruction(mindmap.getOnlineInstructions());
-	authForm.setOfflineInstruction(mindmap.getOfflineInstructions());
 	authForm.setLockOnFinished(mindmap.isLockOnFinished());
 	authForm.setMultiUserMode(mindmap.isMultiUserMode());
 	// reflection
@@ -522,24 +336,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<MindmapAttachment>());
-	map.put(AuthoringAction.KEY_OFFLINE_FILES, new LinkedList<MindmapAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, new LinkedList<MindmapAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, new LinkedList<MindmapAttachment>());
-	map.put(AuthoringAction.KEY_DELETED_FILES, new LinkedList<MindmapAttachment>());
 
-	Iterator iter = mindmap.getMindmapAttachments().iterator();
-	while (iter.hasNext()) {
-	    MindmapAttachment attachment = (MindmapAttachment) 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;
     }
 
@@ -560,17 +357,6 @@
     }
 
     /**
-     * Retrieves a List of attachments from the map using the key.
-     * 
-     * @param key
-     * @param map
-     */
-    private List<MindmapAttachment> getAttList(String key, SessionMap<String, Object> map) {
-	List<MindmapAttachment> list = (List<MindmapAttachment>) map.get(key);
-	return list;
-    }
-
-    /**
      * Retrieve the SessionMap from the HttpSession.
      * 
      * @param request
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java,v
diff -u -r1.15 -r1.16
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	9 Apr 2013 12:45:47 -0000	1.15
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	17 Jan 2014 22:06:36 -0000	1.16
@@ -37,7 +37,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
@@ -79,7 +78,7 @@
  * @struts.action path="/learning" parameter="dispatch" scope="request"
  *                name="learningForm"
  * @struts.action-forward name="mindmap" path="tiles:/learning/main"
- * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
+ * @struts.action-forward name="submissionDeadline" path="tiles:/learning/submissionDeadline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  * @struts.action-forward name="reflect" path="tiles:/learning/reflect"
  */
@@ -150,11 +149,6 @@
 
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
 		.getServletContext());
-
-	// check runOffline
-	if (mindmap.isRunOffline()) {
-	    return mapping.findForward("runOffline");
-	}
 		
 	// check if there is submission deadline
 	Date submissionDeadline = mindmap.getSubmissionDeadline();
@@ -168,9 +162,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("runOffline");
+		return mapping.findForward("submissionDeadline");
 	    }
 	}
 
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java,v
diff -u -r1.8 -r1.9
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java	18 May 2011 16:43:24 -0000	1.8
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java	17 Jan 2014 22:06:36 -0000	1.9
@@ -57,6 +57,7 @@
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+
 import com.thoughtworks.xstream.XStream;
 
 /**
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java	3 Apr 2009 00:00:36 -0000	1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java	17 Jan 2014 22:06:36 -0000	1.2
@@ -32,7 +32,6 @@
 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.web.util.SessionMap;
 
 /**
@@ -44,16 +43,11 @@
 
     String title;
     String instructions;
-    String offlineInstruction;
-    String onlineInstruction;
     boolean lockOnFinished;
     boolean multiUserMode;
-    FormFile onlineFile;
-    FormFile offlineFile;
     String currentTab;
     String dispatch;
     String sessionMapID;
-    Long deleteFileUuid;
     SessionMap sessionMap;
     String mindmapContent;
     // reflection
@@ -108,38 +102,6 @@
 	this.lockOnFinished = lockOnFinished;
     }
 
-    public FormFile getOfflineFile() {
-	return offlineFile;
-    }
-
-    public void setOfflineFile(FormFile offlineFile) {
-	this.offlineFile = offlineFile;
-    }
-
-    public String getOfflineInstruction() {
-	return offlineInstruction;
-    }
-
-    public void setOfflineInstruction(String offlineInstruction) {
-	this.offlineInstruction = offlineInstruction;
-    }
-
-    public FormFile getOnlineFile() {
-	return onlineFile;
-    }
-
-    public void setOnlineFile(FormFile onlineFile) {
-	this.onlineFile = onlineFile;
-    }
-
-    public String getOnlineInstruction() {
-	return onlineInstruction;
-    }
-
-    public void setOnlineInstruction(String onlineInstruction) {
-	this.onlineInstruction = onlineInstruction;
-    }
-
     public String getTitle() {
 	return title;
     }
@@ -156,14 +118,6 @@
 	return sessionMap;
     }
 
-    public Long getDeleteFileUuid() {
-	return deleteFileUuid;
-    }
-
-    public void setDeleteFileUuid(Long deleteFile) {
-	this.deleteFileUuid = deleteFile;
-    }
-
     public boolean isMultiUserMode() {
 	return multiUserMode;
     }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java,v
diff -u -r1.7 -r1.8
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java	6 Jan 2014 08:42:26 -0000	1.7
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java	17 Jan 2014 22:06:37 -0000	1.8
@@ -35,9 +35,9 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.mindmap.dto.MindmapDTO;
@@ -157,30 +157,6 @@
 	
 	return ERROR;
     }
-
-    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 (mindmapService == null) {
-		mindmapService = MindmapServiceProxy.getMindmapService(getServletContext());
-	    }
-
-	    Mindmap content = null;
-	    if (toolContentID != null) {
-		content = mindmapService.getMindmapByContentId(toolContentID);
-	    } else {
-		MindmapSession session = mindmapService.getSessionBySessionId(toolSessionID);
-		if (session != null)
-		    content = session.getMindmap();
-	    }
-	    if (content != null) {
-		activityTitle = content.getTitle();
-	    }
-	}
-	return super.doOfflineExport(request, response, directoryName, cookies);
-    }
     
     private void exportMindmapNodes(List mindmapNodeList, Mindmap mindmap, MindmapUser mindmapUser, String path)
     {
Index: lams_tool_mindmap/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/web/WEB-INF/tiles-defs.xml	30 Jul 2012 18:49:32 -0000	1.1
+++ lams_tool_mindmap/web/WEB-INF/tiles-defs.xml	17 Jan 2014 22:06:37 -0000	1.2
@@ -91,8 +91,8 @@
 		<put name="body" value="/pages/learning/reflect.jsp" />
 	</definition>
 	
-	<definition name="tiles:/learning/runOffline" extends="tiles:/layout:learning">
-		<put name="body" value="/pages/learning/runOffline.jsp" />
+	<definition name="tiles:/learning/submissionDeadline" extends="tiles:/layout:learning">
+		<put name="body" value="/pages/learning/submissionDeadline.jsp" />
 	</definition>
 	
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
Index: lams_tool_mindmap/web/includes/javascript/authoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/includes/javascript/authoring.js,v
diff -u -r1.3 -r1.4
--- lams_tool_mindmap/web/includes/javascript/authoring.js	22 Apr 2009 04:56:08 -0000	1.3
+++ lams_tool_mindmap/web/includes/javascript/authoring.js	17 Jan 2014 22:06:37 -0000	1.4
@@ -33,8 +33,3 @@
 	document.authoringForm.submit();
 }
 
-function deleteAttachment(dispatch, uuid) {
-	document.authoringForm.dispatch.value = dispatch;
-	document.authoringForm.deleteFileUuid.value = uuid;
-	document.authoringForm.submit();
-}
Index: lams_tool_mindmap/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/authoring/authoring.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_mindmap/web/pages/authoring/authoring.jsp	10 Dec 2012 11:11:05 -0000	1.8
+++ lams_tool_mindmap/web/pages/authoring/authoring.jsp	17 Jan 2014 22:06:37 -0000	1.9
@@ -61,7 +61,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>
 	
@@ -75,9 +74,6 @@
 		<html:hidden property="mindmapContent" styleId="mindmapContent" />
 		
 		<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">
@@ -93,7 +89,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 1.2 refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/learning/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp	17 Jan 2014 22:06:37 -0000	1.1
@@ -0,0 +1,47 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<script type="text/javascript">
+	function disableFinishButton() {
+		document.getElementById("finishButton").disabled = true;
+	}
+         function submitForm(methodName){
+                var f = document.getElementById('Form');
+                f.submit();
+        }
+
+</script>
+
+<div id="content">
+	<h1>
+		${mindmapDTO.title}
+	</h1>
+
+	<div class="warning">
+		<fmt:message key="authoring.info.teacher.set.restriction" >
+			<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
+		</fmt:message>
+	</div>
+
+	<c:if test="${mode == 'learner' || mode == 'author'}">
+		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="Form">
+			<html:hidden property="dispatch" value="finishActivity" />
+			<html:hidden property="toolSessionID" />
+
+			<div align="right" class="space-bottom-top">
+				<html:link href="#" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
+				</html:link>
+			</div>
+		</html:form>
+	</c:if>
+</div>
+
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/web/pages/monitoring/monitoring.jsp	3 Apr 2009 00:00:37 -0000	1.1
+++ lams_tool_mindmap/web/pages/monitoring/monitoring.jsp	17 Jan 2014 22:06:37 -0000	1.2
@@ -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 = "${mindmapDTO.currentTab}";
@@ -17,9 +16,8 @@
 	<lams:help toolSignature="<%= MindmapConstants.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_nb/conf/middlegen/nb-prefs.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/conf/middlegen/nb-prefs.properties,v
diff -u -r1.2 -r1.3
--- lams_tool_nb/conf/middlegen/nb-prefs.properties	29 Jul 2005 04:42:20 -0000	1.2
+++ lams_tool_nb/conf/middlegen/nb-prefs.properties	17 Jan 2014 22:10:34 -0000	1.3
@@ -38,9 +38,6 @@
 hibernate.tables.tl_lanb11_content.columns.define_later.columnspecialty=property
 hibernate.tables.tl_lanb11_content.columns.define_later.java-name=defineLater
 hibernate.tables.tl_lanb11_content.columns.define_later.java-type=boolean
-hibernate.tables.tl_lanb11_content.columns.force_offline.columnspecialty=property
-hibernate.tables.tl_lanb11_content.columns.force_offline.java-name=forceOffline
-hibernate.tables.tl_lanb11_content.columns.force_offline.java-type=boolean
 hibernate.tables.tl_lanb11_content.columns.nb_content_id.columnspecialty=property
 hibernate.tables.tl_lanb11_content.columns.nb_content_id.java-name=nbContentId
 hibernate.tables.tl_lanb11_content.columns.nb_content_id.java-type=java.lang.Long
Fisheye: Tag 1.15 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java,v
diff -u -r1.26 -r1.27
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java	19 Sep 2006 06:37:24 -0000	1.26
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java	17 Jan 2014 22:10:33 -0000	1.27
@@ -80,8 +80,6 @@
     //used in monitoring
     public static final String TITLE = "title";
     public static final String CONTENT = "content";
-    public static final String ONLINE_INSTRUCTIONS = "onlineInstructions";
-    public static final String OFFLINE_INSTRUCTIONS = "offlineInstructions";
     public static final String TOOL_CONTENT_ID_INMONITORMODE = "toolContentIdInMonitor";
  
     public static final String DEFINE_LATER = "defineLater";
@@ -93,12 +91,7 @@
     public static final String CONTENT_FOLDER_ID = "contentFolderID"; //request variable
     public static final String RICH_TEXT_TITLE = "richTextTitle";
     public static final String RICH_TEXT_CONTENT = "richTextContent";
-    public static final String RICH_TEXT_ONLINE_INSTRN = "richTextOnlineInstructions";
-    public static final String RICH_TEXT_OFFLINE_INSTRN = "richTextOfflineInstructions";
     
-    public static final String ATTACHMENT_LIST = "attachmentList";
-    public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
-    
     public static final String READ_ONLY_MODE = "readOnlyMode";
    
     
@@ -114,8 +107,6 @@
     public static final String BUTTON_DONE = "button.done";
     public static final String BUTTON_FINISH = "button.finish";
     public static final String BUTTON_EDIT = "button.edit";
-    public static final String BUTTON_UPLOAD = "button.upload";
-    public static final String LINK_DELETE="link.delete";
     public static final String BUTTON_CONTINUE = "button.continue";
     
     
@@ -125,7 +116,6 @@
     
     public static final int FLAG_DEFINE_LATER = 1;
     public static final int FLAG_CONTENT_IN_USE = 2;
-    public static final int FLAG_RUN_OFFLINE = 3;
    
     //------------------------------
     // Error Keys/Messages
@@ -134,5 +124,4 @@
     public static final String ERROR_NBAPPLICATION = "error.exception.NbApplication";
     public static final String ERROR_MANDATORY="error.mandatoryField";
     public static final String ERR_MISSING_PARAM = "error.missingParam";
-    public static final String ERROR_FILE_UPLOAD_CONTENT_REPOSITORY = "error.contentrepository";   
 }
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java,v
diff -u -r1.19 -r1.20
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java	10 Oct 2006 07:47:02 -0000	1.19
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java	17 Jan 2014 22:10:33 -0000	1.20
@@ -57,16 +57,7 @@
 	private String content;
 	
 	/** nullable persistent field */
-	private String onlineInstructions;
-	
-	/** nullable persistent field */
-	private String offlineInstructions;
-	
-	/** nullable persistent field */
 	private boolean defineLater;
-	
-	/** nullable persistent field */
-	private boolean forceOffline;
 
 	private Boolean reflectOnActivity;
 	
@@ -87,8 +78,6 @@
 	/** persistent field */
 	private Set nbSessions = new HashSet();
 	
-	private Set nbAttachments = new HashSet();
-	
 	/** default constructor */
 	public NoticeboardContent()
 	{
@@ -98,10 +87,7 @@
 	public NoticeboardContent(Long nbContentId,
 							  String title,
 							  String content,
-							  String onlineInstructions,
-							  String offlineInstructions,
 							  boolean defineLater,
-							  boolean forceOffline,
 							  boolean reflectOnActivity,
 							  String reflectInstructions,
 							  boolean contentInUse,
@@ -112,10 +98,7 @@
 		this.nbContentId = nbContentId;
 		this.title = title;
 		this.content = content;
-		this.onlineInstructions = onlineInstructions;
-		this.offlineInstructions = offlineInstructions;
 		this.defineLater = defineLater;
-		this.forceOffline = forceOffline;
 		this.reflectOnActivity = reflectOnActivity;
 		this.reflectInstructions = reflectInstructions;
 		this.contentInUse = contentInUse;
@@ -132,17 +115,12 @@
 	public NoticeboardContent(Long nbContentId,
 	        				  String title,
 	        				  String content,
-	        				  String onlineInstructions,
-	        				  String offlineInstructions,
 	        				  Date dateCreated)
 	{
 	    this.nbContentId = nbContentId;
 		this.title = title;
 		this.content = content;
-		this.onlineInstructions = onlineInstructions;
-		this.offlineInstructions = offlineInstructions;
 		this.defineLater = false;
-		this.forceOffline = false;
 		this.reflectOnActivity = false;
 		this.contentInUse = false;
 		this.creatorUserId = null;
@@ -223,19 +201,6 @@
 	
 	/** 
 	 *		@hibernate.property
-     *		column="force_offline"
-     *		length="1"
-     */
-	public boolean isForceOffline() {
-		return forceOffline;
-	}
-	
-	public void setForceOffline(boolean forceOffline) {
-		this.forceOffline = forceOffline;
-	}
-	
-	/** 
-	 *		@hibernate.property
      *		column="reflect_on_activity"
      *		length="1"
      */
@@ -313,56 +278,6 @@
 	}
 	
 	/**
-     *  	@hibernate.set
-     *      lazy="true"
-     *      inverse="true"
-     *      cascade="all-delete-orphan"
-     *      @hibernate.collection-key
-     *      column="nb_content_uid"
-     * 		@hibernate.collection-one-to-many
-     *      class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment"
-     */
-    public Set getNbAttachments() {
-        return nbAttachments;
-    }
-    /**
-     * @param nbAttachments The nbAttachments to set.
-     */
-    public void setNbAttachments(Set nbAttachments) {
-        this.nbAttachments = nbAttachments;
-    }
-	
-	
-	
-	/**
-	 * 
-	 *		@hibernate.property
-     *		column="offline_instructions"
-     *		length="65535"
-     */	
-	public String getOfflineInstructions() {
-		return offlineInstructions;
-	}
-	
-	public void setOfflineInstructions(String offlineInstructions) {
-		this.offlineInstructions = offlineInstructions;
-	}
-	
-	/**
-	 * 
-	 *		@hibernate.property
-     *		column="online_instructions"
-     *		length="65535"
-     */	
-	public String getOnlineInstructions() {
-		return onlineInstructions;
-	}
-	
-	public void setOnlineInstructions(String onlineInstructions) {
-		this.onlineInstructions = onlineInstructions;
-	}
-	
-	/**
 	 * 		@hibernate.property
      *      column="title"
      *      length="65535"
@@ -392,56 +307,24 @@
 	
 
    
-    
-    
-    
-    
-	/** 
-	 * Creates a new NoticeboardContent object from the supplied object.
-	 * Assigns it the toContendId. Also copies all the items in the attachment set
-	 * to the new object's attachment set. So while the two contents have different
-	 * attachment records, they point to the same entries in the database.
-	 * 
-	 * @param nb			NoticeboardContent object containing the content to copy from
-	 * @param toContentId 	The new Id of the new noticeboard object
-	 * @return newContent	The new noticeboard content object
-	 * @throws RepositoryCheckedException 
-	 * @throws ItemNotFoundException 
-	 */
-	public static NoticeboardContent newInstance(NoticeboardContent nb, Long toContentId, IToolContentHandler toolContentHandler) throws ItemNotFoundException, RepositoryCheckedException
-	{
-		NoticeboardContent newContent = new NoticeboardContent(toContentId,
-														nb.getTitle(),
-														nb.getContent(),
-														nb.getOnlineInstructions(),
-														nb.getOfflineInstructions(),
-														nb.isDefineLater(),
-														nb.isForceOffline(),
-														nb.getReflectOnActivity(),
-														nb.getReflectInstructions(),
-														nb.isContentInUse(),
-														nb.getCreatorUserId(),
-														nb.getDateCreated(),
-														nb.getDateUpdated());
-		
-		if ( nb.getNbAttachments() != null && nb.getNbAttachments().size() > 0 ) {
-			HashSet newAttachmentSet = new HashSet();
-			Iterator iter = nb.getNbAttachments().iterator();
-			while (iter.hasNext()) {
-				NoticeboardAttachment element = (NoticeboardAttachment) iter.next();
-				NoticeboardAttachment newAttachment = new NoticeboardAttachment(newContent, element.getFilename(), element.isOnlineFile());
-				//keep old value do not duplicate file
-				newAttachment.setUuid(element.getUuid());
-				newAttachment.setVersionId(element.getVersionId());
-				
-				newAttachmentSet.add(newAttachment);
-			} 
-			newContent.setNbAttachments(newAttachmentSet);
-		}
-		
-		return newContent;
-	}
-   
-	
- 
+    /**
+     * Creates a new NoticeboardContent object from the supplied object. Assigns it the toContendId. 
+     * 
+     * @param nb
+     *            NoticeboardContent object containing the content to copy from
+     * @param toContentId
+     *            The new Id of the new noticeboard object
+     * @return newContent The new noticeboard content object
+     * @throws RepositoryCheckedException
+     * @throws ItemNotFoundException
+     */
+    public static NoticeboardContent newInstance(NoticeboardContent nb, Long toContentId) throws ItemNotFoundException,
+	    RepositoryCheckedException {
+	NoticeboardContent newContent = new NoticeboardContent(toContentId, nb.getTitle(), nb.getContent(),
+		nb.isDefineLater(), nb.getReflectOnActivity(), nb.getReflectInstructions(),
+		nb.isContentInUse(), nb.getCreatorUserId(), nb.getDateCreated(), nb.getDateUpdated());
+
+	return newContent;
+    }
+
 }
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	26 Mar 2009 10:00:38 -0000	1.2
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	17 Jan 2014 22:10:33 -0000	1.3
@@ -18,7 +18,6 @@
 				<property name="nbContentDAO"><ref bean="nbContentDAO"/></property>
 				<property name="nbSessionDAO"><ref bean="nbSessionDAO"/></property>
 				<property name="nbUserDAO"><ref bean="nbUserDAO"/></property>
-				<property name="nbAttachmentDAO"><ref bean="nbAttachmentDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>			
 				<property name="nbToolContentHandler"><ref bean="nbToolContentHandler"/></property>			
@@ -37,8 +36,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>
@@ -64,10 +61,6 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
-	<bean id="nbAttachmentDAO" class="org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardAttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
 	<bean id="nbToolContentHandler" class="org.lamsfoundation.lams.tool.noticeboard.util.NbToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean> 
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/INoticeboardAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20140102.sql	17 Jan 2014 22:10:34 -0000	1.1
@@ -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_lanb11_content DROP COLUMN online_instructions;
+ALTER TABLE tl_lanb11_content DROP COLUMN offline_instructions;
+ALTER TABLE tl_lanb11_content DROP COLUMN force_offline;
+DROP TABLE IF EXISTS tl_lanb11_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lanb11';
+
+----------------------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_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java,v
diff -u -r1.20 -r1.21
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java	11 Feb 2011 08:01:54 -0000	1.20
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java	17 Jan 2014 22:10:33 -0000	1.21
@@ -24,13 +24,9 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.noticeboard.service;
 
-import java.io.InputStream;
 import java.util.List;
 
-import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
@@ -260,61 +256,6 @@
      * @return the total number of users for this tool activity
      */
     public int calculateTotalNumberOfUsers(Long toolContentId);
-    
-    //===================================================================
-    // NoticeboardAttachment access methods
-    //===================================================================
-    
-    /**
-	 * <p>Retrieve an instance of NoticeboardAttachment with the given
-     * attachment id <code>attachmentId</code> </p>
-     * @param attachmentId The id for the attachment file
-     * @return an instance of NoticeboardAttachment
-     */
-    public NoticeboardAttachment retrieveAttachment(Long attachmentId);
-    
-    /**
-	 * <p>Retrieve the file attachment with the given uuid </p>
-     * @param uuid The unique identifier for the file, corresponds to the uuid for the file stored in content repository
-     * @return an instance of NoticeboardAttachment
-     */
-    public NoticeboardAttachment retrieveAttachmentByUuid(Long uuid);
-    
-    /**
-	 * <p>Retrieve an instance of NoticeboardAttachment with the 
-     * filename <code>filename</code> </p>
-     * @param filename The filename of the attachment that you want to retrieve
-     * @return an instance of NoticeboardAttachment
-     */
-    public NoticeboardAttachment retrieveAttachmentByFilename(String filename);
-    
-    /**
-     * <p>Retrieve the list of attachment ids with the given instance of NoticeboardContent</p>
-     * @param nbContent The given instance of NoticeboardContent
-     * @return List. the list of attachment ids (java.lang.Long)
-     */
-    public List getAttachmentIdsFromContent(NoticeboardContent nbContent);
-    
-    /**
-     * <p> Saves (persists) or update the NoticeboardAttachment object in the
-     * database.</p>
-     * @param content The overall noticeboard content object to which the attachment is to be added
-     * @param attachment The instance of NoticeboardAttachment to save
-     */
-    public void saveAttachment(NoticeboardContent content, NoticeboardAttachment attachment);
-    
-    /**
-     * Removes the NoticeboardAttachment object from the database.
-     * @param content The overall noticeboard content object to which the attachment is to be added
-     * @param attachment The instance of NoticeboardAttachment to delete.
-     */
-    public void removeAttachment(NoticeboardContent content, NoticeboardAttachment attachment) throws RepositoryCheckedException;
-    
-	/** 
-	 * Add a file to the content repository. Does not add a record to the noticeboard tables.
-	 * @throws RepositoryCheckedException 
-	 */
-	public NodeKey uploadFile(InputStream istream, String filename, String contentType, String fileType) throws RepositoryCheckedException;
 
     /**
      * This method retrieves the default content id.
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardImportContentVersionFilter.java	17 Jan 2014 22:10:33 -0000	1.1
@@ -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: NoticeboardImportContentVersionFilter.java,v 1.1 2014/01/17 22:10:33 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.noticeboard.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
+
+/**
+ * Import filter class for different version of Noticeboard content.
+ */
+public class NoticeboardImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20081209 version content to 20140102 version tool server.
+     */
+    public void up20081209To20140102() {
+	this.removeField(NoticeboardContent.class, "forceOffline");
+	this.removeField(NoticeboardContent.class, "onlineInstructions");
+	this.removeField(NoticeboardContent.class, "offlineInstructions");
+	this.removeField(NoticeboardContent.class, "nbAttachments");
+    }
+}
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java,v
diff -u -r1.48 -r1.49
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	29 Jul 2013 23:11:14 -0000	1.48
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	17 Jan 2014 22:10:33 -0000	1.49
@@ -24,7 +24,6 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.noticeboard.service;
 
-import java.io.InputStream;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -35,7 +34,6 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -54,12 +52,10 @@
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
-import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardAttachmentDAO;
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO;
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO;
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO;
@@ -90,8 +86,6 @@
 
     private NoticeboardUser nbUser;
     private INoticeboardUserDAO nbUserDAO = null;
-
-    private INoticeboardAttachmentDAO nbAttachmentDAO = null;
     private IToolContentHandler nbToolContentHandler = null;
 
     private IExportToolContentService exportContentService;
@@ -573,103 +567,6 @@
      * ============================================================================== Methods for access to
      * NoticeboardUser objects ==============================================================================
      */
-
-    /** @see org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService#retrieveAttachment(java.lang.Long) */
-    public NoticeboardAttachment retrieveAttachment(Long attachmentId) {
-	if (attachmentId == null) {
-	    String error = "Unable to continue. The attachment id is missing";
-	    NoticeboardServicePOJO.log.error(error);
-	    throw new NbApplicationException(error);
-	}
-
-	try {
-	    return nbAttachmentDAO.retrieveAttachment(attachmentId);
-	} catch (DataAccessException e) {
-	    throw new NbApplicationException(
-		    "EXCEPTION: An exception has occurred while trying to retrieve the attachment " + e.getMessage(), e);
-	}
-    }
-
-    /** @see org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService#retrieveAttachmentByUuid(java.lang.Long) */
-    public NoticeboardAttachment retrieveAttachmentByUuid(Long uuid) {
-	if (uuid == null) {
-	    String error = "Unable to continue. The uuid is missing";
-	    NoticeboardServicePOJO.log.error(error);
-	    throw new NbApplicationException(error);
-	}
-	try {
-	    return nbAttachmentDAO.retrieveAttachmentByUuid(uuid);
-	} catch (DataAccessException e) {
-	    throw new NbApplicationException(
-		    "EXCEPTION: An exception has occurred while trying to retrieve the attachment " + e.getMessage(), e);
-	}
-    }
-
-    /** @see org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService#retrieveAttachment(java.lang.String) */
-    public NoticeboardAttachment retrieveAttachmentByFilename(String filename) {
-	if (filename == null || filename.trim().length() == 0) {
-	    String error = "Unable to continue. The filename is missing";
-	    NoticeboardServicePOJO.log.error(error);
-	    throw new NbApplicationException(error);
-	}
-	try {
-	    return nbAttachmentDAO.retrieveAttachmentByFilename(filename);
-	} catch (DataAccessException e) {
-	    throw new NbApplicationException(
-		    "EXCEPTION: An exception has occurred while trying to retrieve the attachment with filename "
-			    + filename + " " + e.getMessage(), e);
-	}
-    }
-
-    /** @see org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService#getAttachmentIdsFromContent(org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent) */
-    public List getAttachmentIdsFromContent(NoticeboardContent nbContent) {
-	try {
-	    return nbAttachmentDAO.getAttachmentIdsFromContent(nbContent);
-	} catch (DataAccessException e) {
-	    throw new NbApplicationException(
-		    "EXCEPTION: An exception has occurred while trying to retrieve the list of attachment ids "
-			    + e.getMessage(), e);
-	}
-    }
-
-    /** @see org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService#saveAttachment(org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment) */
-    public void saveAttachment(NoticeboardContent content, NoticeboardAttachment attachment) {
-	try {
-	    content.getNbAttachments().add(attachment);
-	    attachment.setNbContent(content);
-	    saveNoticeboard(content);
-	} catch (DataAccessException e) {
-	    throw new NbApplicationException(
-		    "EXCEPTION: An exception has occurred while trying to save the attachment " + e.getMessage(), e);
-	}
-    }
-
-    /**
-     * @throws RepositoryCheckedException
-     * @throws
-     * @see org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService#removeAttachment(org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment)
-     */
-    public void removeAttachment(NoticeboardContent content, NoticeboardAttachment attachment)
-	    throws RepositoryCheckedException {
-	try {
-	    attachment.setNbContent(null);
-	    content.getNbAttachments().remove(attachment);
-	    saveNoticeboard(content);
-	} catch (DataAccessException e) {
-	    throw new NbApplicationException(
-		    "EXCEPTION: An exception has occurred while trying to remove this attachment" + e.getMessage(), e);
-	}
-    }
-
-    /**
-     * @throws RepositoryCheckedException
-     * @see org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService#uploadFile(java.io.InputStream,
-     *      java.lang.String, java.lang.String, java.lang.String)
-     */
-    public NodeKey uploadFile(InputStream istream, String filename, String contentType, String fileType)
-	    throws RepositoryCheckedException {
-	return nbToolContentHandler.uploadFile(istream, filename, contentType, fileType);
-    }
     
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
@@ -701,15 +598,13 @@
 		NoticeboardContent defaultContent = retrieveNoticeboard(getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE));
 
 		if (defaultContent != null) {
-		    NoticeboardContent newContent = NoticeboardContent.newInstance(defaultContent, toContentId,
-			    nbToolContentHandler);
+		    NoticeboardContent newContent = NoticeboardContent.newInstance(defaultContent, toContentId);
 		    saveNoticeboard(newContent);
 		} else {
 		    throw new ToolException("Default content is missing. Unable to copy tool content");
 		}
 	    } else {
-		NoticeboardContent newNbContent = NoticeboardContent.newInstance(originalNb, toContentId,
-			nbToolContentHandler);
+		NoticeboardContent newNbContent = NoticeboardContent.newInstance(originalNb, toContentId);
 		saveNoticeboard(newNbContent);
 	    }
 	} catch (RepositoryCheckedException e) {
@@ -721,24 +616,6 @@
 
     }
 
-    /** @see org.lamsfoundation.lams.tool.ToolContentManager#setAsDefineLater(java.lang.Long) */
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	NoticeboardContent nbContent = getAndCheckIDandObject(toolContentId);
-
-	nbContent.setDefineLater(value);
-	// nbContent.setContentInUse(false); //if define later is set to true, then contentInUse flag should be false
-	saveNoticeboard(nbContent);
-
-    }
-
-    /** @see org.lamsfoundation.lams.tool.ToolContentManager#setAsRunOffline(java.lang.Long) */
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	NoticeboardContent nbContent = getAndCheckIDandObject(toolContentId);
-
-	nbContent.setForceOffline(value);
-	saveNoticeboard(nbContent);
-    }
-
     /** @see org.lamsfoundation.lams.tool.ToolContentManager#removeToolContent(java.lang.Long) */
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
@@ -749,17 +626,6 @@
 		    "Delete failed: There is session data that belongs to this tool content id");
 	}
 
-	// remove any attachments that belong to this tool entry
-	Set attachments = nbContent.getNbAttachments();
-	Iterator i = attachments.iterator();
-	while (i.hasNext()) {
-	    try {
-		removeAttachment(nbContent, (NoticeboardAttachment) i.next());
-	    } catch (RepositoryCheckedException e) {
-		// TODO: not sure if suppose to throw another type of exception or not
-	    }
-	}
-
 	removeNoticeboard(toolContentId);
     }
 
@@ -819,9 +685,8 @@
 
 	try {
 	    // set ResourceToolContentHandler as null to avoid copy file node in repository again.
-	    toolContentObj = NoticeboardContent.newInstance(toolContentObj, toolContentId, null);
+	    toolContentObj = NoticeboardContent.newInstance(toolContentObj, toolContentId);
 	    toolContentObj.setNbSessions(null);
-	    exportContentService.registerFileClassForExport(NoticeboardAttachment.class.getName(), "uuid", "versionId");
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, nbToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -841,9 +706,9 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(NoticeboardAttachment.class.getName(), "uuid", "versionId",
-		    "filename", "fileProperty", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(NoticeboardImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, nbToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof NoticeboardContent)) {
@@ -968,15 +833,11 @@
 	toolContentObj.setDateCreated(now);
 	toolContentObj.setDateUpdated(now);
 	toolContentObj.setDefineLater(false);
-	toolContentObj.setForceOffline(false);
 	toolContentObj.setNbContentId(toolContentId);
-	toolContentObj.setOfflineInstructions(null);
-	toolContentObj.setOnlineInstructions(null);
 	toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 	toolContentObj.setReflectOnActivity(false);
 	// leave as empty, no need to set them to anything.
 	// toolContentObj.setNbSessions(nbSessions);
-	// toolContentObj.setNbAttachments(nbAttachments);
 	nbContentDAO.saveNbContent(toolContentObj);
     }
 
@@ -1044,14 +905,6 @@
 	this.learnerService = learnerService;
     }
 
-    /*
-     * public INoticeboardAttachmentDAO getNbAttachmentDAO() { return nbAttachmentDAO; }
-     */
-
-    public void setNbAttachmentDAO(INoticeboardAttachmentDAO nbAttachmentDAO) {
-	this.nbAttachmentDAO = nbAttachmentDAO;
-    }
-
     /**
      * @param toolService
      *                The toolService to set.
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbWebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbWebUtil.java,v
diff -u -r1.13 -r1.14
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbWebUtil.java	8 Oct 2007 06:14:13 -0000	1.13
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbWebUtil.java	17 Jan 2014 22:10:34 -0000	1.14
@@ -24,93 +24,25 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.noticeboard.util;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
-import org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService;
-import org.lamsfoundation.lams.web.util.SessionMap;
-
 /**
  * This Web Utility class contains helper methods used in the Action Servlets
  * 
  * @author mtruong
- *
+ * 
  */
 public class NbWebUtil {
 
-    private NbWebUtil() {}
-    
-     	public static Long convertToLong(String id)
-	 	{
-	 	    try
-	 	    {
-	 	        return new Long(id);
-	 	    }
-	 	    catch (NumberFormatException e)
-	 	    {
-	 	        return null;
-	 	    }
-	 		
-	 	}
-	 	
-	     
-	     /**
-	     * <p>This method is used in authoring and monitoring to display the list of files that have been uploaded.
-	     * Contents of the collections are NoticeboardAttachments. The current files are included in the attachmentList, 
-	     * files that the user has nominated to delete are in the deletedAttachementList.</p>
-	     * 
-	     * <p>If the input collections are null, then the session variables are not modified. This
-	     * is particularly useful for the deleted files.</p>
-	     * 
-	     * @param request the HttpServletRequest which is used to obtain the HttpSession
-	     * @param attachmentList
-	     * @param deletedAttachmentList
-	     */
-	    public static SessionMap addUploadsToSession(SessionMap sessionMap, HttpServletRequest request, List attachmentList, List deletedAttachmentList)
-	    {
-	    	SessionMap map = sessionMap != null ? sessionMap : new SessionMap();
-			map.put(NoticeboardConstants.ATTACHMENT_LIST, attachmentList != null ? attachmentList : new ArrayList());
-			map.put(NoticeboardConstants.DELETED_ATTACHMENT_LIST, deletedAttachmentList != null ? deletedAttachmentList : new ArrayList());
-			request.getSession().setAttribute(map.getSessionID(), map);
-			return map;
-	    }
-	    
-		/** Setup the map containing the files that have been uploaded for this particular tool content id.
-		 * If NoticeboardContent content does not exist, set nb=null and an empty list will be created.
-		 *
-		 * @param nbService
-		 * @param nb
-		 * @return the attachmentList
-		 */
-	    public static List setupAttachmentList(INoticeboardService nbService, NoticeboardContent nb) {
+    private NbWebUtil() {
+    }
 
-			List attachmentList = new ArrayList();
+    public static Long convertToLong(String id) {
+	try {
+	    return new Long(id);
+	} catch (NumberFormatException e) {
+	    return null;
+	}
 
-			if ( nbService!=null && nb!=null ) {
-				List attachmentIdList = nbService.getAttachmentIdsFromContent(nb);
-				for (int i=0; i<attachmentIdList.size(); i++)
-				{
-				    NoticeboardAttachment file = nbService.retrieveAttachment((Long)attachmentIdList.get(i));
-				    attachmentList.add(file);
-				}
-			} 
-			return attachmentList;
-		}
+    }
 
-		/** 
-		 * Setup an empty deleted attachment map
-		 * @return the new attachmentMap
-		 */
-	    public static List setupDeletedAttachmentList() {
-			return new ArrayList();
-		}
-
-
 }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java,v
diff -u -r1.38 -r1.39
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	29 Feb 2012 21:30:20 -0000	1.38
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	17 Jan 2014 22:10:34 -0000	1.39
@@ -47,7 +47,6 @@
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
 import org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService;
@@ -59,7 +58,6 @@
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
  * @author mtruong
@@ -126,7 +124,6 @@
 		 */
 		INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
 		
-		List attachmentList = null;
 		if (!contentExists(nbService, contentId))
 		{
 			//	Pre-fill the form with the default content
@@ -147,10 +144,6 @@
 			nbForm.setContentFolderID(contentFolderId);
 			nbForm.setTitle(nb.getTitle());
 			nbForm.setBasicContent(nb.getContent());
-			nbForm.setOnlineInstructions(nb.getOnlineInstructions());
-			nbForm.setOfflineInstructions(nb.getOfflineInstructions());
-			
-			attachmentList = NbWebUtil.setupAttachmentList(nbService,null);
 		
 		}
 		else //content already exists on the database
@@ -168,17 +161,9 @@
 		    nbForm.setContentFolderID(contentFolderId);
 		    nb.setDefineLater(Boolean.parseBoolean(nbForm.getDefineLater()));
 		    nbService.saveNoticeboard(nb);
-			    
-		    /** TODO: setup values in the instructions map */
-			
-			//Setup the map containing the files that have been uploaded for this particular tool content id
-			attachmentList = NbWebUtil.setupAttachmentList(nbService,nb);
 		
 		}
 		
-		SessionMap map = NbWebUtil.addUploadsToSession(null, request, attachmentList, NbWebUtil.setupDeletedAttachmentList());
-		nbForm.setSessionMapID(map.getSessionID());
-		
 		request.setAttribute(FORM, nbForm);
 		return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
     }
@@ -235,234 +220,13 @@
 		// Author has finished editing the content and mark the defineLater flag to false
 		nbContent.setDefineLater(false);
 		nbService.saveNoticeboard(nbContent);
-		
-		// Save the attachments then update the attachment collections in the session.
-		SessionMap sessionMap = getSessionMap(request, nbForm);
-		List attachmentList = (List) sessionMap.get(NoticeboardConstants.ATTACHMENT_LIST);
-		List deletedAttachmentList = (List) sessionMap.get(NoticeboardConstants.DELETED_ATTACHMENT_LIST);
-		deletedAttachmentList = saveAttachments(nbService, nbContent, attachmentList, deletedAttachmentList, mapping, request);
-		sessionMap = NbWebUtil.addUploadsToSession(sessionMap, request, attachmentList, deletedAttachmentList);
 	
 		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);		    	
 		return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 		
 	}
-	  
-	/** 
-	* Go through the attachments collections. Remove any content repository or tool objects
-	* matching entries in the the deletedAttachments collection, add any new attachments in the
-	* attachments collection. Clear the deletedAttachments collection, ready for new editing.
-	*/ 
-  	private List saveAttachments (INoticeboardService nbService, NoticeboardContent nbContent, 
-  			List attachmentList, List deletedAttachmentList,
-  			ActionMapping mapping, HttpServletRequest request) {
-
-  		if ( deletedAttachmentList != null ) {
-  			Iterator iter = deletedAttachmentList.iterator();
-  			while (iter.hasNext()) {
-				NoticeboardAttachment attachment = (NoticeboardAttachment) iter.next();
-				
-		    	try
-		    	{
-		    	// remove tool entry from db, does not removing entry from the content repository
-		    	// deleting a non-existent entry shouldn't cause any errors.
-					if ( attachment.getAttachmentId() != null ) {
-						nbService.removeAttachment(nbContent, attachment);
-					}
-		    	} catch (RepositoryCheckedException e) {
-		            logger.error("Unable to delete file",e);
-		    		ActionMessages am = new ActionMessages(); 
-		    		am.add( ActionMessages.GLOBAL_MESSAGE,  
-		    	           new ActionMessage( NoticeboardConstants.ERROR_FILE_UPLOAD_CONTENT_REPOSITORY , 
-		    	        		   			  attachment.getFilename())); 
-		    		saveErrors( request, am );
-		    	}
-  			}
-  			deletedAttachmentList.clear();
-  		}
-  		
-  		if ( attachmentList != null ) {
-  			Iterator iter = attachmentList.iterator();
-  			while (iter.hasNext()) {
-				NoticeboardAttachment attachment = (NoticeboardAttachment) iter.next();
-
-				if ( attachment.getAttachmentId() == null ) {
-					// add entry to tool table - file already in content repository
-					nbService.saveAttachment(nbContent, attachment);
-				}
-  			}
-  		}
-  			
-  		return deletedAttachmentList;
-  	}
-	  	
-    /**
-	 * This method will either upload an online instructions file or an offline instructions file. 
-	 * It will upload an online file if the bean property onlineFile is not null and similarly,
-	 * will upload an offline file if the bean property offlineFile is not null.
-	 * By using the term "upload", we are saving the file information on the local database (?)
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws NbApplicationException
-	 */
-	public ActionForward upload(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
-		throws InvalidParameterException, FileNotFoundException, RepositoryCheckedException, IOException, NbApplicationException {
-	    		
-	    
-	    	//set up the values in the map
-	    	//call the uploadFile method from toolContentHandler
-	    	NbAuthoringForm nbForm = (NbAuthoringForm)form;
-	    	//copyAuthoringFormValuesIntoFormBean(request, nbForm);
-	    	FormFile theFile;
-	    	INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
-			
-	    	Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentID());
-			//throws exception if the content id does not exist
-			checkContentId(content_id);
-			NoticeboardContent nbContent = nbService.retrieveNoticeboard(content_id);
-			
-			//validate file max size
-			ActionMessages errors = new ActionMessages();
-			FileValidatorUtil.validateFileSize(nbForm.getOnlineFile(), true, errors );
-			FileValidatorUtil.validateFileSize(nbForm.getOfflineFile(), true, errors );
-			if(!errors.isEmpty()){
-				this.saveErrors(request, errors);
-				return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
-			}
-			
-	    	//check if the file uploaded is an online instructions file or offline instructions file.
-	    	//if one of the types is null, then the other one must have been uploaded. 
-	    	//here we check if the file is an online one
-			
-			if ((nbForm.getOnlineFile() != null && (nbForm.getOnlineFile().getFileName().trim().length() != 0)) ||
-			        (nbForm.getOfflineFile() != null && (nbForm.getOfflineFile().getFileName().trim().length() != 0)))
-			{
-		    	boolean isOnlineFile = ((nbForm.getOnlineFile() != null && (nbForm.getOnlineFile().getFileName().trim().length() != 0)) ? true: false );
-		    	theFile = (isOnlineFile ? nbForm.getOnlineFile() : nbForm.getOfflineFile());
-		    	String fileType = isOnlineFile ? IToolContentHandler.TYPE_ONLINE : IToolContentHandler.TYPE_OFFLINE;
-
-		    	SessionMap map = getSessionMap(request, nbForm);
-				List attachmentList = (List) map.get(NoticeboardConstants.ATTACHMENT_LIST);
-		    	List deletedAttachmentList = (List) map.get(NoticeboardConstants.DELETED_ATTACHMENT_LIST);
-		    	
-		    	// if a file with the same name already exists then move the old one to deleted
-		    	deletedAttachmentList = moveToDelete(theFile.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 = nbService.uploadFile(theFile.getInputStream(), theFile.getFileName(), theFile.getContentType(), fileType);
-	    	        NoticeboardAttachment file = new NoticeboardAttachment();
-		    	    file.setFilename(theFile.getFileName());
-		    	   	file.setOnlineFile(isOnlineFile);
-			    	file.setNbContent(nbContent);
-			    	file.setUuid(node.getUuid());
-			    	file.setVersionId(node.getVersion()); 
-			    	
-			    	// add the files to the attachment collection - if one existed, it should have already been removed.
-		    	    attachmentList.add(file);
-			    	map = NbWebUtil.addUploadsToSession(map, request, attachmentList, deletedAttachmentList);
-			    	
-			    	//reset the fields so that more files can be uploaded
-			    	nbForm.setOfflineFile(null);
-			    	nbForm.setOnlineFile(null);
-		    	}
-		    	catch (FileNotFoundException e) {
-		            logger.error("Unable to uploadfile",e);
-		            throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage());
-		    	} catch (IOException e) {
-		            logger.error("Unable to uploadfile",e);
-		            throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage());
-		    	} catch (RepositoryCheckedException e) {
-		            logger.error("Unable to uploadfile",e);
-		            throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage());
-		    	}			    	
-			}
-	  
-			nbForm.setMethod(NoticeboardConstants.INSTRUCTIONS);
-			
-			return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
-	}
 		
-		/** If this file exists in attachments list, move it to the deleted attachments list.
-		 * Returns the updated deletedAttachments list, creating a new one if needed. Uses the filename 
-		 * and isOnline flag to match up the attachment entry */
-		private List moveToDelete(String filename, boolean isOnline, List attachmentsList, List deletedAttachmentsList ) {
-			return moveToDelete(filename, isOnline, null, attachmentsList, deletedAttachmentsList);
-		}
-		/** If this file exists in attachments list, move it to the deleted attachments list.
-		 * Returns the updated deletedAttachments list, creating a new one if needed. Uses the uuid of the
-		 * file to match up the attachment entry */
-		private List moveToDelete(Long uuid, List attachmentsList, List deletedAttachmentsList ) {
-			return moveToDelete(null, false, uuid, attachmentsList, deletedAttachmentsList);
-		}
-		
-		/** 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. */
-		private List moveToDelete(String filename, boolean isOnline, Long uuid, List attachmentsList, List deletedAttachmentsList ) {
 
-			List deletedList = deletedAttachmentsList != null ? deletedAttachmentsList : NbWebUtil.setupDeletedAttachmentList();
-			
-			if ( attachmentsList != null ) {
-				Iterator iter = attachmentsList.iterator();
-				NoticeboardAttachment attachment = null;
-				while ( iter.hasNext() && attachment == null ) {
-					NoticeboardAttachment value = (NoticeboardAttachment) iter.next();
-					
-					if ( uuid != null ) {
-						// compare using uuid
-						if ( uuid.equals(value.getUuid()) ) {
-							attachment = value;
-						}
-					} else {
-						// compare using filename and online/offline flag
-						if ( value.isOnlineFile() == isOnline && value.getFilename().equals(filename) ) {
-							attachment = value;
-						}
-					}
-				}
-				if ( attachment != null ) {
-					deletedList.add(attachment);
-					attachmentsList.remove(attachment);
-				}
-			}
-			
-			return deletedList;
-		}
-		
-		public ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
-			throws InvalidParameterException, RepositoryCheckedException, NbApplicationException {
-		
-	    	//set up the values in the map
-	    	NbAuthoringForm nbForm = (NbAuthoringForm)form;
-
-	    	Long uuid = nbForm.getDeleteFileUuid();
-	    	if (uuid == null)
-	    	{
-	    	    String error = "Unable to continue. The file uuid is missing.";
-				logger.error(error);
-				throw new NbApplicationException(error);
-	    	}
-	    	
-	    	// move the file's details from the attachment collection to the deleted attachments collection
-	    	// the attachment will be delete on saving.
-		    SessionMap map = getSessionMap(request, nbForm);
-			List attachmentList = (List) map.get(NoticeboardConstants.ATTACHMENT_LIST);
-	    	List deletedAttachmentList = (List) map.get(NoticeboardConstants.DELETED_ATTACHMENT_LIST);
-	    	deletedAttachmentList = moveToDelete(uuid, attachmentList, deletedAttachmentList );
-	    	
-	    	nbForm.setMethod(NoticeboardConstants.INSTRUCTIONS);
-		
-		   	return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
-		}
-		
-
 		/**
 		 * It is assumed that the contentId is passed as a http parameter
 		 * if the contentId is null, an exception is thrown, otherwise proceed as normal
@@ -479,51 +243,5 @@
 			}
 		}
 		
-		/**
-		 * Retrieve the SessionMap from the HttpSession.
-		 * 
-		 * @param request
-		 * @param authForm
-		 * @return
-		 */
-		private SessionMap getSessionMap(HttpServletRequest request, NbAuthoringForm nbForm) {
-			return (SessionMap) request.getSession().getAttribute(nbForm.getSessionMapID());
-		}
-		
-		/**
-		 * This method copies the values of the request parameters <code>richTextOnlineInstructions</code>
-		 * <code>richTextOfflineInstructions</code> <code>richTextContent</code> into the form properties
-		 * onlineInstructions, offlineInstructions and content respectively.
-		 * 
-		 * @param request HttpServlet request
-		 * @param form The ActionForm class containing data submitted by the forms.
-		 */
-	/*	private void copyAuthoringFormValuesIntoFormBean(HttpServletRequest request, NbAuthoringForm form)
-		{
-		    String onlineInstruction = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_ONLINE_INSTRN, true);
-		    String offlineInstruction = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_OFFLINE_INSTRN, true);
-		  	String content = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_CONTENT, true);
-		  	String title = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_TITLE, true);
-
-		  	
-		  	    form.setTitle(title);
-		  	
-		  	    form.setContent(content);
-		  	
-		        form.setOnlineInstructions(onlineInstruction);
-		  	
-		  	    form.setOfflineInstructions(offlineInstruction);
-		  
-		}  */
-		
-	/*	private void copyFormValuesIntoNbContent(HttpServletRequest request, NoticeboardContent nbContent)
-		{
-		    nbContent.setTitle((String)request.getParameter(NoticeboardConstants.RICH_TEXT_TITLE));
-		    nbContent.setContent((String)request.getParameter(NoticeboardConstants.RICH_TEXT_CONTENT));
-		    nbContent.setOnlineInstructions((String)request.getParameter(NoticeboardConstants.RICH_TEXT_ONLINE_INSTRN));
-		    nbContent.setOfflineInstructions((String)request.getParameter(NoticeboardConstants.RICH_TEXT_OFFLINE_INSTRN));
-		    
-		} */
-		
 }	
 	
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java,v
diff -u -r1.25 -r1.26
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java	27 Oct 2010 17:53:27 -0000	1.25
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java	17 Jan 2014 22:10:34 -0000	1.26
@@ -45,7 +45,7 @@
  * environment. Stores all values in the session scope.</p>
  * 
  * <p>The validate method does not check whether any of the input from
- * title, content, onlineInstructions, offlineInstructions are empty or not.
+ * title, content are empty or not.
  * This is because I have encountered a situation where even though the field is
  * empty, the FCKEditor places a <br/> tag and so the validate method doesnt work.
  * However, the validate method checks the length of the file that has been uploaded,
@@ -71,8 +71,6 @@
 
 	private String title;
 	private String basicContent;
-	private String onlineInstructions;
-	private String offlineInstructions;
 	
 	private String method;
 	private String toolContentID;
@@ -81,40 +79,10 @@
 	
 	private boolean reflectOnActivity;
 	private String reflectInstructions;
-	
-	private FormFile onlineFile;
-	private FormFile offlineFile;
 
 	private String currentTab;
-	private String sessionMapID;
-	
-	private Long deleteFileUuid;
 
-	/**
-     * @return Returns the offlineFile.
-     */
-    public FormFile getOfflineFile() {
-        return offlineFile;
-    }
     /**
-     * @param offlineFile The offlineFile to set.
-     */
-    public void setOfflineFile(FormFile offlineFile) {
-        this.offlineFile = offlineFile;
-    }
-    /**
-     * @return Returns the onlineFile.
-     */
-    public FormFile getOnlineFile() {
-        return onlineFile;
-    }
-    /**
-     * @param onlineFile The onlineFile to set.
-     */
-    public void setOnlineFile(FormFile onlineFile) {
-        this.onlineFile = onlineFile;
-    }
-    /**
      * @return Returns the defineLater.
      */
     public String getDefineLater() {
@@ -169,38 +137,6 @@
 	}
 	
 	/**
-	 * @return Returns the online instructions
-	 */
-	public String getOnlineInstructions()
-	{
-		return onlineInstructions;
-	}
-	
-	/**
-	 * @param onlineInstructions The online instructions to set
-	 */
-	public void setOnlineInstructions(String onlineInstructions)
-	{
-		this.onlineInstructions = onlineInstructions;
-	}
-	
-	/**
-	 * @return Returns the offline instructions
-	 */
-	public String getOfflineInstructions()
-	{
-		return offlineInstructions;
-	}
-	
-	/**
-	 * @param offlineInstructions The offline instructions to set
-	 */
-	public void setOfflineInstructions(String offlineInstructions)
-	{
-		this.offlineInstructions = offlineInstructions;
-	}
-	
-	/**
 	 * @return Returns the method.
 	 */
 	public String getMethod() {
@@ -245,13 +181,8 @@
 	{
 	//	this.content = null;
 		//this.title = null;
-		//this.onlineInstructions = null;
-		//this.offlineInstructions = null;
 	    this.method= null;
 	    this.defineLater = null;
-	    this.onlineFile = null;
-	    this.offlineFile = null;
-	    this.deleteFileUuid = null;
 	}
 	
 	/**
@@ -263,8 +194,6 @@
 	{
 		setTitle(nbContent.getTitle());
 		setBasicContent(nbContent.getContent());
-		setOnlineInstructions(nbContent.getOnlineInstructions());
-		setOfflineInstructions(nbContent.getOfflineInstructions());
 		setReflectOnActivity(nbContent.getReflectOnActivity());
 		setReflectInstructions(nbContent.getReflectInstructions());
 	}
@@ -275,8 +204,6 @@
 	    nbContent.setContent(getBasicContent());
 	    if (defineLater == null || defineLater.length() == 0) {
 	    	// ie. If defineLater is null or empty, this means we are in authoring
-			nbContent.setOnlineInstructions(getOnlineInstructions());
-			nbContent.setOfflineInstructions(getOfflineInstructions());
 			nbContent.setReflectOnActivity(getReflectOnActivity());
 			nbContent.setReflectInstructions(getReflectInstructions());
 			nbContent.setDateUpdated(new Date(System.currentTimeMillis()));
@@ -289,17 +216,5 @@
 	public void setCurrentTab(String currentTab) {
 		this.currentTab = currentTab;
 	}
-	public String getSessionMapID() {
-		return sessionMapID;
-	}
-	public void setSessionMapID(String sessionMapID) {
-		this.sessionMapID = sessionMapID;
-	}
-	public Long getDeleteFileUuid() {
-		return deleteFileUuid;
-	}
-	public void setDeleteFileUuid(Long deleteFileUuid) {
-		this.deleteFileUuid = deleteFileUuid;
-	}	
   
 }
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportServlet.java,v
diff -u -r1.9 -r1.10
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportServlet.java	6 Jan 2014 08:42:52 -0000	1.9
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportServlet.java	17 Jan 2014 22:10:34 -0000	1.10
@@ -48,28 +48,6 @@
 	
 	private final String FILENAME = "nb_main.html";
 	private static Logger logger = Logger.getLogger(NbExportServlet.class);
-
-	protected String doOfflineExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) {
-        if (toolContentID == null && toolSessionID == null)
-        {
-            String error = "Tool content Id or and session Id are null. Unable to set activity title";
-            logger.error(error);
-        } else {
-        	INoticeboardService service = NoticeboardServiceProxy.getNbService(getServletContext());
-        	NoticeboardContent content = null;
-            if ( toolContentID != null ) {
-            	content = service.retrieveNoticeboard(toolContentID);
-            } else {
-            	NoticeboardSession session=service.retrieveNoticeboardSession(toolSessionID);
-            	if ( session != null )
-            		content = session.getNbContent();
-            }
-            if ( content != null ) {
-            	activityTitle = content.getTitle();
-            }
-        }
-        return super.doOfflineExport(request, response, directoryName, cookies);
-	}
 	
 	public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
 	{
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java,v
diff -u -r1.28 -r1.29
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	9 Apr 2013 12:46:33 -0000	1.28
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	17 Jan 2014 22:10:34 -0000	1.29
@@ -58,12 +58,7 @@
  * what mode was set, it will trigger the corresponding action. If the mode parameter
  * is missing or a key is not found in the keymap, it will call the unspecified method
  * which defaults to the learner action. 
- *  
- * <p>The learner action, checks the defineLater and runOffline flags, and if required
- * it will show the learner the message screen indicating a reason why they cant see
- * the contents of the noticeboard.
- * If none of the flags are set, then the learner is able to see the noticeboard. 
- * </p>
+ * 
  * <p>The difference between author mode (which is basically the preview)
  * is that if the defineLater flag is set, it will not be able to see the noticeboard screen
  * </p>
@@ -231,11 +226,10 @@
      * In this noticeboard tool, there are 3 possible flags:
      * <li>defineLater</li>
      * <li>contentInUse</li>
-     * <li>runOffline</li>
      * <br>Returns true if the flag is set, false otherwise <p>
      * 
      * @param content The instance of NoticeboardContent
-     * @param flag The flag to check, can take the following set of values (defineLater, contentInUse, runOffline)
+     * @param flag The flag to check, can take the following set of values (defineLater, contentInUse)
      * @return Returns true if flag is set, false otherwise
      */
 	private boolean isFlagSet(NoticeboardContent content, int flag) throws NbApplicationException
@@ -248,9 +242,6 @@
 	    	case NoticeboardConstants.FLAG_CONTENT_IN_USE:
 	    		return (content.isContentInUse());
 	    	//	break;
-	    	case NoticeboardConstants.FLAG_RUN_OFFLINE:
-	    		return(content.isForceOffline()); 
-	    //		break;
 	    	default:
 	    	    throw new NbApplicationException("Invalid flag");
 	    }
@@ -273,17 +264,12 @@
 	private boolean displayMessageToUser(NoticeboardContent content, ActionMessages message)
 	{
 	    boolean isDefineLaterSet = isFlagSet(content, NoticeboardConstants.FLAG_DEFINE_LATER);
-        boolean isRunOfflineSet = isFlagSet(content, NoticeboardConstants.FLAG_RUN_OFFLINE);
-        if(isDefineLaterSet || isRunOfflineSet)
+        if(isDefineLaterSet)
         {
             if (isDefineLaterSet)
             {
                 message.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("message.defineLaterSet"));
             }
-            if (isRunOfflineSet)
-            {
-                message.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("message.runOfflineSet"));
-            }
             return true;
         }
         else
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java,v
diff -u -r1.30 -r1.31
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	29 Feb 2012 21:30:20 -0000	1.30
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	17 Jan 2014 22:10:34 -0000	1.31
@@ -106,9 +106,6 @@
 
     	monitorForm.setTitle(content.getTitle());
     	monitorForm.setBasicContent(content.getContent());
-    	monitorForm.setOnlineInstructions(content.getOnlineInstructions());
-    	monitorForm.setOfflineInstructions(content.getOfflineInstructions());
-		monitorForm.setAttachmentsList(NbWebUtil.setupAttachmentList(nbService, content));
 
 		monitorForm.setContentEditable("true");
 	    //set up the request parameters to append to the URL
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java,v
diff -u -r1.13 -r1.14
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	27 Oct 2010 17:53:27 -0000	1.13
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	17 Jan 2014 22:10:34 -0000	1.14
@@ -69,10 +69,7 @@
 	/* Only valid when form just set up by Java. Values are not returned from jsp page */
 	private String title;
 	private String basicContent;
-	private String onlineInstructions;
-	private String offlineInstructions;
 	private String contentEditable;
-	private List attachmentsList;
 	private Integer totalLearners;
 	private Map groupStatsMap;
 
@@ -129,14 +126,6 @@
 		return basicContent;
 	}
 
-	public String getOfflineInstructions() {
-		return offlineInstructions;
-	}
-
-	public String getOnlineInstructions() {
-		return onlineInstructions;
-	}
-
 	public String getTitle() {
 		return title;
 	}
@@ -150,21 +139,9 @@
 	public void setContentEditable(String contentEditable) {
 		this.contentEditable = contentEditable;
 	}
-	public void setOfflineInstructions(String offlineInstructions) {
-		this.offlineInstructions = offlineInstructions;
-	}
-	public void setOnlineInstructions(String onlineInstructions) {
-		this.onlineInstructions = onlineInstructions;
-	}
 	public void setTitle(String title) {
 		this.title = title;
 	}
-	public List getAttachmentsList() {
-		return attachmentsList;
-	}
-	public void setAttachmentsList(List attachmentsList) {
-		this.attachmentsList = attachmentsList;
-	}
 	public Map getGroupStatsMap() {
 		return groupStatsMap;
 	}
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/authoring.jsp,v
diff -u -r1.23 -r1.24
--- lams_tool_nb/web/authoring/authoring.jsp	13 Apr 2012 15:24:51 -0000	1.23
+++ lams_tool_nb/web/authoring/authoring.jsp	17 Jan 2014 22:10:34 -0000	1.24
@@ -41,12 +41,6 @@
         	return true;
         }
         
-		function deleteAttachment(uuid) {
-			document.NbAuthoringForm.method.value = 'deleteAttachment';
-			document.NbAuthoringForm.deleteFileUuid.value = uuid;
-			document.NbAuthoringForm.submit();
-		}        
-		
 		function doUpload() {
 			document.NbAuthoringForm.method.value = 'upload';
 			document.NbAuthoringForm.submit();
@@ -62,16 +56,10 @@
 			<html:hidden property="toolContentID" />
 			<html:hidden property="contentFolderID" />
 			<html:hidden property="currentTab" styleId="currentTab" />
-			<html:hidden property="sessionMapID" />
 			<html:hidden property="defineLater" />
 
-			<c:set var="formBean"
-				value="<%=request
-											.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-			<c:set var="sessionMap"
-				value="${sessionScope[formBean.sessionMapID]}" scope="request" />
+			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 			
-			<%-- in define later mode we edit only the basic content. But if we don't have the instructions tab, then the instructions are lost when saving. --%>
 			<h1>
 				<fmt:message key="activity.title" />
 			</h1>
@@ -81,7 +69,6 @@
 					<lams:Tab id="1" key="label.authoring.heading.basic" />
 					<c:if test="${formBean.defineLater != 'true'}">
 						<lams:Tab id="2" key="label.authoring.heading.advanced" />
-						<lams:Tab id="3" key="label.authoring.heading.instructions" />
 					</c:if>
 				</lams:Tabs>
 				<!-- end tab buttons -->
@@ -105,10 +92,6 @@
 				<c:if test="${formBean.defineLater != 'true'}">
 					<lams:TabBody id="2" titleKey="label.authoring.heading.advanced"
 						page="advance.jsp" />
-
-					<lams:TabBody id="3"
-						titleKey="label.authoring.heading.instructions"
-						page="instructions.jsp" />
 				</c:if>
 
 				<!-- Button Row -->
@@ -131,7 +114,6 @@
 					saveButtonLabelKey="button.save"
 					accessMode="${accessMode}"
 					defineLater="${formBean.defineLater}"
-					customiseSessionID="${sessionMap.sessionID}"
 					contentFolderID="${NbAuthoringForm.contentFolderID}" />
 			</div>
 			<div id="footer" />
Fisheye: Tag 1.11 refers to a dead (removed) revision in file `lams_tool_nb/web/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_tool_nb/web/monitoring/m_Instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/web/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/monitoring.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_nb/web/monitoring/monitoring.jsp	2 May 2008 04:54:37 -0000	1.12
+++ lams_tool_nb/web/monitoring/monitoring.jsp	17 Jan 2014 22:10:33 -0000	1.13
@@ -58,7 +58,6 @@
 			
 				<lams:Tabs>
 					<lams:Tab id="<%=NbMonitoringAction.SUMMARY_TABID%>" key="titleHeading.summary" />
-					<lams:Tab id="<%=NbMonitoringAction.INSTRUCTIONS_TABID%>" key="titleHeading.instructions" />
 					<lams:Tab id="<%=NbMonitoringAction.EDITACTIVITY_TABID%>" key="titleHeading.editActivity" />
 					<lams:Tab id="<%=NbMonitoringAction.STATISTICS_TABID%>" key="titleHeading.statistics" />
 				</lams:Tabs>
@@ -68,9 +67,8 @@
 				<lams:help toolSignature="<%= NoticeboardConstants.TOOL_SIGNATURE %>" module="monitoring"/>
 				
 				<lams:TabBody id="1" titleKey="titleHeading.summary" page="m_Summary.jsp" />
-				<lams:TabBody id="2" titleKey="titleHeading.instructions" page="m_Instructions.jsp" />
-				<lams:TabBody id="3" titleKey="titleHeading.editActivity" page="m_EditActivity.jsp" />
-				<lams:TabBody id="4" titleKey="titleHeading.statistics" page="m_Statistics.jsp" />
+				<lams:TabBody id="2" titleKey="titleHeading.editActivity" page="m_EditActivity.jsp" />
+				<lams:TabBody id="3" titleKey="titleHeading.statistics" page="m_Statistics.jsp" />
 			</div>
 			
 			<div id="footer" />
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	26 Mar 2009 10:00:39 -0000	1.7
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	17 Jan 2014 22:10:27 -0000	1.8
@@ -26,7 +26,6 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.tool.notebook.service.NotebookService">
-				<property name="notebookAttachmentDAO"><ref bean="notebookAttachmentDAO"/></property>
 				<property name="notebookSessionDAO"><ref bean="notebookSessionDAO"/></property>
 				<property name="notebookUserDAO"><ref bean="notebookUserDAO"/></property>
 				<property name="notebookDAO"><ref bean="notebookDAO"/></property>
@@ -37,7 +36,6 @@
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="notebookOutputFactory"><ref bean="notebookOutputFactory"/></property>
-		   		<property name="repositoryService"><ref bean="repositoryService"/></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
@@ -51,8 +49,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>
@@ -76,10 +72,6 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
-	<bean id="notebookAttachmentDAO" class="org.lamsfoundation.lams.tool.notebook.dao.hibernate.NotebookAttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
  	<bean id="notebookToolContentHandler" class="org.lamsfoundation.lams.tool.notebook.util.NotebookToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean>  
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookDAO.java	4 Oct 2008 02:47:52 -0000	1.3
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookDAO.java	17 Jan 2014 22:10:27 -0000	1.4
@@ -37,8 +37,6 @@
 
     void saveOrUpdate(Notebook toContent);
 
-    void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type);
-
     void releaseFromCache(Object o);
 
 }
\ No newline at end of file
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java	4 Oct 2008 02:47:52 -0000	1.3
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java	17 Jan 2014 22:10:27 -0000	1.4
@@ -26,12 +26,9 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.notebook.dao.INotebookDAO;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
-import org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment;
-import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
  * DAO for accessing the Notebook objects - Hibernate specific code.
@@ -40,9 +37,6 @@
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Notebook notebook where notebook.toolContentId=?";
 
-    private static final String FIND_INSTRUCTION_FILE = "from " + NotebookAttachment.class.getName()
-	    + " as i where tool_content_id=? and i.file_uuid=? and i.file_version_id=? and i.file_type=?";
-
     public Notebook getByContentId(Long toolContentId) {
 	List list = getHibernateTemplate().find(NotebookDAO.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(NotebookDAO.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) {
-		NotebookAttachment file = (NotebookAttachment) list.get(0);
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.delete(file);
-		templ.flush();
-	    }
-	}
-
-    }
-
     public void releaseFromCache(Object o) {
 	getSession().evict(o);
 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20140102.sql	17 Jan 2014 22:10:27 -0000	1.1
@@ -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_lantbk11_notebook DROP COLUMN online_instructions;
+ALTER TABLE tl_lantbk11_notebook DROP COLUMN offline_instructions;
+ALTER TABLE tl_lantbk11_notebook DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lantbk11_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lantbk11';
+
+----------------------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 1.3 refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java,v
diff -u -r1.10 -r1.11
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	17 May 2011 04:35:35 -0000	1.10
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	17 Jan 2014 22:10:28 -0000	1.11
@@ -30,194 +30,126 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
-import org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookSession;
 
 public class NotebookDTO {
 
-	private static Logger logger = Logger.getLogger(NotebookDTO.class);
+    public Long toolContentId;
 
-	public Long toolContentId;
+    public String title;
 
-	public String title;
+    public String instructions;
 
-	public String instructions;
+    public boolean contentInUse;
 
-	public String onlineInstructions;
+    public boolean allowRichEditor;
 
-	public String offlineInstructions;
-	
-	public boolean defineLater;
-	
-	public boolean contentInUse;
-	
-	public boolean allowRichEditor;
-	
-	public boolean lockOnFinish;
-	
-	public Date submissionDeadline;
-	
-	public Set<NotebookAttachmentDTO> onlineInstructionsFiles;
+    public boolean lockOnFinish;
 
-	public Set<NotebookAttachmentDTO> offlineInstructionsFiles;
+    public Date submissionDeadline;
 
-	public Set<NotebookSessionDTO> sessionDTOs = new TreeSet<NotebookSessionDTO>();
-	
-	public Long currentTab;
-	
-	/* Constructors */
-	public NotebookDTO(){}
-	
-	public NotebookDTO(Notebook notebook) {
-		toolContentId = notebook.getToolContentId();
-		title = notebook.getTitle();
-		instructions = notebook.getInstructions();
-		onlineInstructions = notebook.getOnlineInstructions();
-		offlineInstructions = notebook.getOfflineInstructions();
-		contentInUse = notebook.isContentInUse();
-		allowRichEditor = notebook.isAllowRichEditor();
-		lockOnFinish = notebook.isLockOnFinished();
+    public Set<NotebookSessionDTO> sessionDTOs = new TreeSet<NotebookSessionDTO>();
 
-		onlineInstructionsFiles = new TreeSet<NotebookAttachmentDTO>();
-		offlineInstructionsFiles = new TreeSet<NotebookAttachmentDTO>();
+    public Long currentTab;
 
-		for (Iterator i = notebook.getNotebookAttachments().iterator(); i.hasNext();) {
-			NotebookAttachment att = (NotebookAttachment) i.next();
-			if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) {
-				NotebookAttachmentDTO attDTO = new NotebookAttachmentDTO(att);
-				offlineInstructionsFiles.add(attDTO);
-			} else if (att.getFileType()
-					.equals(IToolContentHandler.TYPE_ONLINE)) {
-				NotebookAttachmentDTO attDTO = new NotebookAttachmentDTO(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 iter = notebook.getNotebookSessions().iterator(); iter.hasNext();) {
-			NotebookSession session = (NotebookSession) iter.next();
-			NotebookSessionDTO sessionDTO = new NotebookSessionDTO(session);
-			
-			sessionDTOs.add(sessionDTO);
-		}
-	}
+    /* Constructors */
+    public NotebookDTO() {
+    }
 
-	/* Getters / Setters */
-	public Set<NotebookSessionDTO> getSessionDTOs() {
-		return sessionDTOs;
-	}
-	
-	public void setSessionDTOs(Set<NotebookSessionDTO> sessionDTOs) {
-		this.sessionDTOs = sessionDTOs;
-	}
+    public NotebookDTO(Notebook notebook) {
+	toolContentId = notebook.getToolContentId();
+	title = notebook.getTitle();
+	instructions = notebook.getInstructions();
+	contentInUse = notebook.isContentInUse();
+	allowRichEditor = notebook.isAllowRichEditor();
+	lockOnFinish = notebook.isLockOnFinished();
 
-	public String getInstructions() {
-		return instructions;
-	}
+	for (Iterator iter = notebook.getNotebookSessions().iterator(); iter.hasNext();) {
+	    NotebookSession session = (NotebookSession) iter.next();
+	    NotebookSessionDTO sessionDTO = new NotebookSessionDTO(session);
 
-	public void setInstructions(String instructions) {
-		this.instructions = instructions;
+	    sessionDTOs.add(sessionDTO);
 	}
+    }
 
-	public String getOfflineInstructions() {
-		return offlineInstructions;
-	}
+    /* Getters / Setters */
+    public Set<NotebookSessionDTO> getSessionDTOs() {
+	return sessionDTOs;
+    }
 
-	public void setOfflineInstructions(String offlineInstructions) {
-		this.offlineInstructions = offlineInstructions;
-	}
+    public void setSessionDTOs(Set<NotebookSessionDTO> sessionDTOs) {
+	this.sessionDTOs = sessionDTOs;
+    }
 
-	public Set<NotebookAttachmentDTO> getOfflineInstructionsFiles() {
-		return offlineInstructionsFiles;
-	}
+    public String getInstructions() {
+	return instructions;
+    }
 
-	public void setOfflineInstructionsFiles(
-			Set<NotebookAttachmentDTO> offlineInstructionsFiles) {
-		this.offlineInstructionsFiles = offlineInstructionsFiles;
-	}
+    public void setInstructions(String instructions) {
+	this.instructions = instructions;
+    }
 
-	public String getOnlineInstructions() {
-		return onlineInstructions;
-	}
+    public String getTitle() {
+	return title;
+    }
 
-	public void setOnlineInstructions(String onlineInstructions) {
-		this.onlineInstructions = onlineInstructions;
-	}
+    public void setTitle(String title) {
+	this.title = title;
+    }
 
-	public Set<NotebookAttachmentDTO> getOnlineInstructionsFiles() {
-		return onlineInstructionsFiles;
-	}
+    public Long getToolContentId() {
+	return toolContentId;
+    }
 
-	public void setOnlineInstructionsFiles(
-			Set<NotebookAttachmentDTO> onlineInstructionsFiles) {
-		this.onlineInstructionsFiles = onlineInstructionsFiles;
-	}
+    public void setToolContentId(Long toolContentID) {
+	this.toolContentId = toolContentID;
+    }
 
-	public String getTitle() {
-		return title;
-	}
+    public Boolean getContentInUse() {
+	return contentInUse;
+    }
 
-	public void setTitle(String title) {
-		this.title = title;
-	}
+    public void setContentInUse(Boolean contentInUse) {
+	this.contentInUse = contentInUse;
+    }
 
-	public Long getToolContentId() {
-		return toolContentId;
-	}
+    public boolean isAllowRichEditor() {
+	return allowRichEditor;
+    }
 
-	public void setToolContentId(Long toolContentID) {
-		this.toolContentId = toolContentID;
-	}
+    public void setAllowRichEditor(boolean allowRichEditor) {
+	this.allowRichEditor = allowRichEditor;
+    }
 
-	public Boolean getContentInUse() {
-		return contentInUse;
-	}
+    public boolean isLockOnFinish() {
+	return lockOnFinish;
+    }
 
-	public void setContentInUse(Boolean contentInUse) {
-		this.contentInUse = contentInUse;
-	}
+    public void setLockOnFinish(boolean lockOnFinish) {
+	this.lockOnFinish = lockOnFinish;
+    }
 
-	public boolean isAllowRichEditor() {
-		return allowRichEditor;
-	}
+    /**
+     * @return the submissionDeadline
+     */
+    public Date getSubmissionDeadline() {
+	return submissionDeadline;
+    }
 
-	public void setAllowRichEditor(boolean allowRichEditor) {
-		this.allowRichEditor = allowRichEditor;
-	}
+    /**
+     * @param submissionDeadline
+     *            the submissionDeadline to set
+     */
+    public void setSubmissionDeadline(Date submissionDeadline) {
+	this.submissionDeadline = submissionDeadline;
+    }
 
-	public boolean isLockOnFinish() {
-		return lockOnFinish;
-	}
+    public Long getCurrentTab() {
+	return currentTab;
+    }
 
-	public void setLockOnFinish(boolean lockOnFinish) {
-		this.lockOnFinish = lockOnFinish;
-	}
-
-	/**
-	 * @return the submissionDeadline
-	 */
-	public Date getSubmissionDeadline() {
-		return submissionDeadline;
-	}
-
-	/**
-	 * @param submissionDeadline the submissionDeadline to set
-	 */
-	public void setSubmissionDeadline(Date submissionDeadline) {
-		this.submissionDeadline = submissionDeadline;
-	}
-
-	public Long getCurrentTab() {
-		return currentTab;
-	}
-
-	public void setCurrentTab(Long currentTab) {
-		this.currentTab = currentTab;
-	}
+    public void setCurrentTab(Long currentTab) {
+	this.currentTab = currentTab;
+    }
 }
\ No newline at end of file
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java,v
diff -u -r1.12 -r1.13
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java	17 May 2011 04:35:35 -0000	1.12
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java	17 Jan 2014 22:10:28 -0000	1.13
@@ -26,32 +26,23 @@
 
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.notebook.service.NotebookService;
 
 /**
  * @hibernate.class table="tl_lantbk11_notebook"
  */
-
 public class Notebook implements java.io.Serializable, Cloneable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 579733009969321015L;
 
     static Logger log = Logger.getLogger(NotebookService.class.getName());
 
     // Fields
-    /**
-     * 
-     */
     private Long uid;
 
     private Date createDate;
@@ -64,67 +55,27 @@
 
     private String instructions;
 
-    private boolean runOffline;
-
     private boolean lockOnFinished;
 
     private boolean allowRichEditor;
 
-    private String onlineInstructions;
-
-    private String offlineInstructions;
-
     private boolean contentInUse;
-
-    private boolean defineLater;
     
-    // LDEV-2657
+    private boolean defineLater;
+
     private Date submissionDeadline;
 
     private Long toolContentId;
 
-    private Set notebookAttachments;
-
     private Set notebookSessions;
 
     private Set<NotebookCondition> conditions = new TreeSet<NotebookCondition>(new TextSearchConditionComparator());
 
-    // *********** NON Persisit fields
-    private IToolContentHandler toolContentHandler;
-
-    // Constructors
-
-    /** default constructor */
-    public Notebook() {
-    }
-
-    /** full constructor */
-    public Notebook(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 notebookAttachments, Set notebookSessions) {
-	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.notebookAttachments = notebookAttachments;
-	this.notebookSessions = notebookSessions;
-    }
-
     // Property accessors
     /**
      * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
      * 
      */
-
     public Long getUid() {
 	return uid;
     }
@@ -137,7 +88,6 @@
      * @hibernate.property column="create_date"
      * 
      */
-
     public Date getCreateDate() {
 	return createDate;
     }
@@ -150,7 +100,6 @@
      * @hibernate.property column="update_date"
      * 
      */
-
     public Date getUpdateDate() {
 	return updateDate;
     }
@@ -199,19 +148,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"
      * 
      */
@@ -237,32 +173,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"
      * 
      */
@@ -274,7 +184,7 @@
     public void setContentInUse(boolean contentInUse) {
 	this.contentInUse = contentInUse;
     }
-
+    
     /**
      * @hibernate.property column="define_later" length="1"
      * 
@@ -289,21 +199,21 @@
     }
 
     public void setSubmissionDeadline(Date submissionDeadline) {
-		this.submissionDeadline = submissionDeadline;
-	}
+	this.submissionDeadline = submissionDeadline;
+    }
 
     /**
      * 
      * @hibernate.property column="submission_deadline"
      * @return date submissionDeadline
      * 
      */
-    
-	public Date getSubmissionDeadline() {
-		return submissionDeadline;
-	}
 
-	/**
+    public Date getSubmissionDeadline() {
+	return submissionDeadline;
+    }
+
+    /**
      * @hibernate.property column="tool_content_id" length="20"
      * 
      */
@@ -317,21 +227,6 @@
     }
 
     /**
-     * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
-     * @hibernate.collection-key column="notebook_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment"
-     * 
-     */
-
-    public Set getNotebookAttachments() {
-	return notebookAttachments;
-    }
-
-    public void setNotebookAttachments(Set notebookAttachments) {
-	this.notebookAttachments = notebookAttachments;
-    }
-
-    /**
      * @hibernate.set lazy="true" inverse="true" cascade="none"
      * @hibernate.collection-key column="notebook_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.notebook.model.NotebookSession"
@@ -403,10 +298,8 @@
 	return result;
     }
 
-    public static Notebook newInstance(Notebook fromContent, Long toContentId,
-	    IToolContentHandler notebookToolContentHandler) {
+    public static Notebook newInstance(Notebook fromContent, Long toContentId) {
 	Notebook toContent = new Notebook();
-	fromContent.toolContentHandler = notebookToolContentHandler;
 	toContent = (Notebook) fromContent.clone();
 	toContent.setToolContentId(toContentId);
 	toContent.setCreateDate(new Date());
@@ -421,17 +314,6 @@
 	    notebook = (Notebook) super.clone();
 	    notebook.setUid(null);
 
-	    if (notebookAttachments != null) {
-		// create a copy of the attachments
-		Iterator iter = notebookAttachments.iterator();
-		Set<NotebookAttachment> set = new HashSet<NotebookAttachment>();
-		while (iter.hasNext()) {
-		    NotebookAttachment originalFile = (NotebookAttachment) iter.next();
-		    NotebookAttachment newFile = (NotebookAttachment) originalFile.clone();
-		    set.add(newFile);
-		}
-		notebook.notebookAttachments = set;
-	    }
 	    // create an empty set for the notebookSession
 	    notebook.notebookSessions = new HashSet();
 
@@ -449,12 +331,4 @@
 	return notebook;
     }
 
-    public IToolContentHandler getToolContentHandler() {
-	return toolContentHandler;
-    }
-
-    public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-	this.toolContentHandler = toolContentHandler;
-    }
-
 }
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java,v
diff -u -r1.8 -r1.9
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java	12 Jul 2013 14:17:11 -0000	1.8
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java	17 Jan 2014 22:10:27 -0000	1.9
@@ -26,10 +26,8 @@
 
 import java.util.Collection;
 
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
-import org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookCondition;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookSession;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
@@ -68,28 +66,6 @@
     public Notebook getNotebookByContentId(Long toolContentID);
 
     /**
-     * @param toolContentId
-     * @param file
-     * @param type
-     * @return
-     */
-    public NotebookAttachment uploadFileToContent(Long toolContentId, FormFile file, String type);
-
-    /**
-     * @param uuid
-     * @param versionID
-     */
-    public void deleteFromRepository(Long uuid, Long versionID) throws NotebookException;
-
-    /**
-     * @param contentID
-     * @param uuid
-     * @param versionID
-     * @param type
-     */
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type);
-
-    /**
      * @param notebook
      */
     public void saveOrUpdateNotebook(Notebook notebook);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookImportContentVersionFilter.java	17 Jan 2014 22:10:27 -0000	1.1
@@ -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: NotebookImportContentVersionFilter.java,v 1.1 2014/01/17 22:10:27 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.notebook.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.notebook.model.Notebook;
+
+/**
+ * Import filter class for different version of Notebook content.
+ */
+public class NotebookImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20110510 version content to 20140102 version tool server.
+     */
+    public void up20110510To20140102() {
+	this.removeField(Notebook.class, "runOffline");
+	this.removeField(Notebook.class, "onlineInstructions");
+	this.removeField(Notebook.class, "offlineInstructions");
+	this.removeField(Notebook.class, "notebookAttachments");
+    }
+}
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v
diff -u -r1.26 -r1.27
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	29 Jul 2013 23:11:07 -0000	1.26
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	17 Jan 2014 22:10:27 -0000	1.27
@@ -24,30 +24,16 @@
 
 package org.lamsfoundation.lams.tool.notebook.service;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Random;
-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.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -63,18 +49,15 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.notebook.dao.INotebookAttachmentDAO;
 import org.lamsfoundation.lams.tool.notebook.dao.INotebookDAO;
 import org.lamsfoundation.lams.tool.notebook.dao.INotebookSessionDAO;
 import org.lamsfoundation.lams.tool.notebook.dao.INotebookUserDAO;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
-import org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookCondition;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookSession;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
 import org.lamsfoundation.lams.tool.notebook.util.NotebookConstants;
 import org.lamsfoundation.lams.tool.notebook.util.NotebookException;
-import org.lamsfoundation.lams.tool.notebook.util.NotebookToolContentHandler;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -97,16 +80,12 @@
 
     private INotebookUserDAO notebookUserDAO = null;
 
-    private INotebookAttachmentDAO notebookAttachmentDAO = null;
-
     private ILearnerService learnerService;
 
     private ILamsToolService toolService;
 
     private IToolContentHandler notebookToolContentHandler = null;
 
-    private IRepositoryService repositoryService = null;
-
     private IAuditService auditService = null;
 
     private IExportToolContentService exportContentService;
@@ -119,7 +98,6 @@
 
     public NotebookService() {
 	super();
-	// TODO Auto-generated constructor stub
     }
 
     /* ************ Methods from ToolSessionManager ************* */
@@ -150,7 +128,6 @@
 
     public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException,
 	    ToolException {
-	// TODO Auto-generated method stub
 	return null;
     }
 
@@ -201,31 +178,12 @@
 	    // create the fromContent using the default tool content
 	    fromContent = getDefaultContent();
 	}
-	Notebook toContent = Notebook.newInstance(fromContent, toContentId, notebookToolContentHandler);
+	Notebook toContent = Notebook.newInstance(fromContent, toContentId);
 	notebookDAO.saveOrUpdate(toContent);
     }
 
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Notebook notebook = notebookDAO.getByContentId(toolContentId);
-	if (notebook == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	notebook.setDefineLater(value);
-	notebookDAO.saveOrUpdate(notebook);
-    }
-
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Notebook notebook = notebookDAO.getByContentId(toolContentId);
-	if (notebook == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	notebook.setRunOffline(value);
-	notebookDAO.saveOrUpdate(notebook);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
-	// TODO Auto-generated method stub
     }
 
     /**
@@ -248,16 +206,9 @@
 
 	// set ResourceToolContentHandler as null to avoid copy file node in
 	// repository again.
-	notebook = Notebook.newInstance(notebook, toolContentId, null);
-	notebook.setToolContentHandler(null);
+	notebook = Notebook.newInstance(notebook, toolContentId);
 	notebook.setNotebookSessions(null);
-	Set<NotebookAttachment> atts = notebook.getNotebookAttachments();
-	for (NotebookAttachment att : atts) {
-	    att.setNotebook(null);
-	}
 	try {
-	    exportContentService.registerFileClassForExport(NotebookAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, notebook, notebookToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -273,9 +224,9 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(NotebookAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(NotebookImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, notebookToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof Notebook)) {
@@ -366,7 +317,7 @@
 	Notebook defaultContent = getDefaultContent();
 	// create new notebook using the newContentID
 	Notebook newContent = new Notebook();
-	newContent = Notebook.newInstance(defaultContent, newContentID, notebookToolContentHandler);
+	newContent = Notebook.newInstance(defaultContent, newContentID);
 	notebookDAO.saveOrUpdate(newContent);
 	return newContent;
     }
@@ -399,33 +350,6 @@
 	return notebookUserDAO.getByUID(uid);
     }
 
-    public NotebookAttachment uploadFileToContent(Long toolContentId, FormFile file, String type) {
-	if (file == null || StringUtils.isEmpty(file.getFileName())) {
-	    throw new NotebookException("Could not find upload file: " + file);
-	}
-
-	NodeKey nodeKey = processFile(file, type);
-
-	NotebookAttachment attachment = new NotebookAttachment(nodeKey.getVersion(), type, file.getFileName(), nodeKey
-		.getUuid(), new Date());
-	return attachment;
-    }
-
-    public void deleteFromRepository(Long uuid, Long versionID) throws NotebookException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new NotebookException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type) {
-	notebookDAO.deleteInstructionFile(contentID, uuid, versionID, type);
-
-    }
-
     public void saveOrUpdateNotebook(Notebook notebook) {
 	notebookDAO.saveOrUpdate(notebook);
     }
@@ -452,54 +376,6 @@
 	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 = getNotebookToolContentHandler().uploadFile(file.getInputStream(), fileName,
-			file.getContentType(), type);
-	    } catch (InvalidParameterException e) {
-		throw new NotebookException("InvalidParameterException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (FileNotFoundException e) {
-		throw new NotebookException("FileNotFoundException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (RepositoryCheckedException e) {
-		throw new NotebookException("RepositoryCheckedException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (IOException e) {
-		throw new NotebookException("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 NotebookException {
-	ICredentials credentials = new SimpleCredentials(NotebookToolContentHandler.repositoryUser,
-		NotebookToolContentHandler.repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials, NotebookToolContentHandler.repositoryWorkspaceName);
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new NotebookException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new NotebookException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new NotebookException("Login failed." + e.getMessage());
-	}
-    }
-
     /* ===============Methods implemented from ToolContentImport102Manager =============== */
 
     /**
@@ -515,15 +391,11 @@
 	notebook.setInstructions(WebUtil.convertNewlines((String) importValues
 		.get(ToolContentImport102Manager.CONTENT_BODY)));
 	notebook.setLockOnFinished(Boolean.TRUE);
-	notebook.setOfflineInstructions(null);
-	notebook.setOnlineInstructions(null);
-	notebook.setRunOffline(Boolean.FALSE);
 	notebook.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 	notebook.setToolContentId(toolContentId);
 	notebook.setUpdateDate(now);
 	notebook.setAllowRichEditor(Boolean.FALSE);
 	// leave as empty, no need to set them to anything.
-	// setNotebookAttachments(Set notebookAttachments);
 	// setNotebookSessions(Set notebookSessions);
 	notebookDAO.saveOrUpdate(notebook);
     }
@@ -546,14 +418,6 @@
     // =========================================================================================
     /* ********** Used by Spring to "inject" the linked objects ************* */
 
-    public INotebookAttachmentDAO getNotebookAttachmentDAO() {
-	return notebookAttachmentDAO;
-    }
-
-    public void setNotebookAttachmentDAO(INotebookAttachmentDAO attachmentDAO) {
-	notebookAttachmentDAO = attachmentDAO;
-    }
-
     public INotebookDAO getNotebookDAO() {
 	return notebookDAO;
     }
@@ -618,14 +482,6 @@
 	this.coreNotebookService = coreNotebookService;
     }
 
-    public IRepositoryService getRepositoryService() {
-	return repositoryService;
-    }
-
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
     public NotebookOutputFactory getNotebookOutputFactory() {
 	return notebookOutputFactory;
     }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java,v
diff -u -r1.7 -r1.8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java	17 May 2011 04:35:35 -0000	1.7
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java	17 Jan 2014 22:10:26 -0000	1.8
@@ -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";
 
@@ -62,7 +60,7 @@
     public static final String ERROR_MSG_NAME_BLANK = "error.condition.name.blank";
     public static final String ERROR_MSG_NAME_DUPLICATED = "error.condition.duplicated.name";
     
-    //  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";
 }
\ No newline at end of file
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java,v
diff -u -r1.20 -r1.21
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	7 Dec 2010 18:44:46 -0000	1.20
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	17 Jan 2014 22:10:27 -0000	1.21
@@ -26,9 +26,6 @@
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
@@ -42,20 +39,15 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-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.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
-import org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookCondition;
 import org.lamsfoundation.lams.tool.notebook.service.INotebookService;
 import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy;
 import org.lamsfoundation.lams.tool.notebook.util.NotebookConstants;
 import org.lamsfoundation.lams.tool.notebook.web.forms.AuthoringForm;
-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;
@@ -79,11 +71,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
@@ -116,9 +103,8 @@
 	}
 
 	if (mode != null && mode.isTeacher()) {
-	    // Set the defineLater flag so that learners cannot use content
-	    // while we
-	    // are editing. This flag is released when updateContent is called.
+	    // Set the defineLater flag so that learners cannot use content while we are editing. This flag is released
+	    // when updateContent is called.
 	    notebook.setDefineLater(true);
 	    notebookService.saveOrUpdateNotebook(notebook);
 	}
@@ -154,24 +140,6 @@
 	ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE);
 	updateNotebook(notebook, authForm, mode);
 
-	// remove attachments marked for deletion.
-	Set<NotebookAttachment> attachments = notebook.getNotebookAttachments();
-	if (attachments == null) {
-	    attachments = new HashSet<NotebookAttachment>();
-	}
-
-	for (NotebookAttachment 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
-	notebook.setNotebookAttachments(attachments);
-
 	notebookService.releaseConditionsFromCache(notebook);
 
 	Set<NotebookCondition> conditions = notebook.getConditions();
@@ -192,7 +160,7 @@
 	    }
 	}
 
-	// set attachments in case it didn't exist
+	// set conditions in case it didn't exist
 	notebook.setConditions(conditionSet);
 
 	// set the update date
@@ -213,156 +181,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<NotebookAttachment> unsavedFiles;
-	List<NotebookAttachment> 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(NotebookConstants.ATTR_SESSION_MAP, map);
-	    this.saveErrors(request, errors);
-	    return mapping.findForward("success");
-	}
-
-	if (file.getFileName().length() != 0) {
-
-	    // upload file to repository
-	    NotebookAttachment newAtt = notebookService.uploadFileToContent((Long) map
-		    .get(AuthoringAction.KEY_TOOL_CONTENT_ID), file, type);
-
-	    // Add attachment to unsavedFiles
-	    // check to see if file with same name exists
-	    NotebookAttachment currAtt;
-	    Iterator iter = savedFiles.iterator();
-	    while (iter.hasNext()) {
-		currAtt = (NotebookAttachment) 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(NotebookConstants.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()) {
-	    NotebookAttachment att = (NotebookAttachment) 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(NotebookConstants.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()) {
-	    NotebookAttachment att = (NotebookAttachment) iter.next();
-
-	    if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-		// delete from repository and list
-		notebookService.deleteFromRepository(att.getFileUuid(), att.getFileVersionId());
-		iter.remove();
-		break;
-	    }
-	}
-
-	request.setAttribute(NotebookConstants.ATTR_SESSION_MAP, map);
-	request.setAttribute("unsavedChanges", new Boolean(true));
-
-	return mapping.findForward("success");
-    }
-
     /**
      * Updates Notebook content using AuthoringForm inputs.
      * 
@@ -374,8 +194,6 @@
 	notebook.setTitle(authForm.getTitle());
 	notebook.setInstructions(authForm.getInstructions());
 	if (mode.isAuthor()) { // Teacher cannot modify following
-	    notebook.setOfflineInstructions(authForm.getOfflineInstruction());
-	    notebook.setOnlineInstructions(authForm.getOnlineInstruction());
 	    notebook.setLockOnFinished(authForm.isLockOnFinished());
 	    notebook.setAllowRichEditor(authForm.isAllowRichEditor());
 
@@ -392,8 +210,6 @@
     private void updateAuthForm(AuthoringForm authForm, Notebook notebook) {
 	authForm.setTitle(notebook.getTitle());
 	authForm.setInstructions(notebook.getInstructions());
-	authForm.setOnlineInstruction(notebook.getOnlineInstructions());
-	authForm.setOfflineInstruction(notebook.getOfflineInstructions());
 	authForm.setLockOnFinished(notebook.isLockOnFinished());
 	authForm.setAllowRichEditor(notebook.isAllowRichEditor());
 
@@ -413,25 +229,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<NotebookAttachment>());
-	map.put(AuthoringAction.KEY_OFFLINE_FILES, new LinkedList<NotebookAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, new LinkedList<NotebookAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, new LinkedList<NotebookAttachment>());
-	map.put(AuthoringAction.KEY_DELETED_FILES, new LinkedList<NotebookAttachment>());
 	map.put(NotebookConstants.ATTR_DELETED_CONDITION_LIST, new ArrayList<NotebookCondition>());
 
-	Iterator iter = notebook.getNotebookAttachments().iterator();
-	while (iter.hasNext()) {
-	    NotebookAttachment attachment = (NotebookAttachment) 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<NotebookCondition> set = new TreeSet<NotebookCondition>(new TextSearchConditionComparator());
 
 	if (notebook.getConditions() != null) {
@@ -459,18 +258,6 @@
     }
 
     /**
-     * Retrieves a List of attachments from the map using the key.
-     * 
-     * @param key
-     * @param map
-     * @return
-     */
-    private List<NotebookAttachment> getAttList(String key, SessionMap<String, Object> map) {
-	List<NotebookAttachment> list = (List<NotebookAttachment>) map.get(key);
-	return list;
-    }
-
-    /**
      * Retrieve the SessionMap from the HttpSession.
      * 
      * @param request
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java,v
diff -u -r1.15 -r1.16
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	16 Oct 2013 07:39:56 -0000	1.15
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	17 Jan 2014 22:10:27 -0000	1.16
@@ -65,7 +65,7 @@
  * 
  * @struts.action path="/learning" parameter="dispatch" scope="request" name="learningForm"
  * @struts.action-forward name="notebook" path="tiles:/learning/main"
- * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
+ * @struts.action-forward name="submissionDeadline" path="tiles:/learning/submissionDeadline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  */
 public class LearningAction extends LamsDispatchAction {
@@ -128,11 +128,6 @@
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
 		.getServletContext());
 
-	// check runOffline
-	if (notebook.isRunOffline()) {
-	    return mapping.findForward("runOffline");
-	}
-
 	NotebookUser notebookUser;
 	if (mode.equals(ToolAccessMode.TEACHER)) {
 	    Long userID = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false);
@@ -161,7 +156,7 @@
 	request.setAttribute(AttributeNames.ATTR_LEARNER_CONTENT_FOLDER,
 		notebookService.getLearnerContentFolder(toolSessionID, notebookUser.getUserId()));
 
-	// date and time restriction LDEV-2657
+	// date and time restriction
 	Date submissionDeadline = notebook.getSubmissionDeadline();
 	if (submissionDeadline != null) {
 	    HttpSession ss = SessionManager.getSession();
@@ -171,9 +166,9 @@
 	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
 	    notebookDTO.submissionDeadline = 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");
 	    }
 	}
 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java,v
diff -u -r1.11 -r1.12
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	17 May 2011 04:35:35 -0000	1.11
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	17 Jan 2014 22:10:27 -0000	1.12
@@ -43,7 +43,6 @@
 import org.lamsfoundation.lams.tool.notebook.service.INotebookService;
 import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy;
 import org.lamsfoundation.lams.tool.notebook.util.NotebookConstants;
-import org.lamsfoundation.lams.tool.service.LamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.WebUtil;
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java	1 Nov 2006 23:07:51 -0000	1.5
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java	17 Jan 2014 22:10:27 -0000	1.6
@@ -22,7 +22,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.lamsfoundation.lams.tool.notebook.web.forms;
 
 import javax.servlet.http.HttpServletRequest;
@@ -32,153 +32,102 @@
 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.web.util.SessionMap;
 
 /**
  * @struts.form name="authoringForm"
  */
 public class AuthoringForm extends ActionForm {
 
-	private static final long serialVersionUID = 3950453134542135495L;
+    private static final long serialVersionUID = 3950453134542135495L;
 
-	// Properties
+    // Properties
 
-	String title;
+    String title;
 
-	String instructions;
+    String instructions;
 
-	String offlineInstruction;
+    boolean lockOnFinished;
 
-	String onlineInstruction;
+    boolean allowRichEditor;
 
-	boolean lockOnFinished;
-	
-	boolean allowRichEditor;
-	
-	FormFile onlineFile; 
+    String currentTab;
 
-	FormFile offlineFile;
+    String dispatch;
 
-	String currentTab;
+    String sessionMapID;
 
-	String dispatch;
-	
-	String sessionMapID;
-	
-	Long deleteFileUuid;
+    SessionMap sessionMap;
 
-	SessionMap sessionMap;
+    @Override
+    public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
+	ActionErrors ac = new ActionErrors();
+	ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
 
-	@Override
-	public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
-		ActionErrors ac = new ActionErrors();
-		ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
-		
-		return ac;
-	}
-	
-	public String getSessionMapID() {
-		return sessionMapID;
-	}
+	return ac;
+    }
 
-	public void setSessionMapID(String sessionMapID) {
-		this.sessionMapID = sessionMapID;
-	}
+    public String getSessionMapID() {
+	return sessionMapID;
+    }
 
-	public String getCurrentTab() {
-		return currentTab;
-	}
+    public void setSessionMapID(String sessionMapID) {
+	this.sessionMapID = sessionMapID;
+    }
 
-	public void setCurrentTab(String currentTab) {
-		this.currentTab = currentTab;
-	}
+    public String getCurrentTab() {
+	return currentTab;
+    }
 
-	public String getDispatch() {
-		return dispatch;
-	}
+    public void setCurrentTab(String currentTab) {
+	this.currentTab = currentTab;
+    }
 
-	public void setDispatch(String dispatch) {
-		this.dispatch = dispatch;
-	}
+    public String getDispatch() {
+	return dispatch;
+    }
 
-	public String getInstructions() {
-		return instructions;
-	}
+    public void setDispatch(String dispatch) {
+	this.dispatch = dispatch;
+    }
 
-	public void setInstructions(String instructions) {
-		this.instructions = instructions;
-	}
+    public String getInstructions() {
+	return instructions;
+    }
 
-	public boolean isLockOnFinished() {
-		return lockOnFinished;
-	}
+    public void setInstructions(String instructions) {
+	this.instructions = instructions;
+    }
 
-	public void setLockOnFinished(boolean lockOnFinished) {
-		this.lockOnFinished = lockOnFinished;
-	}
+    public boolean isLockOnFinished() {
+	return lockOnFinished;
+    }
 
-	public FormFile getOfflineFile() {
-		return offlineFile;
-	}
+    public void setLockOnFinished(boolean lockOnFinished) {
+	this.lockOnFinished = lockOnFinished;
+    }
 
-	public void setOfflineFile(FormFile offlineFile) {
-		this.offlineFile = offlineFile;
-	}
+    public String getTitle() {
+	return title;
+    }
 
-	public String getOfflineInstruction() {
-		return offlineInstruction;
-	}
+    public void setTitle(String title) {
+	this.title = title;
+    }
 
-	public void setOfflineInstruction(String offlineInstruction) {
-		this.offlineInstruction = offlineInstruction;
-	}
+    public void setSessionMap(SessionMap sessionMap) {
+	this.sessionMap = sessionMap;
+    }
 
-	public FormFile getOnlineFile() {
-		return onlineFile;
-	}
+    public SessionMap getSessionMap() {
+	return sessionMap;
+    }
 
-	public void setOnlineFile(FormFile onlineFile) {
-		this.onlineFile = onlineFile;
-	}
-	
-	public String getOnlineInstruction() {
-		return onlineInstruction;
-	}
+    public boolean isAllowRichEditor() {
+	return allowRichEditor;
+    }
 
-	public void setOnlineInstruction(String onlineInstruction) {
-		this.onlineInstruction = onlineInstruction;
-	}
-	
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public void setSessionMap(SessionMap sessionMap) {
-		this.sessionMap = sessionMap;
-	}
-
-	public SessionMap getSessionMap() {
-		return sessionMap;
-	}
-
-	public Long getDeleteFileUuid() {
-		return deleteFileUuid;
-	}
-
-	public void setDeleteFileUuid(Long deleteFile) {
-		this.deleteFileUuid = deleteFile;
-	}
-
-	public boolean isAllowRichEditor() {
-		return allowRichEditor;
-	}
-
-	public void setAllowRichEditor(boolean allowRichEditor) {
-		this.allowRichEditor = allowRichEditor;
-	}
+    public void setAllowRichEditor(boolean allowRichEditor) {
+	this.allowRichEditor = allowRichEditor;
+    }
 }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java,v
diff -u -r1.9 -r1.10
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java	6 Jan 2014 08:42:31 -0000	1.9
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java	17 Jan 2014 22:10:28 -0000	1.10
@@ -86,29 +86,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 (notebookService == null) {
-    			notebookService = NotebookServiceProxy.getNotebookService(getServletContext());
-    		}
-
-        	Notebook content = null;
-            if ( toolContentID != null ) {
-            	content = notebookService.getNotebookByContentId(toolContentID);
-            } else {
-            	NotebookSession session=notebookService.getSessionBySessionId(toolSessionID);
-            	if ( session != null )
-            		content = session.getNotebook();
-            }
-            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_notebook/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/WEB-INF/tiles-defs.xml	30 Jul 2012 18:54:34 -0000	1.1
+++ lams_tool_notebook/web/WEB-INF/tiles-defs.xml	17 Jan 2014 22:10:26 -0000	1.2
@@ -64,9 +64,9 @@
 		<put name="bodyMobile" value="/pages/learning/mobile/notebook.jsp"/>
 	</definition>
 
-	<definition name="tiles:/learning/runOffline" extends="tiles:/layout:learning">
-		<put name="body" value="/pages/learning/runOffline.jsp" />
-		<put name="bodyMobile" value="/pages/learning/mobile/runOffline.jsp"/>
+	<definition name="tiles:/learning/submissionDeadline" extends="tiles:/layout:learning">
+		<put name="body" value="/pages/learning/submissionDeadline.jsp" />
+		<put name="bodyMobile" value="/pages/learning/mobile/submissionDeadline.jsp"/>
 	</definition>
 	
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
Index: lams_tool_notebook/web/includes/javascript/authoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/includes/javascript/authoring.js,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/includes/javascript/authoring.js	26 Oct 2006 02:33:21 -0000	1.2
+++ lams_tool_notebook/web/includes/javascript/authoring.js	17 Jan 2014 22:10:27 -0000	1.3
@@ -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();
-}
\ No newline at end of file
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/authoring.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	4 Oct 2008 02:47:52 -0000	1.8
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	17 Jan 2014 22:10:27 -0000	1.9
@@ -7,8 +7,7 @@
 	enctype="multipart/form-data">
 
 	<c:set var="formBean"
-		value="<%=request
-										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		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,8 +22,7 @@
 			<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" />
-				<lams:Tab id="4" key="button.conditions" />
+				<lams:Tab id="3" key="button.conditions" />
 			</c:if>
 		</lams:Tabs>
 
@@ -37,9 +35,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">
@@ -56,9 +51,7 @@
 		<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" />
-			<lams:TabBody id="4" titleKey="button.conditions"
+			<lams:TabBody id="3" titleKey="button.conditions"
 				page="conditions.jsp" />
 		</c:if>
 
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.13 refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/learning/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/pages/learning/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	17 Jan 2014 22:10:28 -0000	1.1
@@ -0,0 +1,46 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<script type="text/javascript">
+	function disableFinishButton() {
+		document.getElementById("finishButton").disabled = true;
+	}
+    function submitForm(methodName){
+    	var f = document.getElementById('messageForm');
+    	f.submit();
+    }
+</script>
+
+<div id="content">
+	<h1>
+		${notebookDTO.title}
+	</h1>
+
+	<div class="warning">
+		<fmt:message key="authoring.info.teacher.set.restriction" >
+			<fmt:param><lams:Date value="${notebookDTO.submissionDeadline}" /></fmt:param>
+		</fmt:message>	
+	</div>
+	
+	<c:if test="${mode == 'learner' || mode == 'author'}">
+		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
+			<html:hidden property="dispatch" value="finishActivity" />
+			<html:hidden property="toolSessionID" />
+
+			<div align="right" class="space-bottom-top">
+				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
+				</html:link>
+			</div>
+		</html:form>
+	</c:if>
+</div>
+
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/learning/mobile/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/pages/learning/mobile/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/mobile/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_notebook/web/pages/learning/mobile/submissionDeadline.jsp	17 Jan 2014 22:10:26 -0000	1.1
@@ -0,0 +1,51 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<script type="text/javascript">
+	function disableFinishButton() {
+		document.getElementById("finishButton").disabled = true;
+	}
+    function submitForm(methodName){
+    	var f = document.getElementById('messageForm');
+    	f.submit();
+    }
+</script>
+
+<div data-role="header" data-theme="b" data-nobackbtn="true">
+	<h1>
+		${notebookDTO.title}
+	</h1>
+</div>
+
+<div data-role="content">
+	<div class="warning">
+		<fmt:message key="authoring.info.teacher.set.restriction" >
+			<fmt:param><lams:Date value="${notebookDTO.submissionDeadline}" /></fmt:param>
+		</fmt:message>	
+	</div>
+</div>
+
+<div data-role="footer" data-theme="b" class="ui-bar">
+	<span class="ui-finishbtn-right">
+	
+		<c:if test="${mode == 'learner' || mode == 'author'}">
+			<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
+				<html:hidden property="dispatch" value="finishActivity" />
+				<html:hidden property="toolSessionID" />
+	
+				<a href="#nogo" id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
+				</a>
+			</html:form>
+		</c:if>
+		
+	</span>
+</div>
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/web/pages/monitoring/monitoring.jsp	2 May 2008 07:45:29 -0000	1.5
+++ lams_tool_notebook/web/pages/monitoring/monitoring.jsp	17 Jan 2014 22:10:27 -0000	1.6
@@ -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 = "${notebookDTO.currentTab}";
@@ -17,9 +16,8 @@
 	<lams:help toolSignature="<%= NotebookConstants.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_pixlr/conf/middlegen/lams_tool_lapixlr11-prefs.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/conf/middlegen/lams_tool_lapixlr11-prefs.properties,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/conf/middlegen/lams_tool_lapixlr11-prefs.properties	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/conf/middlegen/lams_tool_lapixlr11-prefs.properties	17 Jan 2014 22:10:30 -0000	1.2
@@ -44,8 +44,6 @@
 hibernate.tables.tl_lapixl10_pixlr.columns.offline_instructions.java-type=java.lang.String
 hibernate.tables.tl_lapixl10_pixlr.columns.online_instructions.java-name=onlineInstructions
 hibernate.tables.tl_lapixl10_pixlr.columns.online_instructions.java-type=java.lang.String
-hibernate.tables.tl_lapixl10_pixlr.columns.run_offline.java-name=runOffline
-hibernate.tables.tl_lapixl10_pixlr.columns.run_offline.java-type=java.lang.Boolean
 hibernate.tables.tl_lapixl10_pixlr.columns.title.inctostring=true
 hibernate.tables.tl_lapixl10_pixlr.columns.title.java-name=title
 hibernate.tables.tl_lapixl10_pixlr.columns.title.java-type=java.lang.String
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	26 Mar 2009 10:00:39 -0000	1.4
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	17 Jan 2014 22:10:31 -0000	1.5
@@ -26,7 +26,6 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.tool.pixlr.service.PixlrService">
-				<property name="pixlrAttachmentDAO"><ref bean="pixlrAttachmentDAO"/></property>
 				<property name="pixlrSessionDAO"><ref bean="pixlrSessionDAO"/></property>
 				<property name="pixlrUserDAO"><ref bean="pixlrUserDAO"/></property>
 				<property name="pixlrConfigItemDAO"><ref bean="pixlrConfigItemDAO"/></property>
@@ -38,7 +37,6 @@
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="pixlrOutputFactory"><ref bean="pixlrOutputFactory"/></property>
-		   		<property name="repositoryService"><ref bean="repositoryService" /></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
@@ -52,8 +50,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>
@@ -77,10 +73,6 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
-	<bean id="pixlrAttachmentDAO" class="org.lamsfoundation.lams.tool.pixlr.dao.hibernate.PixlrAttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
  	<bean id="pixlrToolContentHandler" class="org.lamsfoundation.lams.tool.pixlr.util.PixlrToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean>  
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/IPixlrAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/IPixlrDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/IPixlrDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/IPixlrDAO.java	7 Jan 2009 22:37:48 -0000	1.1
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/IPixlrDAO.java	17 Jan 2014 22:10:31 -0000	1.2
@@ -37,8 +37,6 @@
 
     void saveOrUpdate(Pixlr toContent);
 
-    void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type);
-
     void releaseFromCache(Object o);
 
 }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java	17 Jan 2014 22:10:30 -0000	1.2
@@ -30,7 +30,6 @@
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.pixlr.dao.IPixlrDAO;
 import org.lamsfoundation.lams.tool.pixlr.model.Pixlr;
-import org.lamsfoundation.lams.tool.pixlr.model.PixlrAttachment;
 import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
@@ -40,9 +39,6 @@
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Pixlr pixlr where pixlr.toolContentId=?";
 
-    private static final String FIND_INSTRUCTION_FILE = "from " + PixlrAttachment.class.getName()
-	    + " as i where tool_content_id=? and i.file_uuid=? and i.file_version_id=? and i.file_type=?";
-
     @SuppressWarnings("unchecked")
     public Pixlr getByContentId(Long toolContentId) {
 	List list = getHibernateTemplate().find(PixlrDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
@@ -58,23 +54,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(PixlrDAO.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) {
-		PixlrAttachment file = (PixlrAttachment) list.get(0);
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.delete(file);
-		templ.flush();
-	    }
-	}
-
-    }
-
     public void releaseFromCache(Object o) {
 	getSession().evict(o);
 
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20140102.sql	17 Jan 2014 22:10:31 -0000	1.1
@@ -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_lapixl10_pixlr DROP COLUMN online_instructions;
+ALTER TABLE tl_lapixl10_pixlr DROP COLUMN offline_instructions;
+ALTER TABLE tl_lapixl10_pixlr DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lapixl10_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lapixl10';
+
+----------------------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 1.2 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrDTO.java	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrDTO.java	17 Jan 2014 22:10:30 -0000	1.2
@@ -32,7 +32,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.pixlr.model.Pixlr;
-import org.lamsfoundation.lams.tool.pixlr.model.PixlrAttachment;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrSession;
 
 public class PixlrDTO {
@@ -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<PixlrAttachmentDTO> onlineInstructionsFiles;
-
-    public Set<PixlrAttachmentDTO> offlineInstructionsFiles;
-
     public Set<PixlrSessionDTO> sessionDTOs = new TreeSet<PixlrSessionDTO>();
 
     public Long currentTab;
@@ -83,32 +74,13 @@
 	this.toolContentId = pixlr.getToolContentId();
 	this.title = pixlr.getTitle();
 	this.instructions = pixlr.getInstructions();
-	this.onlineInstructions = pixlr.getOnlineInstructions();
-	this.offlineInstructions = pixlr.getOfflineInstructions();
 	this.contentInUse = pixlr.isContentInUse();
 	this.reflectOnActivity = pixlr.isReflectOnActivity();
 	this.lockOnFinish = pixlr.isLockOnFinished();
 	this.imageFileName = pixlr.getImageFileName();
 	this.reflectInstructions = pixlr.getReflectInstructions();
 	this.allowViewOthersImages = pixlr.isAllowViewOthersImages();
 
-	this.onlineInstructionsFiles = new TreeSet<PixlrAttachmentDTO>();
-	this.offlineInstructionsFiles = new TreeSet<PixlrAttachmentDTO>();
-
-	for (Iterator<PixlrAttachment> i = pixlr.getPixlrAttachments().iterator(); i.hasNext();) {
-	    PixlrAttachment att = (PixlrAttachment) i.next();
-	    if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) {
-		PixlrAttachmentDTO attDTO = new PixlrAttachmentDTO(att);
-		offlineInstructionsFiles.add(attDTO);
-	    } else if (att.getFileType().equals(IToolContentHandler.TYPE_ONLINE)) {
-		PixlrAttachmentDTO attDTO = new PixlrAttachmentDTO(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<PixlrSession> iter = pixlr.getPixlrSessions().iterator(); iter.hasNext();) {
 	    PixlrSession session = (PixlrSession) iter.next();
 	    PixlrSessionDTO sessionDTO = new PixlrSessionDTO(session);
@@ -134,38 +106,6 @@
 	this.instructions = instructions;
     }
 
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    public Set<PixlrAttachmentDTO> getOfflineInstructionsFiles() {
-	return offlineInstructionsFiles;
-    }
-
-    public void setOfflineInstructionsFiles(Set<PixlrAttachmentDTO> offlineInstructionsFiles) {
-	this.offlineInstructionsFiles = offlineInstructionsFiles;
-    }
-
-    public String getOnlineInstructions() {
-	return onlineInstructions;
-    }
-
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
-    public Set<PixlrAttachmentDTO> getOnlineInstructionsFiles() {
-	return onlineInstructionsFiles;
-    }
-
-    public void setOnlineInstructionsFiles(Set<PixlrAttachmentDTO> onlineInstructionsFiles) {
-	this.onlineInstructionsFiles = onlineInstructionsFiles;
-    }
-
     public String getTitle() {
 	return title;
     }
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.java,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.java	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.java	17 Jan 2014 22:10:31 -0000	1.2
@@ -62,8 +62,6 @@
 
     private String instructions;
 
-    private boolean runOffline;
-
     private boolean lockOnFinished;
 
     private boolean reflectOnActivity;
@@ -72,10 +70,6 @@
 
     private String reflectInstructions;
 
-    private String onlineInstructions;
-
-    private String offlineInstructions;
-
     private boolean contentInUse;
 
     private boolean defineLater;
@@ -88,13 +82,8 @@
     
     private Long imageHeight;
 
-    private Set<PixlrAttachment> pixlrAttachments;
-
     private Set<PixlrSession> pixlrSessions;
 
-    // *********** NON Persisit fields
-    private IToolContentHandler toolContentHandler;
-
     // Constructors
 
     /** default constructor */
@@ -103,23 +92,19 @@
 
     /** full constructor */
     public Pixlr(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, String reflectInstructions, Set<PixlrAttachment> pixlrAttachments,
-	    Set<PixlrSession> pixlrSessions, String imageFileName, Long imageWidth, Long imageHeight, boolean allowViewOthersImages) {
+	    boolean lockOnFinished, boolean filteringEnabled, String filterKeywords, String onlineInstructions,
+	    String offlineInstructions, boolean contentInUse, boolean defineLater, Long toolContentId,
+	    String reflectInstructions, Set<PixlrSession> pixlrSessions, String imageFileName, Long imageWidth,
+	    Long imageHeight, boolean allowViewOthersImages) {
 	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.pixlrAttachments = pixlrAttachments;
 	this.pixlrSessions = pixlrSessions;
 	this.imageFileName = imageFileName;
 	this.reflectInstructions = reflectInstructions;
@@ -208,19 +193,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"
      * 
      */
@@ -256,31 +228,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"
      * 
      */
@@ -318,25 +265,8 @@
     public void setToolContentId(Long toolContentId) {
 	this.toolContentId = toolContentId;
     }
-    
-    
 
     /**
-     * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
-     * @hibernate.collection-key column="pixlr_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.pixlr.model.PixlrAttachment"
-     * 
-     */
-
-    public Set<PixlrAttachment> getPixlrAttachments() {
-	return pixlrAttachments;
-    }
-
-    public void setPixlrAttachments(Set<PixlrAttachment> pixlrAttachments) {
-	this.pixlrAttachments = pixlrAttachments;
-    }
-
-    /**
      * @hibernate.set lazy="true" inverse="true" cascade="none"
      * @hibernate.collection-key column="pixlr_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.pixlr.model.PixlrSession"
@@ -393,9 +323,8 @@
 	return result;
     }
 
-    public static Pixlr newInstance(Pixlr fromContent, Long toContentId, IToolContentHandler pixlrToolContentHandler) {
+    public static Pixlr newInstance(Pixlr fromContent, Long toContentId) {
 	Pixlr toContent = new Pixlr();
-	fromContent.toolContentHandler = pixlrToolContentHandler;
 	toContent = (Pixlr) fromContent.clone();
 	toContent.setToolContentId(toContentId);
 	toContent.setCreateDate(new Date());
@@ -410,17 +339,6 @@
 	    pixlr = (Pixlr) super.clone();
 	    pixlr.setUid(null);
 
-	    if (pixlrAttachments != null) {
-		// create a copy of the attachments
-		Iterator<PixlrAttachment> iter = pixlrAttachments.iterator();
-		Set<PixlrAttachment> set = new HashSet<PixlrAttachment>();
-		while (iter.hasNext()) {
-		    PixlrAttachment originalFile = (PixlrAttachment) iter.next();
-		    PixlrAttachment newFile = (PixlrAttachment) originalFile.clone();
-		    set.add(newFile);
-		}
-		pixlr.pixlrAttachments = set;
-	    }
 	    // create an empty set for the pixlrSession
 	    pixlr.pixlrSessions = new HashSet<PixlrSession>();
 
@@ -430,14 +348,6 @@
 	return pixlr;
     }
 
-    public IToolContentHandler getToolContentHandler() {
-	return toolContentHandler;
-    }
-
-    public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-	this.toolContentHandler = toolContentHandler;
-    }
-
     /**
      * @hibernate.property column="image_file_name" length="511"
      * 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/PixlrAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java,v
diff -u -r1.4 -r1.5
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java	10 Feb 2011 23:10:17 -0000	1.4
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java	17 Jan 2014 22:10:30 -0000	1.5
@@ -24,14 +24,11 @@
 
 package org.lamsfoundation.lams.tool.pixlr.service;
 
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.pixlr.model.Pixlr;
-import org.lamsfoundation.lams.tool.pixlr.model.PixlrAttachment;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrConfigItem;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrSession;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrUser;
-import org.lamsfoundation.lams.tool.pixlr.util.PixlrException;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 
 /**
@@ -66,28 +63,6 @@
     public Pixlr getPixlrByContentId(Long toolContentID);
 
     /**
-     * @param toolContentId
-     * @param file
-     * @param type
-     * @return
-     */
-    public PixlrAttachment uploadFileToContent(Long toolContentId, FormFile file, String type);
-
-    /**
-     * @param uuid
-     * @param versionID
-     */
-    public void deleteFromRepository(Long uuid, Long versionID) throws PixlrException;
-
-    /**
-     * @param contentID
-     * @param uuid
-     * @param versionID
-     * @param type
-     */
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type);
-
-    /**
      * @param pixlr
      */
     public void saveOrUpdatePixlr(Pixlr pixlr);
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrImportContentVersionFilter.java	17 Jan 2014 22:10:30 -0000	1.1
@@ -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: PixlrImportContentVersionFilter.java,v 1.1 2014/01/17 22:10:30 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.pixlr.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.pixlr.model.Pixlr;
+
+/**
+ * Import filter class for different version of Pixlr content.
+ */
+public class PixlrImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20081217 version content to 20140102 version tool server.
+     */
+    public void up20081217To20140102() {
+	this.removeField(Pixlr.class, "runOffline");
+	this.removeField(Pixlr.class, "onlineInstructions");
+	this.removeField(Pixlr.class, "offlineInstructions");
+	this.removeField(Pixlr.class, "pixlrAttachments");
+    }
+}
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java,v
diff -u -r1.9 -r1.10
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	29 Jul 2013 23:11:55 -0000	1.9
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	17 Jan 2014 22:10:30 -0000	1.10
@@ -32,7 +32,6 @@
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.List;
-import java.util.Set;
 import java.util.SortedMap;
 
 import org.apache.commons.lang.StringUtils;
@@ -64,13 +63,11 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.pixlr.dao.IPixlrAttachmentDAO;
 import org.lamsfoundation.lams.tool.pixlr.dao.IPixlrConfigItemDAO;
 import org.lamsfoundation.lams.tool.pixlr.dao.IPixlrDAO;
 import org.lamsfoundation.lams.tool.pixlr.dao.IPixlrSessionDAO;
 import org.lamsfoundation.lams.tool.pixlr.dao.IPixlrUserDAO;
 import org.lamsfoundation.lams.tool.pixlr.model.Pixlr;
-import org.lamsfoundation.lams.tool.pixlr.model.PixlrAttachment;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrConfigItem;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrSession;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrUser;
@@ -103,16 +100,12 @@
 
     private IPixlrUserDAO pixlrUserDAO = null;
 
-    private IPixlrAttachmentDAO pixlrAttachmentDAO = null;
-
     private ILearnerService learnerService;
 
     private ILamsToolService toolService;
 
     private IToolContentHandler pixlrToolContentHandler = null;
 
-    private IRepositoryService repositoryService = null;
-
     private IAuditService auditService = null;
 
     private IExportToolContentService exportContentService;
@@ -208,7 +201,7 @@
 	    // create the fromContent using the default tool content
 	    fromContent = getDefaultContent();
 	}
-	Pixlr toContent = Pixlr.newInstance(fromContent, toContentId, pixlrToolContentHandler);
+	Pixlr toContent = Pixlr.newInstance(fromContent, toContentId);
 
 	try {
 	    toContent.setImageFileName(copyImage(toContent));
@@ -263,24 +256,6 @@
 
     }
 
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Pixlr pixlr = pixlrDAO.getByContentId(toolContentId);
-	if (pixlr == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	pixlr.setDefineLater(value);
-	pixlrDAO.saveOrUpdate(pixlr);
-    }
-
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Pixlr pixlr = pixlrDAO.getByContentId(toolContentId);
-	if (pixlr == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	pixlr.setRunOffline(value);
-	pixlrDAO.saveOrUpdate(pixlr);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	// TODO Auto-generated method stub
@@ -304,10 +279,7 @@
 	    throw new DataMissingException("Unable to find default content for the pixlr tool");
 	}
 
-	// set ResourceToolContentHandler as null to avoid copy file node in
-	// repository again.
-	pixlr = Pixlr.newInstance(pixlr, toolContentId, null);
-	pixlr.setToolContentHandler(null);
+	pixlr = Pixlr.newInstance(pixlr, toolContentId);
 	pixlr.setPixlrSessions(null);
 
 	// bundling the author image in export
@@ -335,13 +307,7 @@
 	    PixlrService.logger.error("Could not export pixlr image, image may be missing in export", e);
 	}
 
-	Set<PixlrAttachment> atts = pixlr.getPixlrAttachments();
-	for (PixlrAttachment att : atts) {
-	    att.setPixlr(null);
-	}
 	try {
-	    exportContentService.registerFileClassForExport(PixlrAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, pixlr, pixlrToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -357,9 +323,9 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(PixlrAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(PixlrImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, pixlrToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof Pixlr)) {
@@ -482,7 +448,7 @@
 	Pixlr defaultContent = getDefaultContent();
 	// create new pixlr using the newContentID
 	Pixlr newContent = new Pixlr();
-	newContent = Pixlr.newInstance(defaultContent, newContentID, pixlrToolContentHandler);
+	newContent = Pixlr.newInstance(defaultContent, newContentID);
 	pixlrDAO.saveOrUpdate(newContent);
 	return newContent;
     }
@@ -515,33 +481,6 @@
 	return pixlrUserDAO.getByUID(uid);
     }
 
-    public PixlrAttachment uploadFileToContent(Long toolContentId, FormFile file, String type) {
-	if (file == null || StringUtils.isEmpty(file.getFileName())) {
-	    throw new PixlrException("Could not find upload file: " + file);
-	}
-
-	NodeKey nodeKey = processFile(file, type);
-
-	PixlrAttachment attachment = new PixlrAttachment(nodeKey.getVersion(), type, file.getFileName(), nodeKey
-		.getUuid(), new Date());
-	return attachment;
-    }
-
-    public void deleteFromRepository(Long uuid, Long versionID) throws PixlrException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new PixlrException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type) {
-	pixlrDAO.deleteInstructionFile(contentID, uuid, versionID, type);
-
-    }
-
     public void saveOrUpdatePixlr(Pixlr pixlr) {
 	pixlrDAO.saveOrUpdate(pixlr);
     }
@@ -567,58 +506,11 @@
     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 = getPixlrToolContentHandler().uploadFile(file.getInputStream(), fileName, file.getContentType(),
-			type);
-	    } catch (InvalidParameterException e) {
-		throw new PixlrException("InvalidParameterException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (FileNotFoundException e) {
-		throw new PixlrException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-	    } catch (RepositoryCheckedException e) {
-		throw new PixlrException("RepositoryCheckedException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (IOException e) {
-		throw new PixlrException("IOException occured while trying to upload File" + e.getMessage());
-	    }
-	}
-	return node;
-    }
     
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
 
-    /**
-     * 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 PixlrException {
-	ICredentials credentials = new SimpleCredentials(PixlrToolContentHandler.repositoryUser,
-		PixlrToolContentHandler.repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials, PixlrToolContentHandler.repositoryWorkspaceName);
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new PixlrException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new PixlrException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new PixlrException("Login failed." + e.getMessage());
-	}
-    }
-
     public PixlrConfigItem getConfigItem(String key) {
 	return pixlrConfigItemDAO.getConfigItemByKey(key);
     }
@@ -643,9 +535,6 @@
 	pixlr.setInstructions(WebUtil.convertNewlines((String) importValues
 		.get(ToolContentImport102Manager.CONTENT_BODY)));
 	pixlr.setLockOnFinished(Boolean.TRUE);
-	pixlr.setOfflineInstructions(null);
-	pixlr.setOnlineInstructions(null);
-	pixlr.setRunOffline(Boolean.FALSE);
 	pixlr.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 	pixlr.setToolContentId(toolContentId);
 	pixlr.setUpdateDate(now);
@@ -676,14 +565,6 @@
     // =========================================================================================
     /* ********** Used by Spring to "inject" the linked objects ************* */
 
-    public IPixlrAttachmentDAO getPixlrAttachmentDAO() {
-	return pixlrAttachmentDAO;
-    }
-
-    public void setPixlrAttachmentDAO(IPixlrAttachmentDAO attachmentDAO) {
-	pixlrAttachmentDAO = attachmentDAO;
-    }
-
     public IPixlrDAO getPixlrDAO() {
 	return pixlrDAO;
     }
@@ -764,14 +645,6 @@
 	this.pixlrConfigItemDAO = pixlrConfigItemDAO;
     }
 
-    public IRepositoryService getRepositoryService() {
-	return repositoryService;
-    }
-
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getPixlrOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	8 Jan 2009 02:39:51 -0000	1.3
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	17 Jan 2014 22:10:31 -0000	1.4
@@ -51,7 +51,6 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.pixlr.model.Pixlr;
-import org.lamsfoundation.lams.tool.pixlr.model.PixlrAttachment;
 import org.lamsfoundation.lams.tool.pixlr.service.IPixlrService;
 import org.lamsfoundation.lams.tool.pixlr.service.PixlrServiceProxy;
 import org.lamsfoundation.lams.tool.pixlr.util.PixlrConstants;
@@ -86,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";
     
  
     /**
@@ -213,26 +207,6 @@
 	// update pixlr content using form inputs.
 	updatePixlr(pixlr, authForm, mode);
 
-	
-
-	// remove attachments marked for deletion.
-	Set<PixlrAttachment> attachments = pixlr.getPixlrAttachments();
-	if (attachments == null) {
-	    attachments = new HashSet<PixlrAttachment>();
-	}
-
-	for (PixlrAttachment 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
-	pixlr.setPixlrAttachments(attachments);
-
 	// set the update date
 	pixlr.setUpdateDate(new Date());
 
@@ -258,156 +232,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<PixlrAttachment> unsavedFiles;
-	List<PixlrAttachment> 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(PixlrConstants.ATTR_SESSION_MAP, map);
-	    this.saveErrors(request, errors);
-	    return mapping.findForward("success");
-	}
-
-	if (file.getFileName().length() != 0) {
-
-	    // upload file to repository
-	    PixlrAttachment newAtt = pixlrService.uploadFileToContent((Long) map
-		    .get(AuthoringAction.KEY_TOOL_CONTENT_ID), file, type);
-
-	    // Add attachment to unsavedFiles
-	    // check to see if file with same name exists
-	    PixlrAttachment currAtt;
-	    Iterator<PixlrAttachment> iter = savedFiles.iterator();
-	    while (iter.hasNext()) {
-		currAtt = (PixlrAttachment) 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(PixlrConstants.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<PixlrAttachment> fileList;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    fileList = getAttList(AuthoringAction.KEY_OFFLINE_FILES, map);
-	} else {
-	    fileList = getAttList(AuthoringAction.KEY_ONLINE_FILES, map);
-	}
-
-	Iterator<PixlrAttachment> iter = fileList.iterator();
-
-	while (iter.hasNext()) {
-	    PixlrAttachment att = (PixlrAttachment) 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(PixlrConstants.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<PixlrAttachment> 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<PixlrAttachment> iter = unsavedFiles.iterator();
-	while (iter.hasNext()) {
-	    PixlrAttachment att = (PixlrAttachment) iter.next();
-
-	    if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-		// delete from repository and list
-		pixlrService.deleteFromRepository(att.getFileUuid(), att.getFileVersionId());
-		iter.remove();
-		break;
-	    }
-	}
-
-	request.setAttribute(PixlrConstants.ATTR_SESSION_MAP, map);
-	request.setAttribute("unsavedChanges", new Boolean(true));
-
-	return mapping.findForward("success");
-    }
-
     /**
      * Updates Pixlr content using AuthoringForm inputs.
      * 
@@ -419,8 +245,6 @@
 	pixlr.setTitle(authForm.getTitle());
 	pixlr.setInstructions(authForm.getInstructions());
 	if (mode.isAuthor()) { // Teacher cannot modify following
-	    pixlr.setOfflineInstructions(authForm.getOnlineInstruction());
-	    pixlr.setOnlineInstructions(authForm.getOfflineInstruction());
 	    pixlr.setLockOnFinished(authForm.isLockOnFinished());
 	    pixlr.setReflectOnActivity(authForm.isReflectOnActivity());
 	    pixlr.setReflectInstructions(authForm.getReflectInstructions());
@@ -438,8 +262,6 @@
     private void updateAuthForm(AuthoringForm authForm, Pixlr pixlr) {
 	authForm.setTitle(pixlr.getTitle());
 	authForm.setInstructions(pixlr.getInstructions());
-	authForm.setOnlineInstruction(pixlr.getOnlineInstructions());
-	authForm.setOfflineInstruction(pixlr.getOfflineInstructions());
 	authForm.setLockOnFinished(pixlr.isLockOnFinished());
 	authForm.setReflectOnActivity(pixlr.isReflectOnActivity());
 	authForm.setExistingImageFileName(pixlr.getImageFileName());
@@ -467,24 +289,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<PixlrAttachment>());
-	map.put(AuthoringAction.KEY_OFFLINE_FILES, new LinkedList<PixlrAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, new LinkedList<PixlrAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, new LinkedList<PixlrAttachment>());
-	map.put(AuthoringAction.KEY_DELETED_FILES, new LinkedList<PixlrAttachment>());
 
-	Iterator<PixlrAttachment> iter = pixlr.getPixlrAttachments().iterator();
-	while (iter.hasNext()) {
-	    PixlrAttachment attachment = (PixlrAttachment) 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;
     }
 
@@ -507,19 +312,6 @@
     }
 
     /**
-     * Retrieves a List of attachments from the map using the key.
-     * 
-     * @param key
-     * @param map
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    private List<PixlrAttachment> getAttList(String key, SessionMap<String, Object> map) {
-	List<PixlrAttachment> list = (List<PixlrAttachment>) map.get(key);
-	return list;
-    }
-
-    /**
      * Retrieve the SessionMap from the HttpSession.
      * 
      * @param request
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java,v
diff -u -r1.6 -r1.7
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java	9 Apr 2013 12:46:29 -0000	1.6
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java	17 Jan 2014 22:10:31 -0000	1.7
@@ -81,7 +81,6 @@
  * @struts.action path="/learning" parameter="dispatch" scope="request"
  *                name="learningForm"
  * @struts.action-forward name="pixlr" 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="success" path="/pages/learning/success.jsp"
  * @struts.action-forward name="notebook" path="/pages/learning/notebook.jsp"
@@ -148,11 +147,6 @@
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
 		.getServletContext());
 
-	// check runOffline
-	if (pixlr.isRunOffline()) {
-	    return mapping.findForward("runOffline");
-	}
-
 	// get the user
 	PixlrUser pixlrUser;
 	if (mode.equals(ToolAccessMode.TEACHER)) {
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/servlets/ExportServlet.java,v
diff -u -r1.2 -r1.3
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/servlets/ExportServlet.java	6 Jan 2014 08:42:34 -0000	1.2
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/servlets/ExportServlet.java	17 Jan 2014 22:10:30 -0000	1.3
@@ -89,30 +89,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 (pixlrService == null) {
-		pixlrService = PixlrServiceProxy.getPixlrService(getServletContext());
-	    }
-
-	    Pixlr content = null;
-	    if (toolContentID != null) {
-		content = pixlrService.getPixlrByContentId(toolContentID);
-	    } else {
-		PixlrSession session = pixlrService.getSessionBySessionId(toolSessionID);
-		if (session != null)
-		    content = session.getPixlr();
-	    }
-	    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 PixlrException {
 
Index: lams_tool_pixlr/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/web/WEB-INF/tiles-defs.xml	30 Jul 2012 18:53:09 -0000	1.1
+++ lams_tool_pixlr/web/WEB-INF/tiles-defs.xml	17 Jan 2014 22:10:31 -0000	1.2
@@ -86,10 +86,6 @@
 	<definition name="tiles:/learning/main" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/pixlr.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_pixlr/web/includes/javascript/authoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/includes/javascript/authoring.js,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/web/includes/javascript/authoring.js	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/web/includes/javascript/authoring.js	17 Jan 2014 22:10:30 -0000	1.2
@@ -39,8 +39,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_pixlr/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/authoring/authoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	7 Jan 2009 22:37:48 -0000	1.1
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	17 Jan 2014 22:10:30 -0000	1.2
@@ -7,8 +7,7 @@
 	enctype="multipart/form-data">
 
 	<c:set var="formBean"
-		value="<%=request
-										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		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 +22,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>
 
@@ -40,9 +38,6 @@
 		<html:hidden property="existingImageFileName" />
 
 		<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">
@@ -59,8 +54,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 1.2 refers to a dead (removed) revision in file `lams_tool_pixlr/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_pixlr/web/pages/learning/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_pixlr/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_pixlr/web/pages/monitoring/monitoring.jsp	7 Jan 2009 22:37:48 -0000	1.1
+++ lams_tool_pixlr/web/pages/monitoring/monitoring.jsp	17 Jan 2014 22:10:31 -0000	1.2
@@ -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 = "${pixlrDTO.currentTab}";
@@ -17,9 +16,8 @@
 	<lams:help toolSignature="<%= PixlrConstants.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_sbmt/conf/middlegen/lams_tool_sbmt-prefs.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/middlegen/lams_tool_sbmt-prefs.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/conf/middlegen/lams_tool_sbmt-prefs.properties	30 Jul 2012 18:54:54 -0000	1.3
+++ lams_tool_sbmt/conf/middlegen/lams_tool_sbmt-prefs.properties	17 Jan 2014 22:12:24 -0000	1.4
@@ -53,8 +53,6 @@
 hibernate.tables.tl_lasbmt11_content.columns.reflect_instructions.java-type=java.lang.String
 hibernate.tables.tl_lasbmt11_content.columns.reflect_on_activity.java-name=reflectOnActivity
 hibernate.tables.tl_lasbmt11_content.columns.reflect_on_activity.java-type=java.lang.Boolean
-hibernate.tables.tl_lasbmt11_content.columns.run_offline.java-name=runOffline
-hibernate.tables.tl_lasbmt11_content.columns.run_offline.java-type=boolean
 hibernate.tables.tl_lasbmt11_content.columns.submission_deadline.java-name=submissionDeadline
 hibernate.tables.tl_lasbmt11_content.columns.submission_deadline.java-type=java.sql.Timestamp
 hibernate.tables.tl_lasbmt11_content.columns.title.columnspecialty=property
Fisheye: Tag 1.11 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java,v
diff -u -r1.22 -r1.23
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	12 Apr 2011 12:21:32 -0000	1.22
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	17 Jan 2014 22:12:23 -0000	1.23
@@ -42,397 +42,301 @@
  */
 public class SubmitFilesContent implements Serializable, Cloneable {
 
-	private static final long serialVersionUID = 9072799761861936838L;
+    private static final long serialVersionUID = 9072799761861936838L;
 
-	private static Logger log = Logger.getLogger(SubmitFilesContent.class);
+    private static Logger log = Logger.getLogger(SubmitFilesContent.class);
 
-	/** identifier field */
-	private Long contentID;
+    /** identifier field */
+    private Long contentID;
 
-	/** persistent field */
-	//basic tab fields
-	private String title;
+    /** persistent field */
+    // basic tab fields
+    private String title;
 
-	private String instruction;
+    private String instruction;
 
-	// advance tab fields
-	private boolean lockOnFinished;
+    // advance tab fields
+    private boolean lockOnFinished;
 
-	private boolean notifyLearnersOnMarkRelease;
+    private boolean notifyLearnersOnMarkRelease;
 
-	private boolean notifyTeachersOnFileSubmit;
+    private boolean notifyTeachersOnFileSubmit;
 
-	//instruction tab fields
-	private String offlineInstruction;
+    // system level fields
+    private boolean defineLater;
 
-	private String onlineInstruction;
+    private boolean contentInUse;
 
-	private Set instructionFiles;
+    private boolean limitUpload;
 
-	//system level fields
-	private boolean defineLater;
+    private int limitUploadNumber;
 
-	private boolean runOffline;
+    private boolean reflectOnActivity;
 
-	private boolean contentInUse;
+    private String reflectInstructions;
 
-	private boolean limitUpload;
+    private Date created;
 
-	private int limitUploadNumber;
+    private Date updated;
 
-	private boolean reflectOnActivity;
+    private Date submissionDeadline;
 
-	private String reflectInstructions;
+    private SubmitUser createdBy;
 
-	private Date created;
+    /** default constructor */
+    public SubmitFilesContent() {
+    }
 
-	private Date updated;
-	
-	private Date submissionDeadline;
+    /**
+     * Copy constructor to create a new SubmitFiles tool's content.
+     * 
+     * @param content
+     *            The original tool content
+     * @param newContentID
+     *            The new <code>SubmitFiles</code> contentID
+     * @param toolContentHandler
+     * @return SubmitFilesContent The new SubmitFilesContent object
+     */
+    public static SubmitFilesContent newInstance(SubmitFilesContent content, Long newContentID) {
+	SubmitFilesContent newContent = (SubmitFilesContent) content.clone();
+	newContent.setContentID(newContentID);
+	return newContent;
+    }
 
-	private SubmitUser createdBy;
+    /**
+     * @hibernate.id generator-class="assigned" type="java.lang.Long" column="content_id"
+     */
+    public Long getContentID() {
+	return contentID;
+    }
 
-	//temporary fields
-	private IToolContentHandler toolContentHandler;
+    public void setContentID(Long contentID) {
+	this.contentID = contentID;
+    }
 
-	/** default constructor */
-	public SubmitFilesContent() {
-	}
+    /**
+     * @hibernate.property column="title" length="64" not-null="true"
+     */
+    public String getTitle() {
+	return title;
+    }
 
-	/**
-	 * Copy constructor to create a new SubmitFiles tool's content.
-	 * 
-	 * @param content The original tool content
-	 * @param newContentID The new <code>SubmitFiles</code> contentID
-	 * @param toolContentHandler 
-	 * @return SubmitFilesContent The new SubmitFilesContent object
-	 */
-	public static SubmitFilesContent newInstance(SubmitFilesContent content, Long newContentID,
-			IToolContentHandler toolContentHandler) {
-		content.toolContentHandler = toolContentHandler;
-		SubmitFilesContent newContent = (SubmitFilesContent) content.clone();
-		newContent.setContentID(newContentID);
-		return newContent;
-	}
+    public void setTitle(String title) {
+	this.title = title;
+    }
 
-	/**
-	 * @hibernate.id generator-class="assigned" 
-	 * 				 type="java.lang.Long"
-	 *               column="content_id"
-	 */
-	public Long getContentID() {
-		return contentID;
-	}
+    /**
+     * @hibernate.property column="instruction" type="text"
+     */
+    public String getInstruction() {
+	return instruction;
+    }
 
-	public void setContentID(Long contentID) {
-		this.contentID = contentID;
-	}
+    public void setInstruction(String instructions) {
+	instruction = instructions;
+    }
 
-	/**
-	 * @hibernate.property column="title" length="64" not-null="true"
-	 */
-	public String getTitle() {
-		return title;
-	}
+    @Override
+    public String toString() {
+	return new ToStringBuilder(this).append("contentID", getContentID()).append("title", getTitle())
+		.append("instructions", getInstruction()).toString();
+    }
 
-	public void setTitle(String title) {
-		this.title = title;
+    @Override
+    public boolean equals(Object other) {
+	if (this == other) {
+	    return true;
 	}
-
-	/**
-	 * @hibernate.property column="instruction" type="text"
-	 */
-	public String getInstruction() {
-		return instruction;
+	if (!(other instanceof SubmitFilesContent)) {
+	    return false;
 	}
+	SubmitFilesContent castOther = (SubmitFilesContent) other;
+	return new EqualsBuilder().append(this.getContentID(), castOther.getContentID())
+		.append(this.getTitle(), castOther.getTitle())
+		.append(this.getInstruction(), castOther.getInstruction()).isEquals();
+    }
 
-	public void setInstruction(String instructions) {
-		instruction = instructions;
-	}
+    @Override
+    public int hashCode() {
+	return new HashCodeBuilder().append(getContentID()).append(getTitle()).append(getInstruction()).toHashCode();
+    }
 
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this).append("contentID", getContentID()).append("title", getTitle()).append("instructions",
-				getInstruction()).toString();
-	}
+    /**
+     * @hibernate.property column="define_later" length="1" not-null="true"
+     */
+    public boolean isDefineLater() {
+	return defineLater;
+    }
 
-	@Override
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof SubmitFilesContent)) {
-			return false;
-		}
-		SubmitFilesContent castOther = (SubmitFilesContent) other;
-		return new EqualsBuilder().append(this.getContentID(), castOther.getContentID()).append(this.getTitle(),
-				castOther.getTitle()).append(this.getInstruction(), castOther.getInstruction()).isEquals();
-	}
+    public void setDefineLater(boolean defineLater) {
+	this.defineLater = defineLater;
+    }
 
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(getContentID()).append(getTitle()).append(getInstruction()).toHashCode();
-	}
+    /**
+     * @hibernate.property column="content_in_use" length="1"
+     * @return Returns the contentInUse.
+     */
+    public boolean isContentInUse() {
+	return contentInUse;
+    }
 
-	/** 
-	 * @hibernate.property column="define_later" length="1"
-	 *  not-null="true"
-	 */
-	public boolean isDefineLater() {
-		return defineLater;
-	}
+    /**
+     * @param contentInUse
+     *            The contentInUse to set.
+     */
+    public void setContentInUse(boolean contentInUse) {
+	this.contentInUse = contentInUse;
+    }
 
-	public void setDefineLater(boolean defineLater) {
-		this.defineLater = defineLater;
-	}
+    /**
+     * 
+     * @hibernate.property column="lock_on_finished" length="1"
+     * @return Returns the lockOnFinished.
+     */
+    public boolean isLockOnFinished() {
+	return lockOnFinished;
+    }
 
-	/** 
-	 * @hibernate.property column="run_offline" length="1"
-	 * not-null="true"
-	 */
-	public boolean isRunOffline() {
-		return runOffline;
-	}
+    /**
+     * @param lockOnFinished
+     *            The lockOnFinished to set.
+     */
+    public void setLockOnFinished(boolean lockOnFinished) {
+	this.lockOnFinished = lockOnFinished;
+    }
 
-	public void setRunOffline(boolean runOffline) {
-		this.runOffline = runOffline;
+    @Override
+    public Object clone() {
+	Object obj = null;
+	try {
+	    obj = super.clone();
+	    // never clone key!
+	    ((SubmitFilesContent) obj).setContentID(null);
+	} catch (CloneNotSupportedException e) {
+	    SubmitFilesContent.log.error("When clone " + SubmitFilesContent.class + " failed");
 	}
 
-	/**
-	 * @hibernate.property column="offline_instruction" type="text"
-	 * @return Returns the offlineInstruction.
-	 */
-	public String getOfflineInstruction() {
-		return offlineInstruction;
-	}
+	return obj;
+    }
 
-	/**
-	 * @param offlineInstruction The offlineInstruction to set.
-	 */
-	public void setOfflineInstruction(String offlineInstruction) {
-		this.offlineInstruction = offlineInstruction;
-	}
+    /**
+     * @hibernate.property column="reflect_instructions"
+     * @return
+     */
+    public String getReflectInstructions() {
+	return reflectInstructions;
+    }
 
-	/**
-	 * @hibernate.property column="online_instruction" type="text"
-	 * @return Returns the onlineInstruction.
-	 */
-	public String getOnlineInstruction() {
-		return onlineInstruction;
-	}
+    public void setReflectInstructions(String reflectInstructions) {
+	this.reflectInstructions = reflectInstructions;
+    }
 
-	/**
-	 * @param onlineInstruction The onlineInstruction to set.
-	 */
-	public void setOnlineInstruction(String onlineInstruction) {
-		this.onlineInstruction = onlineInstruction;
-	}
+    /**
+     * @hibernate.property column="reflect_on_activity"
+     * @return
+     */
+    public boolean isReflectOnActivity() {
+	return reflectOnActivity;
+    }
 
-	/**
-	 * @hibernate.property column="content_in_use" length="1"
-	 * @return Returns the contentInUse.
-	 */
-	public boolean isContentInUse() {
-		return contentInUse;
-	}
+    public void setReflectOnActivity(boolean reflectOnActivity) {
+	this.reflectOnActivity = reflectOnActivity;
+    }
 
-	/**
-	 * @param contentInUse The contentInUse to set.
-	 */
-	public void setContentInUse(boolean contentInUse) {
-		this.contentInUse = contentInUse;
-	}
+    /**
+     * @hibernate.property column="limit_upload"
+     * @return
+     */
+    public boolean isLimitUpload() {
+	return limitUpload;
+    }
 
-	/**
-	 * @hibernate.set lazy="true" inverse="false" cascade="all"
-	 * @hibernate.collection-key column="content_id"
-	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.sbmt.InstructionFiles"
-	 * 
-	 * @return Returns the instructionFiles.
-	 */
-	public Set getInstructionFiles() {
-		return instructionFiles;
-	}
+    public void setLimitUpload(boolean limitUpload) {
+	this.limitUpload = limitUpload;
+    }
 
-	/**
-	 * @param instructionFiles The instructionFiles to set.
-	 */
-	public void setInstructionFiles(Set instructionFiles) {
-		this.instructionFiles = instructionFiles;
-	}
+    /**
+     * @hibernate.property column="limit_upload_number"
+     * @return
+     */
+    public int getLimitUploadNumber() {
+	return limitUploadNumber;
+    }
 
-	/**
-	 * 
-	 * @hibernate.property column="lock_on_finished" length="1"
-	 * @return Returns the lockOnFinished.
-	 */
-	public boolean isLockOnFinished() {
-		return lockOnFinished;
-	}
+    public void setLimitUploadNumber(int limitUploadNumber) {
+	this.limitUploadNumber = limitUploadNumber;
+    }
 
-	/**
-	 * @param lockOnFinished The lockOnFinished to set.
-	 */
-	public void setLockOnFinished(boolean lockOnFinished) {
-		this.lockOnFinished = lockOnFinished;
-	}
+    /**
+     * @hibernate.property column="created"
+     * @return
+     */
+    public Date getCreated() {
+	return created;
+    }
 
-	@Override
-	public Object clone() {
-		Object obj = null;
-		try {
-			obj = super.clone();
-			//never clone key!
-			((SubmitFilesContent) obj).setContentID(null);
-			//clone InstructionFiles object
-			if (instructionFiles != null) {
-				Iterator iter = instructionFiles.iterator();
-				Set set = new HashSet();
-				while (iter.hasNext()) {
-					InstructionFiles file = (InstructionFiles) iter.next();
-					InstructionFiles newFile = (InstructionFiles) file.clone();
-					set.add(newFile);
-				}
-				((SubmitFilesContent) obj).instructionFiles = set;
+    public void setCreated(Date created) {
+	this.created = created;
+    }
 
-				if (createdBy != null) {
-					((SubmitFilesContent) obj).setCreatedBy((SubmitUser) createdBy.clone());
-				}
-			}
-		}
-		catch (CloneNotSupportedException e) {
-			SubmitFilesContent.log.error("When clone " + SubmitFilesContent.class + " failed");
-		}
+    /**
+     * @hibernate.many-to-one column="created_by" cascade="none"
+     * 
+     * @return
+     */
+    public SubmitUser getCreatedBy() {
+	return createdBy;
+    }
 
-		return obj;
-	}
+    public void setCreatedBy(SubmitUser createdBy) {
+	this.createdBy = createdBy;
+    }
 
-	public IToolContentHandler getToolContentHandler() {
-		return toolContentHandler;
-	}
+    /**
+     * @hibernate.property column="updated"
+     * @return
+     */
+    public Date getUpdated() {
+	return updated;
+    }
 
-	public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-		this.toolContentHandler = toolContentHandler;
-	}
+    public void setUpdated(Date updated) {
+	this.updated = updated;
+    }
 
-	/**
-	 * @hibernate.property column="reflect_instructions"
-	 * @return
-	 */
-	public String getReflectInstructions() {
-		return reflectInstructions;
-	}
+    /**
+     * @hibernate.property column="submission_deadline"
+     * @return
+     */
+    public Date getSubmissionDeadline() {
+	return submissionDeadline;
+    }
 
-	public void setReflectInstructions(String reflectInstructions) {
-		this.reflectInstructions = reflectInstructions;
-	}
+    public void setSubmissionDeadline(Date submissionDeadline) {
+	this.submissionDeadline = submissionDeadline;
+    }
 
-	/**
-	 * @hibernate.property column="reflect_on_activity"
-	 * @return
-	 */
-	public boolean isReflectOnActivity() {
-		return reflectOnActivity;
-	}
+    /**
+     * @hibernate.property column="mark_release_notify"
+     * @return
+     */
+    public boolean isNotifyLearnersOnMarkRelease() {
+	return notifyLearnersOnMarkRelease;
+    }
 
-	public void setReflectOnActivity(boolean reflectOnActivity) {
-		this.reflectOnActivity = reflectOnActivity;
-	}
+    public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
+	this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
+    }
 
-	/**
-	 * @hibernate.property column="limit_upload"
-	 * @return
-	 */
-	public boolean isLimitUpload() {
-		return limitUpload;
-	}
+    /**
+     * @hibernate.property column="file_submit_notify"
+     * @return
+     */
+    public boolean isNotifyTeachersOnFileSubmit() {
+	return notifyTeachersOnFileSubmit;
+    }
 
-	public void setLimitUpload(boolean limitUpload) {
-		this.limitUpload = limitUpload;
-	}
-
-	/**
-	 * @hibernate.property column="limit_upload_number"
-	 * @return
-	 */
-	public int getLimitUploadNumber() {
-		return limitUploadNumber;
-	}
-
-	public void setLimitUploadNumber(int limitUploadNumber) {
-		this.limitUploadNumber = limitUploadNumber;
-	}
-
-	/**
-	 * @hibernate.property column="created"
-	 * @return
-	 */
-	public Date getCreated() {
-		return created;
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	/**
-	 * @hibernate.many-to-one  column="created_by" cascade="none"
-	 *  
-	 * @return
-	 */
-	public SubmitUser getCreatedBy() {
-		return createdBy;
-	}
-
-	public void setCreatedBy(SubmitUser createdBy) {
-		this.createdBy = createdBy;
-	}
-
-	/**
-	 * @hibernate.property column="updated"
-	 * @return
-	 */
-	public Date getUpdated() {
-		return updated;
-	}
-
-	public void setUpdated(Date updated) {
-		this.updated = updated;
-	}
-	
-	/**
-	 * @hibernate.property column="submission_deadline"
-	 * @return
-	 */
-	public Date getSubmissionDeadline() {
-		return submissionDeadline;
-	}
-
-	public void setSubmissionDeadline(Date submissionDeadline) {
-		this.submissionDeadline = submissionDeadline;
-	}
-
-	/**
-	 * @hibernate.property column="mark_release_notify"
-	 * @return
-	 */
-	public boolean isNotifyLearnersOnMarkRelease() {
-		return notifyLearnersOnMarkRelease;
-	}
-
-	public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
-		this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
-	}
-
-	/**
-	 * @hibernate.property column="file_submit_notify"
-	 * @return
-	 */
-	public boolean isNotifyTeachersOnFileSubmit() {
-		return notifyTeachersOnFileSubmit;
-	}
-
-	public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
-		this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
-	}
+    public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
+	this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
+    }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml,v
diff -u -r1.25 -r1.26
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	2 Aug 2009 20:15:20 -0000	1.25
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	17 Jan 2014 22:12:23 -0000	1.26
@@ -35,10 +35,6 @@
 	<bean id="submitUserDAO" class="org.lamsfoundation.lams.tool.sbmt.dao.hibernate.SubmitUserDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
-
-	<bean id="attachmentDAO" class="org.lamsfoundation.lams.tool.sbmt.dao.hibernate.AttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
 	
 	<bean id="submitFilesOutputFactory" class="org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesOutputFactory">  
     	<property name="toolMessageService"><ref bean="sbmtMessageService"/></property>  
@@ -50,7 +46,6 @@
 		<property name="submitFilesReportDAO"><ref bean="submitFilesReportDAO"/></property>
 		<property name="submissionDetailsDAO"><ref bean="submissionDetailsDAO"/></property>
 		<property name="submitUserDAO"><ref bean="submitUserDAO"/></property>
-		<property name="attachmentDAO"><ref bean="attachmentDAO"/></property>
 		<property name="sbmtToolContentHandler"><ref bean="sbmtToolContentHandler"/></property>
 		<property name="learnerService"><ref bean="learnerService"/></property>
 		<property name="toolService"><ref bean="lamsToolService"/></property>
@@ -89,9 +84,6 @@
                 <prop key="finish*">PROPAGATION_REQUIRED</prop>
                 
                 <prop key="uploadFileToSession">PROPAGATION_REQUIRED</prop>
-                
-                <prop key="setAsDefineLater">PROPAGATION_REQUIRED</prop>
-                <prop key="setAsRunOffline">PROPAGATION_REQUIRED</prop>
                 <prop key="createToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="leaveToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>				
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/IAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/AttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java,v
diff -u -r1.12 -r1.13
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	17 Sep 2006 06:27:54 -0000	1.12
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	17 Jan 2014 22:12:22 -0000	1.13
@@ -25,14 +25,9 @@
 
 package org.lamsfoundation.lams.tool.sbmt.dao.hibernate;
 
-import java.util.List;
-
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
-import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO;
-import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
  * @author Manpreet Minhas
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20140102.sql	17 Jan 2014 22:12:23 -0000	1.1
@@ -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_lasbmt11_content DROP COLUMN online_instruction;
+ALTER TABLE tl_lasbmt11_content DROP COLUMN offline_instruction;
+ALTER TABLE tl_lasbmt11_content DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lasbmt11_instruction_files;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lasbmt11';
+
+----------------------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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	3 Sep 2008 02:11:21 -0000	1.8
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	17 Jan 2014 22:12:22 -0000	1.9
@@ -35,7 +35,6 @@
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 
 /**
@@ -45,234 +44,154 @@
  */
 public class AuthoringDTO implements Serializable {
 
-	private static final long serialVersionUID = 3555065437595921234L;
+    private static final long serialVersionUID = 3555065437595921234L;
 
-	private Long contentID;
+    private Long contentID;
 
-	//basic tab
-	private String title;
+    // basic tab
+    private String title;
 
-	private String instruction;
+    private String instruction;
 
-	//instructions
-	private String onlineInstruction;
+    // advance
+    private boolean lockOnFinished;
 
-	private String offlineInstruction;
+    private boolean limitUpload;
 
-	private List onlineFiles;
+    private int limitUploadNumber;
 
-	private List offlineFiles;
+    private boolean reflectOnActivity;
 
-	//advance
-	private boolean lockOnFinished;
+    private String reflectInstructions;
 
-	private boolean limitUpload;
+    private boolean notifyLearnersOnMarkRelease;
 
-	private int limitUploadNumber;
+    private boolean notifyTeachersOnFileSubmit;
 
-	private boolean reflectOnActivity;
+    public AuthoringDTO() {
+    }
 
-	private String reflectInstructions;
-
-	private boolean notifyLearnersOnMarkRelease;
-
-	private boolean notifyTeachersOnFileSubmit;
-
-	public AuthoringDTO() {
+    public AuthoringDTO(SubmitFilesContent content) {
+	if (content == null) {
+	    return;
 	}
-
-	public AuthoringDTO(SubmitFilesContent content) {
-		if (content == null) {
-			return;
-		}
-		try {
-			PropertyUtils.copyProperties(this, content);
-		}
-		catch (IllegalAccessException e) {
-			throw new DTOException(e);
-		}
-		catch (InvocationTargetException e) {
-			throw new DTOException(e);
-		}
-		catch (NoSuchMethodException e) {
-			throw new DTOException(e);
-		}
-
-		onlineFiles = new ArrayList();
-		offlineFiles = new ArrayList();
-		Set fileSet = content.getInstructionFiles();
-		if (fileSet != null) {
-			Iterator iter = fileSet.iterator();
-			while (iter.hasNext()) {
-				InstructionFiles file = (InstructionFiles) iter.next();
-				if (StringUtils.equalsIgnoreCase(file.getType(), IToolContentHandler.TYPE_OFFLINE)) {
-					offlineFiles.add(file);
-				}
-				else {
-					onlineFiles.add(file);
-				}
-			}
-		}
-
+	try {
+	    PropertyUtils.copyProperties(this, content);
+	} catch (IllegalAccessException e) {
+	    throw new DTOException(e);
+	} catch (InvocationTargetException e) {
+	    throw new DTOException(e);
+	} catch (NoSuchMethodException e) {
+	    throw new DTOException(e);
 	}
 
-	/**
-	 * @return Returns the contentID.
-	 */
-	public Long getContentID() {
-		return contentID;
-	}
+    }
 
-	/**
-	 * @param contentID The contentID to set.
-	 */
-	public void setContentID(Long contentID) {
-		this.contentID = contentID;
-	}
+    /**
+     * @return Returns the contentID.
+     */
+    public Long getContentID() {
+	return contentID;
+    }
 
-	/**
-	 * @return Returns the instruction.
-	 */
-	public String getInstruction() {
-		return instruction;
-	}
+    /**
+     * @param contentID
+     *            The contentID to set.
+     */
+    public void setContentID(Long contentID) {
+	this.contentID = contentID;
+    }
 
-	/**
-	 * @param instruction The instruction to set.
-	 */
-	public void setInstruction(String instruction) {
-		this.instruction = instruction;
-	}
+    /**
+     * @return Returns the instruction.
+     */
+    public String getInstruction() {
+	return instruction;
+    }
 
-	/**
-	 * @return Returns the lockOnFinished.
-	 */
-	public boolean isLockOnFinished() {
-		return lockOnFinished;
-	}
+    /**
+     * @param instruction
+     *            The instruction to set.
+     */
+    public void setInstruction(String instruction) {
+	this.instruction = instruction;
+    }
 
-	/**
-	 * @param lockOnFinished The lockOnFinished to set.
-	 */
-	public void setLockOnFinished(boolean lockOnFinished) {
-		this.lockOnFinished = lockOnFinished;
-	}
+    /**
+     * @return Returns the lockOnFinished.
+     */
+    public boolean isLockOnFinished() {
+	return lockOnFinished;
+    }
 
-	/**
-	 * @return Returns the offlineFiles.
-	 */
-	public List getOfflineFiles() {
-		return offlineFiles;
-	}
+    /**
+     * @param lockOnFinished
+     *            The lockOnFinished to set.
+     */
+    public void setLockOnFinished(boolean lockOnFinished) {
+	this.lockOnFinished = lockOnFinished;
+    }
 
-	/**
-	 * @param offlineFiles The offlineFiles to set.
-	 */
-	public void setOfflineFiles(List offlineFiles) {
-		this.offlineFiles = offlineFiles;
-	}
+    /**
+     * @return Returns the title.
+     */
+    public String getTitle() {
+	return title;
+    }
 
-	/**
-	 * @return Returns the offlineInstruction.
-	 */
-	public String getOfflineInstruction() {
-		return offlineInstruction;
-	}
+    /**
+     * @param title
+     *            The title to set.
+     */
+    public void setTitle(String title) {
+	this.title = title;
+    }
 
-	/**
-	 * @param offlineInstruction The offlineInstruction to set.
-	 */
-	public void setOfflineInstruction(String offlineInstruction) {
-		this.offlineInstruction = offlineInstruction;
-	}
+    public boolean isLimitUpload() {
+	return limitUpload;
+    }
 
-	/**
-	 * @return Returns the onlineFiles.
-	 */
-	public List getOnlineFiles() {
-		return onlineFiles;
-	}
+    public void setLimitUpload(boolean limitUpload) {
+	this.limitUpload = limitUpload;
+    }
 
-	/**
-	 * @param onlineFiles The onlineFiles to set.
-	 */
-	public void setOnlineFiles(List onlineFiles) {
-		this.onlineFiles = onlineFiles;
-	}
+    public int getLimitUploadNumber() {
+	return limitUploadNumber;
+    }
 
-	/**
-	 * @return Returns the onlineInstruction.
-	 */
-	public String getOnlineInstruction() {
-		return onlineInstruction;
-	}
+    public void setLimitUploadNumber(int limitUploadNumber) {
+	this.limitUploadNumber = limitUploadNumber;
+    }
 
-	/**
-	 * @param onlineInstruction The onlineInstruction to set.
-	 */
-	public void setOnlineInstruction(String onlineInstruction) {
-		this.onlineInstruction = onlineInstruction;
-	}
+    public boolean isReflectOnActivity() {
+	return reflectOnActivity;
+    }
 
-	/**
-	 * @return Returns the title.
-	 */
-	public String getTitle() {
-		return title;
-	}
+    public void setReflectOnActivity(boolean reflectOnActivity) {
+	this.reflectOnActivity = reflectOnActivity;
+    }
 
-	/**
-	 * @param title The title to set.
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
+    public String getReflectInstructions() {
+	return reflectInstructions;
+    }
 
-	public boolean isLimitUpload() {
-		return limitUpload;
-	}
+    public void setReflectInstructions(String reflectInstructions) {
+	this.reflectInstructions = reflectInstructions;
+    }
 
-	public void setLimitUpload(boolean limitUpload) {
-		this.limitUpload = limitUpload;
-	}
+    public boolean isNotifyLearnersOnMarkRelease() {
+	return notifyLearnersOnMarkRelease;
+    }
 
-	public int getLimitUploadNumber() {
-		return limitUploadNumber;
-	}
+    public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
+	this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
+    }
 
-	public void setLimitUploadNumber(int limitUploadNumber) {
-		this.limitUploadNumber = limitUploadNumber;
-	}
+    public boolean isNotifyTeachersOnFileSubmit() {
+	return notifyTeachersOnFileSubmit;
+    }
 
-	public boolean isReflectOnActivity() {
-		return reflectOnActivity;
-	}
-
-	public void setReflectOnActivity(boolean reflectOnActivity) {
-		this.reflectOnActivity = reflectOnActivity;
-	}
-
-	public String getReflectInstructions() {
-		return reflectInstructions;
-	}
-
-	public void setReflectInstructions(String reflectInstructions) {
-		this.reflectInstructions = reflectInstructions;
-	}
-
-	public boolean isNotifyLearnersOnMarkRelease() {
-		return notifyLearnersOnMarkRelease;
-	}
-
-	public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
-		this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
-	}
-
-	public boolean isNotifyTeachersOnFileSubmit() {
-		return notifyTeachersOnFileSubmit;
-	}
-
-	public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
-		this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
-	}
+    public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
+	this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
+    }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java	3 Sep 2008 02:11:21 -0000	1.6
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java	17 Jan 2014 22:12:22 -0000	1.7
@@ -12,255 +12,177 @@
 import org.apache.struts.upload.FormFile;
 import org.apache.struts.validator.ValidatorForm;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 
 /**
  * 
  * @author Dapeng.Ni
- *	@struts.form name="SbmtAuthoringForm"
+ * @struts.form name="SbmtAuthoringForm"
  */
 public class AuthoringForm extends ValidatorForm {
 
-	private Long toolContentID;
+    private Long toolContentID;
 
-	private String contentFolderID;
+    private String contentFolderID;
 
-	//control fields
-	private String sessionMapID;
+    // control fields
+    private String sessionMapID;
 
-	private String currentTab;
+    private String currentTab;
 
-	//basic input fields
-	private String title;
+    // basic input fields
+    private String title;
 
-	private String instructions;
+    private String instructions;
 
-	private String offlineInstruction;
+    private boolean lockOnFinished;
 
-	private String onlineInstruction;
+    // file and display fields
 
-	private boolean lockOnFinished;
+    private boolean limitUpload;
 
-	//file and display fields
-	private FormFile offlineFile;
+    private int limitUploadNumber;
 
-	private FormFile onlineFile;
+    private boolean reflectOnActivity;
 
-	private List onlineFileList;
+    private String reflectInstructions;
 
-	private List offlineFileList;
+    private boolean notifyLearnersOnMarkRelease;
 
-	private boolean limitUpload;
+    private boolean notifyTeachersOnFileSubmit;
 
-	private int limitUploadNumber;
+    @Override
+    public void reset(ActionMapping mapping, HttpServletRequest request) {
+	lockOnFinished = false;
+	limitUpload = false;
+	reflectOnActivity = false;
 
-	private boolean reflectOnActivity;
+    }
 
-	private String reflectInstructions;
-
-	private boolean notifyLearnersOnMarkRelease;
-
-	private boolean notifyTeachersOnFileSubmit;
-
-	@Override
-	public void reset(ActionMapping mapping, HttpServletRequest request) {
-		lockOnFinished = false;
-		limitUpload = false;
-		reflectOnActivity = false;
-
+    public void initContentValue(SubmitFilesContent content) {
+	if (content == null) {
+	    return;
 	}
 
-	public void initContentValue(SubmitFilesContent content) {
-		if (content == null) {
-			return;
-		}
+	// copy attribute
+	toolContentID = content.getContentID();
+	title = content.getTitle();
+	instructions = content.getInstruction();
+	lockOnFinished = content.isLockOnFinished();
 
-		//copy attribute
-		toolContentID = content.getContentID();
-		title = content.getTitle();
-		instructions = content.getInstruction();
-		offlineInstruction = content.getOfflineInstruction();
-		onlineInstruction = content.getOnlineInstruction();
-		lockOnFinished = content.isLockOnFinished();
+	limitUpload = content.isLimitUpload();
+	limitUploadNumber = content.getLimitUploadNumber();
 
-		limitUpload = content.isLimitUpload();
-		limitUploadNumber = content.getLimitUploadNumber();
+	reflectOnActivity = content.isReflectOnActivity();
+	reflectInstructions = content.getReflectInstructions();
+	setNotifyLearnersOnMarkRelease(content.isNotifyLearnersOnMarkRelease());
+	setNotifyTeachersOnFileSubmit(content.isNotifyTeachersOnFileSubmit());
+    }
 
-		reflectOnActivity = content.isReflectOnActivity();
-		reflectInstructions = content.getReflectInstructions();
+    // **************************************************
+    // Get / Set method
+    // **************************************************
+    public String getCurrentTab() {
+	return currentTab;
+    }
 
-		onlineFileList = new ArrayList();
-		offlineFileList = new ArrayList();
-		Set fileSet = content.getInstructionFiles();
-		if (fileSet != null) {
-			Iterator iter = fileSet.iterator();
-			while (iter.hasNext()) {
-				InstructionFiles file = (InstructionFiles) iter.next();
-				if (StringUtils.equalsIgnoreCase(file.getType(), IToolContentHandler.TYPE_OFFLINE)) {
-					offlineFileList.add(file);
-				}
-				else {
-					onlineFileList.add(file);
-				}
-			}
-		}
-		setNotifyLearnersOnMarkRelease(content.isNotifyLearnersOnMarkRelease());
-		setNotifyTeachersOnFileSubmit(content.isNotifyTeachersOnFileSubmit());
-	}
+    public void setCurrentTab(String currentTab) {
+	this.currentTab = currentTab;
+    }
 
-	//**************************************************
-	// Get / Set method
-	//**************************************************
-	public String getCurrentTab() {
-		return currentTab;
-	}
+    public Long getToolContentID() {
+	return toolContentID;
+    }
 
-	public void setCurrentTab(String currentTab) {
-		this.currentTab = currentTab;
-	}
+    public void setToolContentID(Long toolContentID) {
+	this.toolContentID = toolContentID;
+    }
 
-	public FormFile getOfflineFile() {
-		return offlineFile;
-	}
+    public String getSessionMapID() {
+	return sessionMapID;
+    }
 
-	public void setOfflineFile(FormFile offlineFile) {
-		this.offlineFile = offlineFile;
-	}
+    public void setSessionMapID(String sessionMapID) {
+	this.sessionMapID = sessionMapID;
+    }
 
-	public List getOfflineFileList() {
-		return offlineFileList;
-	}
+    public String getInstructions() {
+	return instructions;
+    }
 
-	public void setOfflineFileList(List offlineFileList) {
-		this.offlineFileList = offlineFileList;
-	}
+    public void setInstructions(String instructions) {
+	this.instructions = instructions;
+    }
 
-	public FormFile getOnlineFile() {
-		return onlineFile;
-	}
+    public boolean isLockOnFinished() {
+	return lockOnFinished;
+    }
 
-	public void setOnlineFile(FormFile onlineFile) {
-		this.onlineFile = onlineFile;
-	}
+    public void setLockOnFinished(boolean lockOnFinished) {
+	this.lockOnFinished = lockOnFinished;
+    }
 
-	public List getOnlineFileList() {
-		return onlineFileList;
-	}
+    public String getTitle() {
+	return title;
+    }
 
-	public void setOnlineFileList(List onlineFileList) {
-		this.onlineFileList = onlineFileList;
-	}
+    public void setTitle(String title) {
+	this.title = title;
+    }
 
-	public Long getToolContentID() {
-		return toolContentID;
-	}
+    public String getReflectInstructions() {
+	return reflectInstructions;
+    }
 
-	public void setToolContentID(Long toolContentID) {
-		this.toolContentID = toolContentID;
-	}
+    public void setReflectInstructions(String reflectInstructions) {
+	this.reflectInstructions = reflectInstructions;
+    }
 
-	public String getSessionMapID() {
-		return sessionMapID;
-	}
+    public boolean isReflectOnActivity() {
+	return reflectOnActivity;
+    }
 
-	public void setSessionMapID(String sessionMapID) {
-		this.sessionMapID = sessionMapID;
-	}
+    public void setReflectOnActivity(boolean reflectOnActivity) {
+	this.reflectOnActivity = reflectOnActivity;
+    }
 
-	public String getInstructions() {
-		return instructions;
-	}
+    public String getContentFolderID() {
+	return contentFolderID;
+    }
 
-	public void setInstructions(String instructions) {
-		this.instructions = instructions;
-	}
+    public void setContentFolderID(String contentFolderID) {
+	this.contentFolderID = contentFolderID;
+    }
 
-	public boolean isLockOnFinished() {
-		return lockOnFinished;
-	}
+    public boolean isLimitUpload() {
+	return limitUpload;
+    }
 
-	public void setLockOnFinished(boolean lockOnFinished) {
-		this.lockOnFinished = lockOnFinished;
-	}
+    public void setLimitUpload(boolean limitUpload) {
+	this.limitUpload = limitUpload;
+    }
 
-	public String getOfflineInstruction() {
-		return offlineInstruction;
-	}
+    public int getLimitUploadNumber() {
+	return limitUploadNumber;
+    }
 
-	public void setOfflineInstruction(String offlineInstruction) {
-		this.offlineInstruction = offlineInstruction;
-	}
+    public void setLimitUploadNumber(int limitUploadNumber) {
+	this.limitUploadNumber = limitUploadNumber;
+    }
 
-	public String getOnlineInstruction() {
-		return onlineInstruction;
-	}
+    public boolean isNotifyLearnersOnMarkRelease() {
+	return notifyLearnersOnMarkRelease;
+    }
 
-	public void setOnlineInstruction(String onlineInstruction) {
-		this.onlineInstruction = onlineInstruction;
-	}
+    public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
+	this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
+    }
 
-	public String getTitle() {
-		return title;
-	}
+    public boolean isNotifyTeachersOnFileSubmit() {
+	return notifyTeachersOnFileSubmit;
+    }
 
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getReflectInstructions() {
-		return reflectInstructions;
-	}
-
-	public void setReflectInstructions(String reflectInstructions) {
-		this.reflectInstructions = reflectInstructions;
-	}
-
-	public boolean isReflectOnActivity() {
-		return reflectOnActivity;
-	}
-
-	public void setReflectOnActivity(boolean reflectOnActivity) {
-		this.reflectOnActivity = reflectOnActivity;
-	}
-
-	public String getContentFolderID() {
-		return contentFolderID;
-	}
-
-	public void setContentFolderID(String contentFolderID) {
-		this.contentFolderID = contentFolderID;
-	}
-
-	public boolean isLimitUpload() {
-		return limitUpload;
-	}
-
-	public void setLimitUpload(boolean limitUpload) {
-		this.limitUpload = limitUpload;
-	}
-
-	public int getLimitUploadNumber() {
-		return limitUploadNumber;
-	}
-
-	public void setLimitUploadNumber(int limitUploadNumber) {
-		this.limitUploadNumber = limitUploadNumber;
-	}
-
-	public boolean isNotifyLearnersOnMarkRelease() {
-		return notifyLearnersOnMarkRelease;
-	}
-
-	public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
-		this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
-	}
-
-	public boolean isNotifyTeachersOnFileSubmit() {
-		return notifyTeachersOnFileSubmit;
-	}
-
-	public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
-		this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
-	}
+    public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
+	this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
+    }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java,v
diff -u -r1.32 -r1.33
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	10 Feb 2011 23:13:36 -0000	1.32
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	17 Jan 2014 22:12:23 -0000	1.33
@@ -25,7 +25,6 @@
 
 package org.lamsfoundation.lams.tool.sbmt.service;
 
-import java.io.InputStream;
 import java.util.List;
 import java.util.Locale;
 import java.util.SortedMap;
@@ -36,7 +35,6 @@
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
-import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
@@ -93,18 +91,6 @@
 	    throws SubmitFilesException;
 
     /**
-     * Upload file to repository and persist relative attributes into database.
-     * 
-     * @param contentID
-     * @param uploadFile
-     * @param fileType
-     * @return If successs, return an instance of <code>InstructionFile</code>. Otherwise, return null.
-     * @throws SubmitFilesException
-     */
-    public InstructionFiles uploadFileToContent(Long contentID, FormFile uploadFile, String fileType)
-	    throws SubmitFilesException;
-
-    /**
      * This method returns a list of files that were uploaded by the given
      * <code>User<code> for given <code>contentID</code>.
      * 
@@ -239,13 +225,6 @@
      */
     public void updateEntry(NotebookEntry notebookEntry);
 
-    /**
-     * Delete instruction file by UID
-     * 
-     * @param uid
-     */
-    public void deleteInstructionFile(Long uid);
-
     public List<SubmitFilesSession> getSessionsByContentID(Long toolContentID);
 
     // *************************************************************
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesImportContentVersionFilter.java	17 Jan 2014 22:12:23 -0000	1.1
@@ -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: SubmitFilesImportContentVersionFilter.java,v 1.1 2014/01/17 22:12:23 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.sbmt.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
+
+/**
+ * Import filter class for different version of SubmitFiles content.
+ */
+public class SubmitFilesImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20110325 version content to 20140102 version tool server.
+     */
+    public void up20110325To20140102() {
+	this.removeField(SubmitFilesContent.class, "runOffline");
+	this.removeField(SubmitFilesContent.class, "onlineInstruction");
+	this.removeField(SubmitFilesContent.class, "offlineInstruction");
+	this.removeField(SubmitFilesContent.class, "instructionFiles");
+    }
+}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.87 -r1.88
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	29 Jul 2013 23:11:00 -0000	1.87
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	17 Jan 2014 22:12:23 -0000	1.88
@@ -77,13 +77,11 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
-import org.lamsfoundation.lams.tool.sbmt.dao.IAttachmentDAO;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO;
@@ -121,8 +119,6 @@
 
     private ISubmitUserDAO submitUserDAO;
 
-    private IAttachmentDAO attachmentDAO;
-
     private IToolContentHandler sbmtToolContentHandler;
 
     private ILamsToolService toolService;
@@ -199,49 +195,12 @@
 	if (fromContent == null) {
 	    fromContent = getDefaultSubmit();
 	}
-	SubmitFilesContent toContent = SubmitFilesContent.newInstance(fromContent, toContentId, sbmtToolContentHandler);
+	SubmitFilesContent toContent = SubmitFilesContent.newInstance(fromContent, toContentId);
 
 	submitFilesContentDAO.saveOrUpdate(toContent);
     }
 
     /**
-     * @see org.lamsfoundation.lams.tool.ToolContentManager#setAsRunOffline(java.lang.Long)
-     */
-    public void setAsRunOffline(Long toolContentId, boolean value) {
-	// pre-condition validation
-	if (toolContentId == null) {
-	    throw new SubmitFilesException("Fail to set tool content to run offline - "
-		    + " based on null toolContentId");
-	}
-	
-	SubmitFilesContent content = getSubmitFilesContent(toolContentId);
-	if (content == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	content.setRunOffline(value);
-	submitFilesContentDAO.saveOrUpdate(content);
-    }
-
-    /**
-     * @see org.lamsfoundation.lams.tool.ToolContentManager#setAsDefineLater(java.lang.Long)
-     */
-    public void setAsDefineLater(Long toolContentId, boolean value) {
-	// pre-condition validation
-	if (toolContentId == null) {
-	    throw new SubmitFilesException("Fail to set tool content to define later - "
-		    + " based on null toolContentId");
-	}
-	
-	SubmitFilesContent content = getSubmitFilesContent(toolContentId);
-	if (content == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	content.setDefineLater(value);
-	submitFilesContentDAO.saveOrUpdate(content);
-
-    }
-
-    /**
      * @throws SessionDataExistsException
      * 
      * @see org.lamsfoundation.lams.tool.ToolContentManager#removeToolContent(java.lang.Long)
@@ -275,7 +234,6 @@
      * @throws ExportToolContentException
      */
     public void exportToolContent(Long toolContentId, String toPath) throws ToolException, DataMissingException {
-	exportContentService.registerFileClassForExport(InstructionFiles.class.getName(), "uuID", "versionID");
 	SubmitFilesContent toolContentObj = submitFilesContentDAO.getContentByID(toolContentId);
 	if (toolContentObj == null) {
 	    toolContentObj = getDefaultSubmit();
@@ -285,8 +243,7 @@
 	}
 
 	// set toolContentHandler as null to avoid duplicate file node in repository.
-	toolContentObj = SubmitFilesContent.newInstance(toolContentObj, toolContentId, null);
-	toolContentObj.setToolContentHandler(null);
+	toolContentObj = SubmitFilesContent.newInstance(toolContentObj, toolContentId);
 	try {
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, sbmtToolContentHandler, toPath);
 	} catch (ExportToolContentException e) {
@@ -298,9 +255,9 @@
 	    String toVersion) throws ToolException {
 
 	try {
-	    exportContentService.registerFileClassForImport(InstructionFiles.class.getName(), "uuID", "versionID",
-		    "name", "type", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(SubmitFilesImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, sbmtToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof SubmitFilesContent)) {
@@ -438,10 +395,6 @@
 	}
     }
 
-    public void deleteInstructionFile(Long uid) {
-	attachmentDAO.deleteById(InstructionFiles.class, uid);
-    }
-
     /*
      * (non-Javadoc)
      * 
@@ -584,28 +537,6 @@
     /**
      * (non-Javadoc)
      * 
-     * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToContent(Long,FormFile )
-     */
-    public InstructionFiles uploadFileToContent(Long contentID, FormFile uploadFile, String fileType)
-	    throws SubmitFilesException {
-	if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
-	    throw new SubmitFilesException("Could not find upload file: " + uploadFile);
-	}
-
-	NodeKey nodeKey = processFile(uploadFile, fileType);
-
-	InstructionFiles file = new InstructionFiles();
-	file.setType(fileType);
-	file.setUuID(nodeKey.getUuid());
-	file.setVersionID(nodeKey.getVersion());
-	file.setName(uploadFile.getFileName());
-
-	return file;
-    }
-
-    /**
-     * (non-Javadoc)
-     * 
      * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToSession(Long,FormFile,String,Long )
      */
     public void uploadFileToSession(Long sessionID, FormFile uploadFile, String fileDescription, Integer userID)
@@ -620,7 +551,7 @@
 	    throw new SubmitFilesException("No such session with a sessionID of: " + sessionID + " found.");
 	}
 
-	NodeKey nodeKey = processFile(uploadFile, IToolContentHandler.TYPE_ONLINE);
+	NodeKey nodeKey = processFile(uploadFile);
 
 	SubmissionDetails details = new SubmissionDetails();
 	details.setFileDescription(fileDescription);
@@ -652,13 +583,12 @@
      * @throws RepositoryCheckedException
      * @throws InvalidParameterException
      */
-    private NodeKey processFile(FormFile file, String fileType) {
+    private NodeKey processFile(FormFile file) {
 	NodeKey node = null;
 	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
 	    String fileName = file.getFileName();
 	    try {
-		node = getSbmtToolContentHandler().uploadFile(file.getInputStream(), fileName, file.getContentType(),
-			fileType);
+		node = getSbmtToolContentHandler().uploadFile(file.getInputStream(), fileName, file.getContentType());
 	    } catch (InvalidParameterException e) {
 		throw new SubmitFilesException("FileNotFoundException occured while trying to upload File"
 			+ e.getMessage());
@@ -768,7 +698,7 @@
 		}
 
 		// Add the new file
-		NodeKey nodeKey = this.processFile(markFile, IToolContentHandler.TYPE_ONLINE);
+		NodeKey nodeKey = this.processFile(markFile);
 		// NodeKey nodeKey = toolContentHandler.uploadFile(marksFileInputStream, marksFileName, null,
 		// IToolContentHandler.TYPE_ONLINE);
 
@@ -940,7 +870,7 @@
 
 	// save default content by given ID.
 	SubmitFilesContent content = new SubmitFilesContent();
-	content = SubmitFilesContent.newInstance(defaultContent, contentID, sbmtToolContentHandler);
+	content = SubmitFilesContent.newInstance(defaultContent, contentID);
 	content.setContentID(contentID);
 
 	return content;
@@ -985,9 +915,6 @@
 	toolContentObj.setDefineLater(Boolean.FALSE);
 	toolContentObj.setInstruction(WebUtil.convertNewlines((String) importValues
 		.get(ToolContentImport102Manager.CONTENT_BODY)));
-	toolContentObj.setOfflineInstruction(null);
-	toolContentObj.setOnlineInstruction(null);
-	toolContentObj.setRunOffline(Boolean.FALSE);
 	toolContentObj.setUpdated(now);
 	// 1.0.2 doesn't allow users to go back after completion, which is the equivalent of lock on finish.
 	toolContentObj.setLockOnFinished(Boolean.TRUE);
@@ -1174,10 +1101,6 @@
 	this.coreNotebookService = coreNotebookService;
     }
 
-    public void setAttachmentDAO(IAttachmentDAO attachmentDAO) {
-	this.attachmentDAO = attachmentDAO;
-    }
-
     public void setUserManagementService(IUserManagementService userManagementService) {
 	this.userManagementService = userManagementService;
     }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java,v
diff -u -r1.26 -r1.27
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	12 Apr 2011 12:21:32 -0000	1.26
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	17 Jan 2014 22:12:23 -0000	1.27
@@ -34,14 +34,9 @@
     public static final String AUTHORING_DTO = "authoring";
 
     public static final String TOOL_CONTENT_HANDLER_NAME = "sbmtToolContentHandler";
-    // public static final String TOOL_SESSION_ID = "toolSessionID";
-    // public static final String TOOL_CONTENT_ID = "toolContentID";
+    
     public static final String USER_ID = "userID";
 
-    public static final String ATTACHMENT_LIST = "attachmentList";
-
-    public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
-
     public static final String PAGE_EDITABLE = "isPageEditable";
 
     public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
@@ -80,8 +75,6 @@
 
     public static final String EVENT_NAME_NOTIFY_TEACHERS_ON_FILE_SUBMIT = "notify_teachers_on_file_submit";
 	
-    public static final String ATTR_RUN_OFFLINE = "runOffline";
-	
     public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
 	
     public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v
diff -u -r1.40 -r1.41
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	3 Sep 2008 02:11:21 -0000	1.40
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	17 Jan 2014 22:12:23 -0000	1.41
@@ -48,7 +48,6 @@
 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.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
 import org.lamsfoundation.lams.tool.sbmt.form.AuthoringForm;
@@ -66,422 +65,208 @@
  * @author Manpreet Minhas
  * @author Steve Ni
  * 
- * @struts.action path="/authoring" 
- * 				  name="SbmtAuthoringForm" 
- * 				  parameter="dispatch"
- *                input="/authoring/authoring.jsp" 
- *                scope="request" 
- *                validate="true"
+ * @struts.action path="/authoring" name="SbmtAuthoringForm" parameter="dispatch" input="/authoring/authoring.jsp"
+ *                scope="request" validate="true"
  * 
  * @struts.action-forward name="success" path="/authoring/authoring.jsp"
  * @struts.action-forward name="instructionFileList" path="/authoring/parts/instructionfilelist.jsp"
  */
 public class AuthoringAction extends LamsDispatchAction {
-	private Logger log = Logger.getLogger(AuthoringAction.class);
+    private Logger log = Logger.getLogger(AuthoringAction.class);
 
-	public ISubmitFilesService submitFilesService;
+    public ISubmitFilesService submitFilesService;
 
-	/**
-	 * This page will display initial submit tool content. Or just a blank page if the toolContentID does not
-	 * exist before.
-	 *  
-	 * <BR>
-	 * Define later will use this method to initial page as well. 
-	 * @see org.apache.struts.actions.DispatchAction#unspecified(org.apache.struts.action.ActionMapping,
-	 *      org.apache.struts.action.ActionForm,
-	 *      javax.servlet.http.HttpServletRequest,
-	 *      javax.servlet.http.HttpServletResponse)
-	 */
-	@Override
-	protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
+    /**
+     * This page will display initial submit tool content. Or just a blank page if the toolContentID does not exist
+     * before.
+     * 
+     * <BR>
+     * Define later will use this method to initial page as well.
+     * 
+     * @see org.apache.struts.actions.DispatchAction#unspecified(org.apache.struts.action.ActionMapping,
+     *      org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest,
+     *      javax.servlet.http.HttpServletResponse)
+     */
+    @Override
+    protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
 
-		ToolAccessMode mode = null;
-		try {
-			mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
-		}
-		catch (Exception e) {
-		}
-		//when first time open flash icon on authoring page: mode will be null 
-		if (mode == null) {
-			mode = ToolAccessMode.AUTHOR;
-		}
-
-		SessionMap sessionMap = new SessionMap();
-		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-
-		Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		//get back the upload file list and display them on page
-		submitFilesService = getService();
-
-		SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID);
-
-		if (mode.isTeacher()) {
-
-			persistContent.setDefineLater(true);
-			submitFilesService.saveOrUpdateContent(persistContent);
-
-		}
-
-		//if this content does not exist(empty without id), create a content by default content record.
-		if (persistContent == null) {
-			persistContent = submitFilesService.createDefaultContent(contentID);
-		}
-
-		//initialize attachmentList
-		List attachmentList = getAttachmentList(sessionMap);
-		attachmentList.clear();
-		attachmentList.addAll(persistContent.getInstructionFiles());
-		List delAttachmentList = getDeletedAttachmentList(sessionMap);
-		delAttachmentList.clear();
-
-		//set back STRUTS component value
-		AuthoringForm authForm = (AuthoringForm) form;
-		authForm.initContentValue(persistContent);
-		//session map
-		authForm.setSessionMapID(sessionMap.getSessionID());
-		//current tab
-		authForm.setCurrentTab(request.getParameter("currentTab"));
-		authForm.setContentFolderID(contentFolderID);
-
-		return mapping.findForward("success");
+	ToolAccessMode mode = null;
+	try {
+	    mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
+	} catch (Exception e) {
 	}
+	// when first time open flash icon on authoring page: mode will be null
+	if (mode == null) {
+	    mode = ToolAccessMode.AUTHOR;
+	}
 
-	/**
-	 * Update all content for submit tool except online/offline instruction files list. 
-	 *  
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws NoSuchMethodException 
-	 * @throws InvocationTargetException 
-	 * @throws Exception 
-	 */
-	public ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
+	SessionMap sessionMap = new SessionMap();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 
-		AuthoringForm authForm = (AuthoringForm) form;
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID());
+	Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	// get back the upload file list and display them on page
+	submitFilesService = getService();
 
-		ToolAccessMode mode = null;
-		try {
-			mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
-		}
-		catch (Exception e) {
-		}
-		//when first time open flash icon on authoring page: mode will be null 
-		if (mode == null) {
-			mode = ToolAccessMode.AUTHOR;
-		}
+	SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID);
 
-		ActionMessages errors = validate(authForm, mapping, request);
-		if (!errors.isEmpty()) {
-			saveErrors(request, errors);
-			return mapping.getInputForward();
-		}
+	if (mode.isTeacher()) {
 
-		SubmitFilesContent content = getContent(form);
+	    persistContent.setDefineLater(true);
+	    submitFilesService.saveOrUpdateContent(persistContent);
 
-		submitFilesService = getService();
-		SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(content.getContentID());
-
-		if (persistContent == null) {
-			//new content
-			persistContent = content;
-			content.setCreated(new Date());
-		}
-		else {
-			//copy web page value into persist content, as above, the "Set" type value kept.
-			if (mode.isAuthor()) {
-				Long uid = persistContent.getContentID();
-				PropertyUtils.copyProperties(persistContent, content);
-				persistContent.setContentID(uid);
-			}
-			else {
-				//			    if it is Teacher, then just update basic tab content (definelater)
-				persistContent.setInstruction(content.getInstruction());
-				persistContent.setTitle(content.getTitle());
-				//change define later status
-				persistContent.setDefineLater(false);
-			}
-		}
-		//		*******************************Handle user*******************
-		//get session from shared session.
-		HttpSession ss = SessionManager.getSession();
-		//get back login user DTO
-		UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
-
-		Long contentId = authForm.getToolContentID();
-		SubmitUser user = submitFilesService.getContentUser(contentId, userDto.getUserID());
-		if (user == null) {
-			user = submitFilesService.createContentUser(userDto, contentId);
-		}
-		persistContent.setCreatedBy(user);
-
-		//**********************************Handle Authoring Instruction Attachement *********************
-		//		so far, attPOSet will be empty if content is existed. because PropertyUtils.copyProperties() is executed
-		Set attPOSet = persistContent.getInstructionFiles();
-		if (attPOSet == null) {
-			attPOSet = new HashSet();
-		}
-
-		//get Attachment from HttpSession
-		List attachmentList = getAttachmentList(sessionMap);
-		Iterator iter = attachmentList.iterator();
-		while (iter.hasNext()) {
-			InstructionFiles newAtt = (InstructionFiles) iter.next();
-			attPOSet.add(newAtt);
-		}
-		attachmentList.clear();
-
-		//handle deleted instruction files
-		List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-		iter = deleteAttachmentList.iterator();
-		while (iter.hasNext()) {
-			InstructionFiles delAtt = (InstructionFiles) iter.next();
-			//it is an existed att, then delete it from current attachmentPO
-			if (delAtt.getUid() != null) {
-				Iterator attIter = attPOSet.iterator();
-				while (attIter.hasNext()) {
-					InstructionFiles att = (InstructionFiles) attIter.next();
-					if (delAtt.getUid().equals(att.getUid())) {
-						attIter.remove();
-						break;
-					}
-				}
-				submitFilesService.deleteInstructionFile(delAtt.getUid());
-			}//end remove from persist value
-		}
-		deleteAttachmentList.clear();
-
-		//copy back
-		persistContent.setInstructionFiles(attPOSet);
-
-		submitFilesService.saveOrUpdateContent(persistContent);
-
-		//to jump to common success page in lams_central
-		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-		return mapping.findForward("success");
 	}
 
-	/**
-	 * Handle upload online instruction files request. Once the file uploaded successfully, database
-	 * will update accordingly. 
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	public ActionForward uploadOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE, request);
+	// if this content does not exist(empty without id), create a content by default content record.
+	if (persistContent == null) {
+	    persistContent = submitFilesService.createDefaultContent(contentID);
 	}
 
-	/**
-	 * Handle upload offline instruction files request. Once the file uploaded successfully, database
-	 * will update accordingly. 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	public ActionForward uploadOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		return uploadFile(mapping, form, IToolContentHandler.TYPE_OFFLINE, request);
-	}
+	// set back STRUTS component value
+	AuthoringForm authForm = (AuthoringForm) form;
+	authForm.initContentValue(persistContent);
+	// session map
+	authForm.setSessionMapID(sessionMap.getSessionID());
+	// current tab
+	authForm.setCurrentTab(request.getParameter("currentTab"));
+	authForm.setContentFolderID(contentFolderID);
 
-	/**
-	 * Common method to upload online or offline instruction files request.
-	 * @param mapping
-	 * @param form
-	 * @param type
-	 * @param request
-	 * @return
-	 */
-	private ActionForward uploadFile(ActionMapping mapping, ActionForm form, String type, HttpServletRequest request) {
+	return mapping.findForward("success");
+    }
 
-		AuthoringForm authForm = (AuthoringForm) form;
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID());
+    /**
+     * Update all content for submit tool except online/offline instruction files list.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws Exception
+     */
+    public ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
 
-		FormFile file;
-		if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-			file = authForm.getOfflineFile();
-		}
-		else {
-			file = authForm.getOnlineFile();
-		}
+	AuthoringForm authForm = (AuthoringForm) form;
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID());
 
-		if (file == null || StringUtils.isBlank(file.getFileName())) {
-			return mapping.getInputForward();
-		}
-
-		//upload to repository
-		InstructionFiles att = submitFilesService.uploadFileToContent(authForm.getToolContentID(), 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();
-		InstructionFiles existAtt;
-		while (iter.hasNext()) {
-			existAtt = (InstructionFiles) iter.next();
-			if (StringUtils.equals(existAtt.getName(), att.getName()) && StringUtils.equals(existAtt.getType(), att.getType())) {
-				//if there is same name attachment, delete old one
-				deleteAttachmentList.add(existAtt);
-				iter.remove();
-				break;
-			}
-		}
-		//add to attachmentList
-		attachmentList.add(att);
-
-		return mapping.getInputForward();
-
+	ToolAccessMode mode = null;
+	try {
+	    mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
+	} catch (Exception e) {
 	}
-
-	public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		return deleteFile(mapping, form, request, response, IToolContentHandler.TYPE_OFFLINE);
+	// when first time open flash icon on authoring page: mode will be null
+	if (mode == null) {
+	    mode = ToolAccessMode.AUTHOR;
 	}
 
-	public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		return deleteFile(mapping, form, request, response, IToolContentHandler.TYPE_ONLINE);
+	ActionMessages errors = validate(authForm, mapping, request);
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    return mapping.getInputForward();
 	}
 
-	/**
-	 * @param request
-	 * @param response
-	 * @param type 
-	 * @return
-	 */
-	private ActionForward deleteFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response, String type) {
-		Long versionID = new Long(WebUtil.readLongParam(request, "fileVersionId"));
-		Long uuID = new Long(WebUtil.readLongParam(request, "fileUuid"));
-		String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
+	SubmitFilesContent content = getContent(form);
 
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	submitFilesService = getService();
+	SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(content.getContentID());
 
-		//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();
-		InstructionFiles existAtt;
-		while (iter.hasNext()) {
-			existAtt = (InstructionFiles) iter.next();
-			if (existAtt.getUuID().equals(uuID) && existAtt.getVersionID().equals(versionID)) {
-				//if there is same name attachment, delete old one
-				deleteAttachmentList.add(existAtt);
-				iter.remove();
-			}
-		}
+	if (persistContent == null) {
+	    // new content
+	    persistContent = content;
+	    content.setCreated(new Date());
+	} else {
+	    // copy web page value into persist content, as above, the "Set" type value kept.
+	    if (mode.isAuthor()) {
+		Long uid = persistContent.getContentID();
+		PropertyUtils.copyProperties(persistContent, content);
+		persistContent.setContentID(uid);
+	    } else {
+		// if it is Teacher, then just update basic tab content (definelater)
+		persistContent.setInstruction(content.getInstruction());
+		persistContent.setTitle(content.getTitle());
+		// change define later status
+		persistContent.setDefineLater(false);
+	    }
+	}
+	// *******************************Handle user*******************
+	// get session from shared session.
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
 
-		request.setAttribute(SbmtConstants.ATTR_FILE_TYPE_FLAG, type);
-		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-		return mapping.findForward("instructionFileList");
+	Long contentId = authForm.getToolContentID();
+	SubmitUser user = submitFilesService.getContentUser(contentId, userDto.getUserID());
+	if (user == null) {
+	    user = submitFilesService.createContentUser(userDto, contentId);
 	}
+	persistContent.setCreatedBy(user);
 
-	//***********************************************************
-	//  Private/protected methods
-	//***********************************************************
-	/**
-	 * The private method to get content from ActionForm parameters (web page).
-	 * 
-	 * @param form
-	 * @return
-	 */
-	private SubmitFilesContent getContent(ActionForm form) {
-		AuthoringForm authForm = (AuthoringForm) form;
-		Long contentId = authForm.getToolContentID();
+	submitFilesService.saveOrUpdateContent(persistContent);
 
-		SubmitFilesContent content = new SubmitFilesContent();
-		content.setContentID(contentId);
-		content.setInstruction(authForm.getInstructions());
-		content.setOfflineInstruction(authForm.getOfflineInstruction());
-		content.setOnlineInstruction(authForm.getOnlineInstruction());
-		content.setTitle(authForm.getTitle());
-		content.setLockOnFinished(authForm.isLockOnFinished());
-		content.setReflectInstructions(authForm.getReflectInstructions());
-		content.setReflectOnActivity(authForm.isReflectOnActivity());
-		content.setLimitUpload(authForm.isLimitUpload());
-		content.setLimitUploadNumber(authForm.getLimitUploadNumber());
-		content.setNotifyLearnersOnMarkRelease(authForm.isNotifyLearnersOnMarkRelease());
-		content.setNotifyTeachersOnFileSubmit(authForm.isNotifyTeachersOnFileSubmit());
-		// content.setInstrctionFiles()
-		// content.setToolSession();
-		return content;
-	}
+	// to jump to common success page in lams_central
+	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	return mapping.findForward("success");
+    }
 
-	/**
-	 * @param request
-	 * @return
-	 */
-	private List getAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap, SbmtConstants.ATTACHMENT_LIST);
-	}
+    // ***********************************************************
+    // Private/protected methods
+    // ***********************************************************
+    /**
+     * The private method to get content from ActionForm parameters (web page).
+     * 
+     * @param form
+     * @return
+     */
+    private SubmitFilesContent getContent(ActionForm form) {
+	AuthoringForm authForm = (AuthoringForm) form;
+	Long contentId = authForm.getToolContentID();
 
-	/**
-	 * @param request
-	 * @return
-	 */
-	private List getDeletedAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap, SbmtConstants.DELETED_ATTACHMENT_LIST);
-	}
+	SubmitFilesContent content = new SubmitFilesContent();
+	content.setContentID(contentId);
+	content.setInstruction(authForm.getInstructions());
+	content.setTitle(authForm.getTitle());
+	content.setLockOnFinished(authForm.isLockOnFinished());
+	content.setReflectInstructions(authForm.getReflectInstructions());
+	content.setReflectOnActivity(authForm.isReflectOnActivity());
+	content.setLimitUpload(authForm.isLimitUpload());
+	content.setLimitUploadNumber(authForm.getLimitUploadNumber());
+	content.setNotifyLearnersOnMarkRelease(authForm.isNotifyLearnersOnMarkRelease());
+	content.setNotifyTeachersOnFileSubmit(authForm.isNotifyTeachersOnFileSubmit());
+	return content;
+    }
 
-	/**
-	 * Get <code>java.util.List</code> from HttpSession by given name.
-	 * 
-	 * @param request
-	 * @param name
-	 * @return
-	 */
-	private List getListFromSession(SessionMap sessionMap, String name) {
-		List list = (List) sessionMap.get(name);
-		if (list == null) {
-			list = new ArrayList();
-			sessionMap.put(name, list);
-		}
-		return list;
+    /**
+     * Get submit file service bean.
+     * 
+     * @return
+     */
+    private ISubmitFilesService getService() {
+	if (submitFilesService == null) {
+	    return SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+	} else {
+	    return submitFilesService;
 	}
+    }
 
-	/**
-	 * Get submit file service bean.
-	 * @return
-	 */
-	private ISubmitFilesService getService() {
-		if (submitFilesService == null) {
-			return SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
-		}
-		else {
-			return submitFilesService;
-		}
+    private ActionMessages validate(AuthoringForm sbmtForm, ActionMapping mapping, HttpServletRequest request) {
+	ActionMessages errors = new ActionMessages();
+	// if (StringUtils.isBlank(sbmtForm.getTitle())) {
+	// ActionMessage error = new ActionMessage("error.title.blank");
+	// errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	// }
+	// define it later mode(TEACHER) skip below validation.
+	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+	if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
+	    return errors;
 	}
 
-	private ActionMessages validate(AuthoringForm sbmtForm, ActionMapping mapping, HttpServletRequest request) {
-		ActionMessages errors = new ActionMessages();
-		//		if (StringUtils.isBlank(sbmtForm.getTitle())) {
-		//			ActionMessage error = new ActionMessage("error.title.blank");
-		//			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-		//		}
-		//define it later mode(TEACHER) skip below validation.
-		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-		if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
-			return errors;
-		}
+	// Some other validation outside basic Tab.
 
-		//Some other validation outside basic Tab.
+	return errors;
+    }
 
-		return errors;
-	}
-
 }
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java,v
diff -u -r1.18 -r1.19
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java	6 Jan 2014 08:42:29 -0000	1.18
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java	17 Jan 2014 22:12:23 -0000	1.19
@@ -228,27 +228,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 {
-        	ISubmitFilesService service = SubmitFilesServiceProxy.getSubmitFilesService(getServletContext());
-
-        	SubmitFilesContent content = null;
-            if ( toolContentID != null ) {
-            	content = service.getSubmitFilesContent(toolContentID);
-            } else {
-            	SubmitFilesSession session=service.getSessionById(toolSessionID);
-            	if ( session != null )
-            		content = session.getContent();
-            }
-            if ( content != null ) {
-            	activityTitle = content.getTitle();
-            }
-        }
-        return super.doOfflineExport(request, response, directoryName, cookies);
-	}
 	
 	public Map learner(HttpServletRequest request,
 			HttpServletResponse response, String directoryName, Cookie[] cookies, HashMap sessionMap) {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v
diff -u -r1.54 -r1.55
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	4 Jul 2013 11:34:57 -0000	1.54
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	17 Jan 2014 22:12:23 -0000	1.55
@@ -83,7 +83,7 @@
  * 
  * @struts.action-forward name="success" path="/learner/sbmtlearner.jsp"
  * @struts.action-forward name="defineLater" path="/learner/definelater.jsp"
- * @struts.action-forward name="runOffline" path="/learner/runoffline.jsp"
+ * @struts.action-forward name="submissionDeadline" path="/learner/submissionDeadline.jsp"
  * 
  * 
  */
@@ -174,11 +174,6 @@
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionID, request, getServlet()
 		.getServletContext());
 
-	// add run offline support
-	if (content.isRunOffline()) {
-	    return mapping.findForward("runOffline");
-	}
-
 	// check if there is submission deadline
 	Date submissionDeadline = content.getSubmissionDeadline();
 	if (submissionDeadline != null) {
@@ -190,9 +185,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("runOffline");
+		return mapping.findForward("submissionDeadline");
 	    }
 	}
 
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v
diff -u -r1.44 -r1.45
--- lams_tool_sbmt/web/authoring/authoring.jsp	8 Jun 2007 01:40:14 -0000	1.44
+++ lams_tool_sbmt/web/authoring/authoring.jsp	17 Jan 2014 22:12:23 -0000	1.45
@@ -57,7 +57,6 @@
 			<lams:Tabs 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:Tabs>
 		</div>
 
@@ -85,10 +84,6 @@
 				<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) -->
-
 				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 					toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" 
 					customiseSessionID="${formBean.sessionMapID}" 
Fisheye: Tag 1.20 refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/parts/instructionfilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.21 refers to a dead (removed) revision in file `lams_tool_sbmt/web/learner/runoffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/learner/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/learner/submissionDeadline.jsp	17 Jan 2014 22:12:23 -0000	1.1
@@ -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 finish(){
+			document.getElementById("finishButton").disabled = true;
+			var finishUrl= "<html:rewrite page='/learner.do?method=finish&sessionMapID=${sessionMapID}'/>";
+			location.href= finishUrl;
+		}
+		function notebook(){
+			var finishUrl= "<html:rewrite page='/learning/newReflection.do?sessionMapID=${sessionMapID}'/>";
+			location.href= finishUrl;
+		}
+	</script>
+</lams:head>
+
+<body class="stripes">
+	<div id="content">
+
+		<h1>
+			<fmt:message key="activity.title"></fmt:message>
+		</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 learner.reflect}">
+						<p>
+							<em> <fmt:message key="message.no.reflection.available" />
+							</em>
+						</p>
+					</c:when>
+					<c:otherwise>
+						<p>
+							<lams:out escapeHtml="true" value="${learner.reflect}" />
+						</p>
+					</c:otherwise>
+				</c:choose>
+
+				<html:button property="notebookButton"
+					onclick="javascript:notebook();" 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 and (not sessionMap.userFinished)}">
+					<html:button property="continueButton"
+						onclick="javascript:notebook();" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:when>
+				<c:otherwise>
+					<html:link href="#nogo" property="finishButton" onclick="javascript:finish();"
+						styleClass="button" styleId="finishButton">
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
+					</html:link>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</div>
+	<div id="footer"></div>
+</body>
+</lams:html>
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/monitoring.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	10 Jul 2013 10:14:33 -0000	1.21
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	17 Jan 2014 22:12:22 -0000	1.22
@@ -26,7 +26,7 @@
     		selectTab(tabId);
 	    		
 	    	//for statistic page change:
-	    	if(tabId == 4)
+	    	if(tabId == 3)
 	    		doStatistic();	  
         } 
         
@@ -64,9 +64,8 @@
 		<div id="header">
 			<lams:Tabs control="true">
 				<lams:Tab id="1" key="label.monitoring.heading.userlist" />
-				<lams:Tab id="2" key="label.monitoring.heading.instructions" />
-				<lams:Tab id="3" key="label.monitoring.heading.edit.activity" />
-				<lams:Tab id="4" key="label.monitoring.heading.stats" />
+				<lams:Tab id="2" key="label.monitoring.heading.edit.activity" />
+				<lams:Tab id="3" key="label.monitoring.heading.stats" />
 			</lams:Tabs>
 		</div>
 
@@ -82,16 +81,12 @@
 				<lams:TabBody id="1" titleKey="label.monitoring.heading.userlist.desc" page="parts/summary.jsp" />
 				<!-- end of content (Summary) -->
 
-				<!-- tab content 2 (Instructions) -->
-				<lams:TabBody id="2" titleKey="label.monitoring.heading.instructions.desc" page="parts/instructions.jsp" />
-				<!-- end of content (Instructions) -->
-
-				<!-- tab content 3 (Edit Activity) -->
-				<lams:TabBody id="3" titleKey="label.monitoring.heading.edit.activity.desc" page="parts/activity.jsp" />
+				<!-- tab content 2 (Edit Activity) -->
+				<lams:TabBody id="2" titleKey="label.monitoring.heading.edit.activity.desc" page="parts/activity.jsp" />
 				<!-- end of content (Edit Activity) -->
 
-				<!-- tab content 4 (Stats) -->
-				<lams:TabBody id="4" titleKey="label.monitoring.heading.stats.desc" page="parts/statistic.jsp" />
+				<!-- tab content 3 (Stats) -->
+				<lams:TabBody id="3" titleKey="label.monitoring.heading.stats.desc" page="parts/statistic.jsp" />
 				<!-- end of content (Stats) -->
 			</html:form>
 		</div>
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_sbmt/web/monitoring/parts/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/xdoclet/struts-actions.xml,v
diff -u -r1.16 -r1.17
--- lams_tool_scratchie/conf/xdoclet/struts-actions.xml	19 Dec 2013 08:50:10 -0000	1.16
+++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml	17 Jan 2014 22:12:29 -0000	1.17
@@ -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.scratchie.web.action.AuthoringAction"
-			name="scratchieForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOnlineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/uploadOfflineFile"
-			type="org.lamsfoundation.lams.tool.scratchie.web.action.AuthoringAction"
-			name="scratchieForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOfflineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/deleteOnlineFile"
-			type="org.lamsfoundation.lams.tool.scratchie.web.action.AuthoringAction"
-			name="scratchieForm" 
-			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.scratchie.web.action.AuthoringAction"
-			name="scratchieForm" 
-			scope="request" 
-			validate="false"
-			parameter="deleteOfflineFile">
-			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
-		</action>
 		<!-- ==========  Scratchie Item : URL ========== -->
 		<action path="/authoring/addItem"
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.AuthoringAction"
@@ -193,7 +160,7 @@
 			<forward name="newReflection" path="/learning/newReflection.do" />
 			<forward name="showResults" path="/learning/showResults.do" />
 			<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/refreshQuestionList"
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java,v
diff -u -r1.18 -r1.19
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	13 Jan 2014 14:01:44 -0000	1.18
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	17 Jan 2014 22:12:29 -0000	1.19
@@ -48,19 +48,13 @@
     
     public static final String PARAM_SESSION_ID = "sessionId";
 
-    public static final String PARAM_FILE_VERSION_ID = "fileVersionId";
-
-    public static final String PARAM_FILE_UUID = "fileUuid";
-
     public static final String PARAM_ITEM_INDEX = "itemIndex";
 
     public static final String PARAM_ITEM_UID = "itemUid";
     
     public static final String PARAM_ANSWER_UID = "answerUid";
     
     public static final String PARAM_ANSWER_INDEX = "answerIndex";
-
-    public static final String PARAM_RUN_OFFLINE = "runOffline";
     
     public static final String PARAM_NOT_A_NUMBER = "nan";
     
@@ -93,14 +87,10 @@
     
     public static final String ATTR_ANSWER_ORDER_ID_PREFIX = "answerOrderId";
 
-    public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
-
     public static final String ATTR_DELETED_ITEM_LIST = "deleteItemList";
     
     public static final String ATTR_DELETED_ANSWER_LIST = "deleteAnswerList";
 
-    public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
-
     public static final String ATTR_SCRATCHIE = "scratchie";
     
     public static final String ATTR_IS_SCRATCHING_FINISHED = "isScratchingFinished";
@@ -127,8 +117,6 @@
 
     public static final String ATTR_RESOURCE_FORM = "scratchieForm";
 
-    public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
-
     public static final String ATTR_TITLE = "title";
     
     public static final String ATTR_ITEM = "item";
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml,v
diff -u -r1.12 -r1.13
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	8 Jan 2014 17:52:51 -0000	1.12
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	17 Jan 2014 22:12:29 -0000	1.13
@@ -28,12 +28,6 @@
         </property>
     </bean>
 
-   <bean id="scratchieAttachmentDao" class="org.lamsfoundation.lams.tool.scratchie.dao.hibernate.ScratchieAttachmentDAOHibernate">
-        <property name="sessionFactory">
-            <ref bean="coreSessionFactory"/>
-        </property>
-    </bean>
-
    <bean id="scratchieUserDao" class="org.lamsfoundation.lams.tool.scratchie.dao.hibernate.ScratchieUserDAOHibernate">
         <property name="sessionFactory">
             <ref bean="coreSessionFactory"/>
@@ -66,9 +60,6 @@
         <property name="scratchieAnswerVisitDao">
             <ref local="scratchieAnswerVisitDao"/>
         </property>
-        <property name="scratchieAttachmentDao">
-            <ref local="scratchieAttachmentDao"/>
-        </property>
         <property name="scratchieUserDao">
             <ref local="scratchieUserDao"/>
         </property>
@@ -78,9 +69,6 @@
         <property name="scratchieToolContentHandler">
             <ref local="scratchieToolContentHandler"/>
         </property>
-        <property name="repositoryService">
-            <ref bean="repositoryService"/>
-        </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
@@ -123,8 +111,6 @@
                 <prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="copyScratchesFromLeader">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="setScratchingFinished">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="setItemComplete">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="setItemVisible">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="logAnswerAccess">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAttachmentDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140102.sql	17 Jan 2014 22:12:29 -0000	1.1
@@ -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_lascrt11_scratchie DROP COLUMN online_instructions;
+ALTER TABLE tl_lascrt11_scratchie DROP COLUMN offline_instructions;
+ALTER TABLE tl_lascrt11_scratchie DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lascrt11_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lascrt11';
+
+----------------------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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java,v
diff -u -r1.7 -r1.8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	17 Dec 2013 22:26:25 -0000	1.7
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	17 Jan 2014 22:12:29 -0000	1.8
@@ -23,19 +23,14 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.scratchie.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.scratchie.util.ScratchieToolContentHandler;
 
 /**
  * Scratchie
@@ -60,19 +55,11 @@
     private String instructions;
 
     // advance
-    private boolean runOffline;
 
     private boolean defineLater;
 
     private boolean contentInUse;
 
-    // instructions
-    private String onlineInstructions;
-
-    private String offlineInstructions;
-
-    private Set attachments;
-
     // general infomation
     private Date created;
 
@@ -89,29 +76,19 @@
 
     private String reflectInstructions;
 
-    // *************** NON Persist Fields ********************
-    private IToolContentHandler toolContentHandler;
-
-    private List<ScratchieAttachment> onlineFileList;
-
-    private List<ScratchieAttachment> offlineFileList;
-
     /**
      * Default contruction method.
      * 
      */
     public Scratchie() {
-	attachments = new HashSet();
 	scratchieItems = new HashSet();
     }
 
     // **********************************************************
     // Function method for Scratchie
     // **********************************************************
-    public static Scratchie newInstance(Scratchie defaultContent, Long contentId,
-	    ScratchieToolContentHandler scratchieToolContentHandler) {
+    public static Scratchie newInstance(Scratchie defaultContent, Long contentId) {
 	Scratchie toContent = new Scratchie();
-	defaultContent.toolContentHandler = scratchieToolContentHandler;
 	toContent = (Scratchie) defaultContent.clone();
 	toContent.setContentId(contentId);
 
@@ -136,19 +113,6 @@
 		}
 		scratchie.scratchieItems = set;
 	    }
-	    // clone attachment
-	    if (attachments != null) {
-		Iterator iter = attachments.iterator();
-		Set set = new HashSet();
-		while (iter.hasNext()) {
-		    ScratchieAttachment file = (ScratchieAttachment) iter.next();
-		    ScratchieAttachment newFile = (ScratchieAttachment) file.clone();
-		    // just clone old file without duplicate it in repository
-
-		    set.add(newFile);
-		}
-		scratchie.attachments = set;
-	    }
 	} catch (CloneNotSupportedException e) {
 	    Scratchie.log.error("When clone " + Scratchie.class + " failed");
 	}
@@ -168,16 +132,13 @@
 	final Scratchie genericEntity = (Scratchie) 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)
+		.append(instructions, genericEntity.instructions).append(created, genericEntity.created)
 		.append(updated, genericEntity.updated).isEquals();
     }
 
     @Override
     public int hashCode() {
-	return new HashCodeBuilder().append(uid).append(title).append(instructions).append(onlineInstructions)
-		.append(offlineInstructions).append(created).append(updated).toHashCode();
+	return new HashCodeBuilder().append(uid).append(title).append(instructions).append(created).append(updated).toHashCode();
     }
 
     /**
@@ -192,21 +153,6 @@
 	this.setUpdated(new Date(now));
     }
 
-    public void toDTO() {
-	onlineFileList = new ArrayList<ScratchieAttachment>();
-	offlineFileList = new ArrayList<ScratchieAttachment>();
-	Set<ScratchieAttachment> fileSet = this.getAttachments();
-	if (fileSet != null) {
-	    for (ScratchieAttachment file : fileSet) {
-		if (StringUtils.equalsIgnoreCase(file.getFileType(), IToolContentHandler.TYPE_OFFLINE)) {
-		    offlineFileList.add(file);
-		} else {
-		    onlineFileList.add(file);
-		}
-	    }
-	}
-    }
-
     // **********************************************************
     // get/set methods
     // **********************************************************
@@ -297,26 +243,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 instructions set by the teacher.
      * 
      * @hibernate.property column="instructions" type="text"
@@ -330,53 +256,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="scratchie_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.scratchie.model.ScratchieAttachment"
-     * 
-     * @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="order_id asc"
      * @hibernate.collection-key column="scratchie_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem"
@@ -427,26 +308,6 @@
 	this.contentId = contentId;
     }
 
-    public List<ScratchieAttachment> getOfflineFileList() {
-	return offlineFileList;
-    }
-
-    public void setOfflineFileList(List<ScratchieAttachment> offlineFileList) {
-	this.offlineFileList = offlineFileList;
-    }
-
-    public List<ScratchieAttachment> getOnlineFileList() {
-	return onlineFileList;
-    }
-
-    public void setOnlineFileList(List<ScratchieAttachment> onlineFileList) {
-	this.onlineFileList = onlineFileList;
-    }
-
-    public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-	this.toolContentHandler = toolContentHandler;
-    }
-
     /**
      * @hibernate.property column="reflect_instructions"
      * @return
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java,v
diff -u -r1.25 -r1.26
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	17 Dec 2013 22:26:24 -0000	1.25
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	17 Jan 2014 22:12:28 -0000	1.26
@@ -28,19 +28,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.Summary;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer;
-import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAttachment;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.ExcelCell;
 
 /**
@@ -86,16 +83,6 @@
      */
     List getAuthoredItems(Long scratchieUid);
 
-    /**
-     * Upload instruciton file into repository.
-     * 
-     * @param file
-     * @param type
-     * @return
-     * @throws UploadScratchieFileException
-     */
-    ScratchieAttachment uploadInstructionFile(FormFile file, String type) throws UploadScratchieFileException;
-
     // ********** for user methods *************
     /**
      * Create a new user in database.
@@ -127,28 +114,14 @@
      */
     void saveUser(ScratchieUser user);
 
-    // ********** Repository methods ***********************
     /**
-     * Delete file from repository.
-     */
-    void deleteFromRepository(Long fileUuid, Long fileVersionId) throws ScratchieApplicationException;
-
-    /**
      * Save or update scratchie into database.
      * 
      * @param Scratchie
      */
     void saveOrUpdateScratchie(Scratchie scratchie);
 
     /**
-     * Delete reource attachment(i.e., offline/online instruction file) from database. This method does not delete the
-     * file from repository.
-     * 
-     * @param attachmentUid
-     */
-    void deleteScratchieAttachment(Long attachmentUid);
-
-    /**
      * Delete resoruce item from database.
      * 
      * @param uid
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java	17 Dec 2013 22:26:24 -0000	1.1
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java	17 Jan 2014 22:12:28 -0000	1.2
@@ -37,7 +37,6 @@
 
     /**
      * Import 20131130 version content to 20131212 version tool server.
-     * 
      */
     public void up20131130To20131212() {
 	this.removeField(ScratchieUser.class, "totalAttempts");
@@ -51,4 +50,14 @@
 	this.addField(ScratchieSession.class, "mark", new Integer(0));
 	this.addField(ScratchieSession.class, "scratchingFinished", new Integer(0));
     }
+    
+    /**
+     * Import 20131212 version content to 20140102 version tool server.
+     */
+    public void up20131212To20140102() {
+	this.removeField(Scratchie.class, "runOffline");
+	this.removeField(Scratchie.class, "onlineInstructions");
+	this.removeField(Scratchie.class, "offlineInstructions");
+	this.removeField(Scratchie.class, "attachments");
+    }
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v
diff -u -r1.40 -r1.41
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	8 Jan 2014 17:52:51 -0000	1.40
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	17 Jan 2014 22:12:28 -0000	1.41
@@ -46,16 +46,12 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.struts.upload.FormFile;
 import org.hibernate.Hibernate;
 import org.hibernate.proxy.HibernateProxy;
 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.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
@@ -84,7 +80,6 @@
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieAnswerVisitDAO;
-import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieAttachmentDAO;
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieDAO;
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieItemDAO;
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieSessionDAO;
@@ -94,7 +89,6 @@
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswerVisitLog;
-import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAttachment;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser;
@@ -124,8 +118,6 @@
 
     private ScratchieItemDAO scratchieItemDao;
 
-    private ScratchieAttachmentDAO scratchieAttachmentDao;
-
     private ScratchieUserDAO scratchieUserDao;
 
     private ScratchieSessionDAO scratchieSessionDao;
@@ -138,7 +130,6 @@
     private MessageService messageService;
 
     // system services
-    private IRepositoryService repositoryService;
 
     private ILamsToolService toolService;
 
@@ -162,32 +153,6 @@
     // Service method
     // *******************************************************************************
 
-    /**
-     * This method verifies the credentials of the Scratchie 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 ScratchieApplicationException
-     */
-    private ITicket getRepositoryLoginTicket() throws ScratchieApplicationException {
-	ICredentials credentials = new SimpleCredentials(scratchieToolContentHandler.getRepositoryUser(),
-		scratchieToolContentHandler.getRepositoryId());
-	try {
-	    ITicket ticket = repositoryService.login(credentials,
-		    scratchieToolContentHandler.getRepositoryWorkspaceName());
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new ScratchieApplicationException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new ScratchieApplicationException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new ScratchieApplicationException("Login failed." + e.getMessage());
-	}
-    }
-
     @Override
     public Scratchie getScratchieByContentId(Long contentId) {
 	if (ScratchieServiceImpl.log.isDebugEnabled()) {
@@ -216,7 +181,7 @@
 	Scratchie defaultContent = getDefaultScratchie();
 	// save default content by given ID.
 	Scratchie content = new Scratchie();
-	content = Scratchie.newInstance(defaultContent, contentId, scratchieToolContentHandler);
+	content = Scratchie.newInstance(defaultContent, contentId);
 	return content;
     }
 
@@ -235,28 +200,6 @@
     }
 
     @Override
-    public ScratchieAttachment uploadInstructionFile(FormFile uploadFile, String fileType)
-	    throws UploadScratchieFileException {
-	if ((uploadFile == null) || StringUtils.isEmpty(uploadFile.getFileName())) {
-	    throw new UploadScratchieFileException(messageService.getMessage("error.msg.upload.file.not.found",
-		    new Object[] { uploadFile }));
-	}
-
-	// upload file to repository
-	NodeKey nodeKey = processFile(uploadFile, fileType);
-
-	// create new attachement
-	ScratchieAttachment file = new ScratchieAttachment();
-	file.setFileType(fileType);
-	file.setFileUuid(nodeKey.getUuid());
-	file.setFileVersionId(nodeKey.getVersion());
-	file.setFileName(uploadFile.getFileName());
-	file.setCreated(new Date());
-
-	return file;
-    }
-
-    @Override
     public void createUser(ScratchieUser scratchieUser) {
 	if (ScratchieServiceImpl.log.isDebugEnabled()) {
 	    ScratchieServiceImpl.log.debug("LKC:[" + Thread.currentThread().getId() + "|" + Thread.activeCount()
@@ -267,29 +210,8 @@
 
     @Override
     public ScratchieUser getUserByIDAndSession(Long userId, Long sessionId) {
-	if (ScratchieServiceImpl.log.isDebugEnabled()) {
-	    ScratchieServiceImpl.log.debug("LKC:[" + Thread.currentThread().getId() + "|" + Thread.activeCount()
-		    + "]: entered getUserByIDAndSession(), getting ScratchieUser by ID: " + userId
-		    + " and session ID: " + sessionId);
-	}
-	ScratchieUser res = scratchieUserDao.getUserByUserIDAndSessionID(userId, sessionId);
-	if (ScratchieServiceImpl.log.isDebugEnabled()) {
-	    ScratchieServiceImpl.log.debug("LKC:[" + Thread.currentThread().getId() + "|" + Thread.activeCount()
-		    + "]: leaving getUserByIDAndSession(), retrieved ScratchieUser by ID: " + userId
-		    + " and session ID: " + sessionId);
-	}
-	return res;
-    }
 
-    @Override
-    public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws ScratchieApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, fileUuid, fileVersionId);
-	} catch (Exception e) {
-	    throw new ScratchieApplicationException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
+	return scratchieUserDao.getUserByUserIDAndSessionID(userId, sessionId);
     }
 
     @Override
@@ -302,11 +224,6 @@
     }
 
     @Override
-    public void deleteScratchieAttachment(Long attachmentUid) {
-	scratchieAttachmentDao.removeObject(ScratchieAttachment.class, attachmentUid);
-    }
-
-    @Override
     public void deleteScratchieItem(Long uid) {
 	if (ScratchieServiceImpl.log.isDebugEnabled()) {
 	    ScratchieServiceImpl.log.debug("LKC:[" + Thread.currentThread().getId() + "|" + Thread.activeCount()
@@ -1701,35 +1618,6 @@
 	return contentId;
     }
 
-    /**
-     * Process an uploaded file.
-     * 
-     * @throws ScratchieApplicationException
-     * @throws FileNotFoundException
-     * @throws IOException
-     * @throws RepositoryCheckedException
-     * @throws InvalidParameterException
-     */
-    private NodeKey processFile(FormFile file, String fileType) throws UploadScratchieFileException {
-	NodeKey node = null;
-	if ((file != null) && !StringUtils.isEmpty(file.getFileName())) {
-	    String fileName = file.getFileName();
-	    try {
-		node = scratchieToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType(),
-			fileType);
-	    } catch (InvalidParameterException e) {
-		throw new UploadScratchieFileException(messageService.getMessage("error.msg.invaid.param.upload"));
-	    } catch (FileNotFoundException e) {
-		throw new UploadScratchieFileException(messageService.getMessage("error.msg.file.not.found"));
-	    } catch (RepositoryCheckedException e) {
-		throw new UploadScratchieFileException(messageService.getMessage("error.msg.repository"));
-	    } catch (IOException e) {
-		throw new UploadScratchieFileException(messageService.getMessage("error.msg.io.exception"));
-	    }
-	}
-	return node;
-    }
-
     @Override
     public boolean isGroupedActivity(long toolContentID) {
 	if (ScratchieServiceImpl.log.isDebugEnabled()) {
@@ -1755,14 +1643,6 @@
 	this.messageService = messageService;
     }
 
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
-    public void setScratchieAttachmentDao(ScratchieAttachmentDAO scratchieAttachmentDao) {
-	this.scratchieAttachmentDao = scratchieAttachmentDao;
-    }
-
     public void setScratchieDao(ScratchieDAO scratchieDao) {
 	this.scratchieDao = scratchieDao;
     }
@@ -1814,10 +1694,7 @@
 	}
 
 	// set ScratchieToolContentHandler as null to avoid copy file node in repository again.
-	toolContentObj = Scratchie.newInstance(toolContentObj, toolContentId, null);
-	toolContentObj.setToolContentHandler(null);
-	toolContentObj.setOfflineFileList(null);
-	toolContentObj.setOnlineFileList(null);
+	toolContentObj = Scratchie.newInstance(toolContentObj, toolContentId);
 	
 	// wipe out the links from ScratchieAnswer back to ScratchieItem, or it will try to
 	// include the hibernate object version of the ScratchieItem within the XML
@@ -1830,8 +1707,6 @@
 	}
 	
 	try {
-	    exportContentService.registerFileClassForExport(ScratchieAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService
 		    .exportToolContent(toolContentId, toolContentObj, scratchieToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
@@ -1844,9 +1719,6 @@
 	    String toVersion) throws ToolException {
 
 	try {
-	    exportContentService.registerFileClassForImport(ScratchieAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
 	    // register version filter class
 	    exportContentService.registerImportVersionFilterClass(ScratchieImportContentVersionFilter.class);
 
@@ -1919,7 +1791,7 @@
 	    }
 	}
 
-	Scratchie toContent = Scratchie.newInstance(scratchie, toContentId, scratchieToolContentHandler);
+	Scratchie toContent = Scratchie.newInstance(scratchie, toContentId);
 	scratchieDao.saveObject(toContent);
 
 	// save scratchie items as well
@@ -1939,24 +1811,6 @@
     }
 
     @Override
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Scratchie scratchie = scratchieDao.getByContentId(toolContentId);
-	if (scratchie == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	scratchie.setDefineLater(value);
-    }
-
-    @Override
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Scratchie scratchie = scratchieDao.getByContentId(toolContentId);
-	if (scratchie == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	scratchie.setRunOffline(value);
-    }
-
-    @Override
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	Scratchie scratchie = scratchieDao.getByContentId(toolContentId);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java,v
diff -u -r1.14 -r1.15
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	17 Dec 2013 22:26:24 -0000	1.14
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	17 Jan 2014 22:12:28 -0000	1.15
@@ -30,7 +30,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -53,30 +52,24 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 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.questions.Answer;
 import org.lamsfoundation.lams.questions.Question;
 import org.lamsfoundation.lams.questions.QuestionParser;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer;
-import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAttachment;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser;
 import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService;
-import org.lamsfoundation.lams.tool.scratchie.service.UploadScratchieFileException;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieAnswerComparator;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator;
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchieForm;
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchieItemForm;
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchiePedagogicalPlannerForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -125,18 +118,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);
-	}
 	// ----------------------- Scratchie item functions ---------
 	if (param.equals("addItem")) {
 	    return addItem(mapping, form, request, response);
@@ -230,11 +211,6 @@
 	    }
 
 	    scratchieForm.setScratchie(scratchie);
-
-	    // initialize instruction attachment list
-	    List attachmentList = getAttachmentList(sessionMap);
-	    attachmentList.clear();
-	    attachmentList.addAll(scratchie.getAttachments());
 	} catch (Exception e) {
 	    AuthoringAction.log.error(e);
 	    throw new ServletException(e);
@@ -336,53 +312,11 @@
 	    scratchiePO.setUpdated(new Timestamp(new Date().getTime()));
 	}
 
-	// **********************************Handle Authoring Instruction
-	// Attachement *********************
-	// merge attachment info
-	// so far, attPOSet will be empty if content is existed. because
-	// PropertyUtils.copyProperties() is executed
-	Set attPOSet = scratchiePO.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()) {
-	    ScratchieAttachment newAtt = (ScratchieAttachment) 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()) {
-	    ScratchieAttachment delAtt = (ScratchieAttachment) 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()) {
-		    ScratchieAttachment att = (ScratchieAttachment) attIter.next();
-		    if (delAtt.getUid().equals(att.getUid())) {
-			attIter.remove();
-			break;
-		    }
-		}
-		service.deleteScratchieAttachment(delAtt.getUid());
-	    }// end remove from persist value
-	}
-
-	// copy back
-	scratchiePO.setAttachments(attPOSet);
 	// ************************* Handle scratchie items *******************
 	// Handle scratchie items
 	Set itemList = new LinkedHashSet();
 	SortedSet topics = getItemList(sessionMap);
-	iter = topics.iterator();
+	Iterator iter = topics.iterator();
 	while (iter.hasNext()) {
 	    ScratchieItem item = (ScratchieItem) iter.next();
 	    if (item != null) {
@@ -406,9 +340,6 @@
 	// finally persist scratchiePO again
 	service.saveOrUpdateScratchie(scratchiePO);
 
-	// initialize attachmentList again
-	attachmentList = getAttachmentList(sessionMap);
-	attachmentList.addAll(scratchie.getAttachments());
 	scratchieForm.setScratchie(scratchiePO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
@@ -420,135 +351,6 @@
     }
 
     /**
-     * Handle upload online instruction files request.
-     */
-    public ActionForward uploadOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws UploadScratchieFileException {
-	return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    /**
-     * Handle upload offline instruction files request.
-     */
-    public ActionForward uploadOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws UploadScratchieFileException {
-	return uploadFile(mapping, form, IToolContentHandler.TYPE_OFFLINE, request);
-    }
-
-    /**
-     * Common method to upload online or offline instruction files request.
-     */
-    private ActionForward uploadFile(ActionMapping mapping, ActionForm form, String type, HttpServletRequest request)
-	    throws UploadScratchieFileException {
-
-	ScratchieForm scratchieForm = (ScratchieForm) form;
-	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(scratchieForm.getSessionMapID());
-
-	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
-	request.setAttribute(ScratchieConstants.ATTR_ITEM_LIST, itemList);
-
-	FormFile file;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    file = scratchieForm.getOfflineFile();
-	} else {
-	    file = scratchieForm.getOnlineFile();
-	}
-
-	if (file == null || StringUtils.isBlank(file.getFileName())) {
-	    return mapping.findForward(ScratchieConstants.SUCCESS);
-	}
-
-	// validate file size
-	ActionMessages errors = new ActionMessages();
-	FileValidatorUtil.validateFileSize(file, true, errors);
-	if (!errors.isEmpty()) {
-	    this.saveErrors(request, errors);
-	    return mapping.findForward(ScratchieConstants.SUCCESS);
-	}
-
-	IScratchieService service = getScratchieService();
-	// upload to repository
-	ScratchieAttachment 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();
-	ScratchieAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (ScratchieAttachment) 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(ScratchieConstants.SUCCESS);
-
-    }
-
-    /**
-     * Delete offline instruction file from current Scratchie authoring page.
-     */
-    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 Scratchie authoring page.
-     */
-    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)
-     */
-    private ActionForward deleteFile(ActionMapping mapping, HttpServletRequest request, HttpServletResponse response,
-	    ActionForm form, String type) {
-
-	// get back sessionMAP
-	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-
-	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
-	request.setAttribute(ScratchieConstants.ATTR_ITEM_LIST, itemList);
-
-	Long versionID = new Long(WebUtil.readLongParam(request, ScratchieConstants.PARAM_FILE_VERSION_ID));
-	Long uuID = new Long(WebUtil.readLongParam(request, ScratchieConstants.PARAM_FILE_UUID));
-
-	// 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();
-	ScratchieAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (ScratchieAttachment) 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(ScratchieConstants.ATTR_FILE_TYPE_FLAG, type);
-	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(ScratchieConstants.SUCCESS);
-
-    }
-
-    /**
      * Ajax call, will add one more input line for new resource item instruction.
      */
     private ActionForward addItem(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -979,22 +781,6 @@
     }
 
     /**
-     * @param request
-     * @return
-     */
-    private List getAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, ScratchieConstants.ATT_ATTACHMENT_LIST);
-    }
-
-    /**
-     * @param request
-     * @return
-     */
-    private List getDeletedAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, ScratchieConstants.ATTR_DELETED_ATTACHMENT_LIST);
-    }
-
-    /**
      * List save current scratchie items.
      * 
      * @param request
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v
diff -u -r1.38 -r1.39
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	13 Jan 2014 14:01:44 -0000	1.38
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	17 Jan 2014 22:12:28 -0000	1.39
@@ -230,7 +230,6 @@
 	sessionMap.put(ScratchieConstants.ATTR_IS_USER_LEADER, isUserLeader);
 	boolean isUserFinished = (user != null) && user.isSessionFinished();
 	sessionMap.put(ScratchieConstants.ATTR_USER_FINISHED, isUserFinished);
-	sessionMap.put(ScratchieConstants.PARAM_RUN_OFFLINE, scratchie.getRunOffline());
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
 	sessionMap.put(AttributeNames.ATTR_MODE, mode);
 	// reflection information
@@ -266,15 +265,6 @@
 		toolSessionId, request, getServlet().getServletContext());
 	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
 
-	// run offline support
-	if (scratchie.getRunOffline()) {
-	    if (LearningAction.log.isDebugEnabled()) {
-		LearningAction.log.debug("LKC:[" + Thread.currentThread().getId() + "|" + Thread.activeCount()
-			+ "]: leaving start()");
-	    }
-	    return mapping.findForward("runOffline");
-	}
-
 	// check if there is submission deadline
 	Date submissionDeadline = scratchie.getSubmissionDeadline();
 	if (submissionDeadline != null) {
@@ -287,13 +277,13 @@
 	    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)) {
 		if (LearningAction.log.isDebugEnabled()) {
 		    LearningAction.log.debug("LKC:[" + Thread.currentThread().getId() + "|" + Thread.activeCount()
 			    + "]: leaving start()");
 		}
-		return mapping.findForward("runOffline");
+		return mapping.findForward("submissionDeadline");
 	    }
 	}
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java,v
diff -u -r1.18 -r1.19
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	8 Oct 2013 18:01:37 -0000	1.18
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	17 Jan 2014 22:12:28 -0000	1.19
@@ -108,7 +108,6 @@
 	List<GroupSummary> summaryList = service.getMonitoringSummary(contentId, true);
 
 	Scratchie scratchie = service.getScratchieByContentId(contentId);
-	scratchie.toDTO();
 	Set<ScratchieUser> learners = service.getAllLeaders(contentId);
 	
 	//set SubmissionDeadline, if any
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java,v
diff -u -r1.4 -r1.5
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java	24 Sep 2013 16:49:12 -0000	1.4
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java	17 Jan 2014 22:12:29 -0000	1.5
@@ -29,7 +29,6 @@
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 
 /**
@@ -48,8 +47,6 @@
 
     // Forum fields
     private int currentTab;
-    private FormFile offlineFile;
-    private FormFile onlineFile;
 
     private Scratchie scratchie;
 
@@ -73,7 +70,6 @@
 	// so need not reset checkbox to refresh value!
 	if (!StringUtils.equals(param, "start") && !StringUtils.equals(param, "initPage")) {
 	    scratchie.setDefineLater(false);
-	    scratchie.setRunOffline(false);
 	    scratchie.setReflectOnActivity(false);
 	    scratchie.setExtraPoint(false);
 	}
@@ -103,22 +99,6 @@
 	this.currentTab = currentTab;
     }
 
-    public FormFile getOfflineFile() {
-	return offlineFile;
-    }
-
-    public void setOfflineFile(FormFile offlineFile) {
-	this.offlineFile = offlineFile;
-    }
-
-    public FormFile getOnlineFile() {
-	return onlineFile;
-    }
-
-    public void setOnlineFile(FormFile onlineFile) {
-	this.onlineFile = onlineFile;
-    }
-
     public Scratchie getScratchie() {
 	return scratchie;
     }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java,v
diff -u -r1.7 -r1.8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java	6 Jan 2014 08:42:12 -0000	1.7
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java	17 Jan 2014 22:12:29 -0000	1.8
@@ -25,11 +25,9 @@
 
 package org.lamsfoundation.lams.tool.scratchie.web.servlet;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
@@ -43,13 +41,11 @@
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
-import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser;
 import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService;
 import org.lamsfoundation.lams.tool.scratchie.service.ScratchieApplicationException;
 import org.lamsfoundation.lams.tool.scratchie.service.ScratchieServiceProxy;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieBundler;
-import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieToolContentHandler;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
@@ -114,27 +110,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 {
-
-	    Scratchie content = null;
-	    if (toolContentID != null) {
-		content = service.getScratchieByContentId(toolContentID);
-	    } else {
-		ScratchieSession session = service.getScratchieSessionBySessionId(toolSessionID);
-		if (session != null)
-		    content = session.getScratchie();
-	    }
-	    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 ScratchieApplicationException {
 
@@ -187,8 +162,6 @@
 
 	List<GroupSummary> summaryList = service.getMonitoringSummary(content.getContentId(), false);
 
-	content.toDTO();
-
 	// cache into sessionMap
 	boolean isGroupedActivity = service.isGroupedActivity(toolContentID);
 	sessionMap.put(ScratchieConstants.ATTR_IS_GROUPED_ACTIVITY, isGroupedActivity);
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3 -r1.4
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	9 Sep 2013 06:21:45 -0000	1.3
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	17 Jan 2014 22:12:29 -0000	1.4
@@ -434,12 +434,8 @@
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
-	    <name>DefineLater</name>
-		<path>/WEB-INF/tags/DefineLater.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/authoring.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	11 Dec 2012 11:29:54 -0000	1.4
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	17 Jan 2014 22:12:28 -0000	1.5
@@ -30,21 +30,8 @@
 	    	tag.value = tabId;
 	    	// end optional tab controller stuff
 	    	selectTab(tabId);	    	
-        } 
-
-        function doUploadOnline() {
-        	var myForm = $("#authoringForm");
-        	myForm.attr("action", "<c:url value='/authoring/uploadOnlineFile.do'/>");
-        	myForm.submit();
         }
-        function doUploadOffline() {
-        	var myForm = $("#authoringForm");
-        	myForm.attr("action", "<c:url value='/authoring/uploadOfflineFile.do'/>");
-        	myForm.submit();
-        }
     </script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
-
  
 </lams:head>
 <body class="stripes" onLoad="init()">
@@ -56,7 +43,6 @@
 		<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:Tabs></div>
 		<!-- start tabs -->
 <div id="content">
@@ -82,11 +68,7 @@
 			<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) -->
 
-
 			<!-- Button Row -->
 			<%--  Default value 
 				cancelButtonLabelKey="label.authoring.cancel.button"
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/authoring/parts/instructionfilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/learning/runoffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/learning/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/submissionDeadline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scratchie/web/pages/learning/submissionDeadline.jsp	17 Jan 2014 22:12:29 -0000	1.1
@@ -0,0 +1,90 @@
+<!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="label.sorry.the.deadline.has.passed" />
+		</div>
+
+		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn and empty sessionMap.submissionDeadline}">
+			<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) && empty sessionMap.submissionDeadline}">
+					<html:button property="FinishButton" onclick="return continueReflect()" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</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 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	13 Oct 2013 22:19:47 -0000	1.5
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	17 Jan 2014 22:12:29 -0000	1.6
@@ -47,18 +47,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="<%= ScratchieConstants.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_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	26 Mar 2009 10:00:39 -0000	1.6
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	17 Jan 2014 22:12:31 -0000	1.7
@@ -16,18 +16,15 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.tool.scribe.service.ScribeService">
-				<property name="scribeAttachmentDAO"><ref bean="lascrbScribeAttachmentDAO"/></property>
 				<property name="scribeSessionDAO"><ref bean="lascrbScribeSessionDAO"/></property>
 				<property name="scribeUserDAO"><ref bean="lascrbScribeUserDAO"/></property>
 				<property name="scribeHeadingDAO"><ref bean="lascrbScribeHeadingDAO"/></property>
 				<property name="scribeDAO"><ref bean="lascrbScribeDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
-				<property name="auditService"><ref bean="auditService"/></property>		
- 				<property name="scribeToolContentHandler"><ref bean="lascrbScribeToolContentHandler"/></property>
+				<property name="scribeToolContentHandler"><ref bean="lascrbScribeToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
-		   		<property name="repositoryService"><ref bean="repositoryService"/></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
@@ -41,8 +38,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>
 				<prop key="exportToolContent">PROPAGATION_REQUIRED</prop>
@@ -68,9 +63,6 @@
 	<bean id="lascrbScribeHeadingDAO" class="org.lamsfoundation.lams.tool.scribe.dao.hibernate.ScribeHeadingDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
-	<bean id="lascrbScribeAttachmentDAO" class="org.lamsfoundation.lams.tool.scribe.dao.hibernate.ScribeAttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
 	
  	<bean id="lascrbScribeToolContentHandler" class="org.lamsfoundation.lams.tool.scribe.util.ScribeToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeDAO.java	17 Sep 2006 06:28:16 -0000	1.2
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeDAO.java	17 Jan 2014 22:12:32 -0000	1.3
@@ -36,7 +36,5 @@
 	Scribe getByContentId(Long toolContentId);
 
 	void saveOrUpdate(Scribe toContent);
-
-	void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type);
 	
 }
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java	17 Sep 2006 06:28:15 -0000	1.2
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java	17 Jan 2014 22:12:31 -0000	1.3
@@ -26,12 +26,9 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeDAO;
 import org.lamsfoundation.lams.tool.scribe.model.Scribe;
-import org.lamsfoundation.lams.tool.scribe.model.ScribeAttachment;
-import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
  * DAO for accessing the Scribe objects - Hibernate specific code.
@@ -40,10 +37,6 @@
 
 	private static final String FIND_FORUM_BY_CONTENTID = "from Scribe scribe where scribe.toolContentId=?";
 
-	private static final String FIND_INSTRUCTION_FILE = "from "
-			+ ScribeAttachment.class.getName()
-			+ " as i where tool_content_id=? and i.file_uuid=? and i.file_version_id=? and i.file_type=?";
-
 	public Scribe getByContentId(Long toolContentId) {
 		List list = getHibernateTemplate().find(FIND_FORUM_BY_CONTENTID,
 				toolContentId);
@@ -57,22 +50,4 @@
 		this.getHibernateTemplate().saveOrUpdate(scribe);
 		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) {
-				ScribeAttachment file = (ScribeAttachment) list.get(0);
-				this.getSession().setFlushMode(FlushMode.AUTO);
-				templ.delete(file);
-				templ.flush();
-			}
-		}
-
-	}
 }
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20140102.sql	17 Jan 2014 22:12:31 -0000	1.1
@@ -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_lascrb11_scribe DROP COLUMN online_instructions;
+ALTER TABLE tl_lascrb11_scribe DROP COLUMN offline_instructions;
+ALTER TABLE tl_lascrb11_scribe DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lascrb11_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lascrb11';
+
+----------------------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 1.3 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java	16 Nov 2007 07:49:40 -0000	1.7
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java	17 Jan 2014 22:12:31 -0000	1.8
@@ -25,14 +25,11 @@
 
 package org.lamsfoundation.lams.tool.scribe.dto;
 
-import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.scribe.model.Scribe;
-import org.lamsfoundation.lams.tool.scribe.model.ScribeAttachment;
 
 public class ScribeDTO {
 
@@ -43,10 +40,6 @@
 	public String title;
 
 	public String instructions;
-
-	public String onlineInstructions;
-
-	public String offlineInstructions;
 	
 	public boolean defineLater;
 	
@@ -55,11 +48,7 @@
 	public boolean reflectOnActivity;
 	
 	public String reflectInstructions;
-	
-	public Set<ScribeAttachmentDTO> onlineInstructionsFiles = new TreeSet<ScribeAttachmentDTO>();
 
-	public Set<ScribeAttachmentDTO> offlineInstructionsFiles = new TreeSet<ScribeAttachmentDTO>();
-
 	public Set<ScribeSessionDTO> sessionDTOs = new TreeSet<ScribeSessionDTO>();
 	
 	public Set<ScribeHeadingDTO> headingDTOs = new TreeSet<ScribeHeadingDTO>();
@@ -73,30 +62,11 @@
 		toolContentID = scribe.getToolContentId();
 		title = scribe.getTitle();
 		instructions = scribe.getInstructions();
-		onlineInstructions = scribe.getOnlineInstructions();
-		offlineInstructions = scribe.getOfflineInstructions();
 		contentInUse = scribe.isContentInUse();
 		reflectInstructions = scribe.getReflectInstructions();
 		reflectOnActivity = scribe.isReflectOnActivity();
 		autoSelectScribe = scribe.isAutoSelectScribe();
 		showAggregatedReports = scribe.isShowAggregatedReports();
-
-		// Adding attachments
-		for (Iterator i = scribe.getScribeAttachments().iterator(); i.hasNext();) {
-			ScribeAttachment att = (ScribeAttachment) i.next();
-			if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) {
-				ScribeAttachmentDTO attDTO = new ScribeAttachmentDTO(att);
-				offlineInstructionsFiles.add(attDTO);
-			} else if (att.getFileType()
-					.equals(IToolContentHandler.TYPE_ONLINE)) {
-				ScribeAttachmentDTO attDTO = new ScribeAttachmentDTO(att);
-				onlineInstructionsFiles.add(attDTO);
-			} else {
-				// something is wrong. Ignore file, log error
-				logger.error("File with uid " + att.getFileUuid()
-						+ " contains invalid fileType: " + att.getFileType());
-			}
-		}
 		
 	}
 
@@ -116,40 +86,6 @@
 		this.instructions = instructions;
 	}
 
-	public String getOfflineInstructions() {
-		return offlineInstructions;
-	}
-
-	public void setOfflineInstructions(String offlineInstructions) {
-		this.offlineInstructions = offlineInstructions;
-	}
-
-	public Set<ScribeAttachmentDTO> getOfflineInstructionsFiles() {
-		return offlineInstructionsFiles;
-	}
-
-	public void setOfflineInstructionsFiles(
-			Set<ScribeAttachmentDTO> offlineInstructionsFiles) {
-		this.offlineInstructionsFiles = offlineInstructionsFiles;
-	}
-
-	public String getOnlineInstructions() {
-		return onlineInstructions;
-	}
-
-	public void setOnlineInstructions(String onlineInstructions) {
-		this.onlineInstructions = onlineInstructions;
-	}
-
-	public Set<ScribeAttachmentDTO> getOnlineInstructionsFiles() {
-		return onlineInstructionsFiles;
-	}
-
-	public void setOnlineInstructionsFiles(
-			Set<ScribeAttachmentDTO> onlineInstructionsFiles) {
-		this.onlineInstructionsFiles = onlineInstructionsFiles;
-	}
-
 	public String getTitle() {
 		return title;
 	}
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java,v
diff -u -r1.8 -r1.9
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java	16 Nov 2007 07:49:40 -0000	1.8
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java	17 Jan 2014 22:12:31 -0000	1.9
@@ -61,19 +61,13 @@
 	private String title;
 
 	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;
@@ -82,44 +76,12 @@
 
 	private Long toolContentId;
 
-	private Set scribeAttachments;
-
 	private Set scribeSessions;
 	
 	private Set scribeHeadings;
 	
 	private boolean showAggregatedReports;
-	
-	//*********** NON Persisit fields
-	private IToolContentHandler toolContentHandler;
 
-	// Constructors
-
-	/** default constructor */
-	public Scribe() {
-	}
-
-	/** full constructor */
-	public Scribe(Date createDate, Date updateDate, Long createBy, String title,
-			String instructions, boolean runOffline,
-			String onlineInstructions, String offlineInstructions,
-			boolean contentInUse, boolean defineLater, Long toolContentId,
-			Set scribeAttachments, Set scribeSessions) {
-		this.createDate = createDate;
-		this.updateDate = updateDate;
-		this.createBy = createBy;
-		this.title = title;
-		this.instructions = instructions;
-		this.runOffline = runOffline;
-		this.onlineInstructions = onlineInstructions;
-		this.offlineInstructions = offlineInstructions;
-		this.contentInUse = contentInUse;
-		this.defineLater = defineLater;
-		this.toolContentId = toolContentId;
-		this.scribeAttachments = scribeAttachments;
-		this.scribeSessions = scribeSessions;
-	}
-
 	// Property accessors
 	/**
 	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
@@ -200,19 +162,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"
 	 * 
 	 */
@@ -258,34 +207,8 @@
 	public void setReflectInstructions(String reflectInstructions) {
 		this.reflectInstructions = reflectInstructions;
 	}
-	
-	/**
-	 * @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"
 	 * 
 	 */
@@ -325,21 +248,6 @@
 	}
 
 	/**
-	 * @hibernate.set lazy="false" inverse="false" cascade="all-delete-orphan"
-	 * @hibernate.collection-key column="scribe_uid"
-	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.scribe.model.ScribeAttachment"
-	 * 
-	 */
-
-	public Set getScribeAttachments() {
-		return this.scribeAttachments;
-	}
-
-	public void setScribeAttachments(Set scribeAttachments) {
-		this.scribeAttachments = scribeAttachments;
-	}
-
-	/**
 	 * @hibernate.set lazy="true" inverse="true" cascade="none"
 	 * @hibernate.collection-key column="scribe_uid"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.scribe.model.ScribeSession"
@@ -421,10 +329,8 @@
 		return result;
 	}
 
-	public static Scribe newInstance(Scribe fromContent, Long toContentId,
-			IToolContentHandler scribeToolContentHandler) {
+	public static Scribe newInstance(Scribe fromContent, Long toContentId) {
 		Scribe toContent = new Scribe();
-		fromContent.toolContentHandler = scribeToolContentHandler;
 		toContent = (Scribe) fromContent.clone();
 		toContent.setToolContentId(toContentId);
 		toContent.setCreateDate(new Date());
@@ -437,20 +343,6 @@
 		try {
 			scribe = (Scribe) super.clone();
 			scribe.setUid(null);
-
-			if (scribeAttachments != null) {
-				// create a copy of the attachments
-				Iterator iter = scribeAttachments.iterator();
-				Set<ScribeAttachment> set = new HashSet<ScribeAttachment>();
-				while (iter.hasNext()) {
-					ScribeAttachment originalFile = (ScribeAttachment) iter.next();
-					ScribeAttachment newFile = (ScribeAttachment) originalFile
-							.clone();
-					newFile.setScribe(scribe);
-					set.add(newFile);
-				}
-				scribe.scribeAttachments = set;
-			}
 			
 			if (scribeHeadings != null) {
 				// create copy of headings
@@ -477,12 +369,4 @@
 		}
 		return scribe;
 	}
-
-	public IToolContentHandler getToolContentHandler() {
-		return toolContentHandler;
-	}
-
-	public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-		this.toolContentHandler = toolContentHandler;
-	}
 }
\ No newline at end of file
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java,v
diff -u -r1.8 -r1.9
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java	26 Feb 2009 19:19:21 -0000	1.8
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java	17 Jan 2014 22:12:31 -0000	1.9
@@ -27,7 +27,6 @@
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.scribe.model.Scribe;
-import org.lamsfoundation.lams.tool.scribe.model.ScribeAttachment;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeSession;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeUser;
 import org.lamsfoundation.lams.tool.scribe.util.ScribeException;
@@ -65,28 +64,6 @@
     public Scribe getScribeByContentId(Long toolContentID);
 
     /**
-     * @param toolContentId
-     * @param file
-     * @param type
-     * @return
-     */
-    public ScribeAttachment uploadFileToContent(Long toolContentId, FormFile file, String type);
-
-    /**
-     * @param uuid
-     * @param versionID
-     */
-    public void deleteFromRepository(Long uuid, Long versionID) throws ScribeException;
-
-    /**
-     * @param contentID
-     * @param uuid
-     * @param versionID
-     * @param type
-     */
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type);
-
-    /**
      * @param scribe
      */
     public void saveOrUpdateScribe(Scribe scribe);
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeImportContentVersionFilter.java	17 Jan 2014 22:12:31 -0000	1.1
@@ -0,0 +1,44 @@
+/**************************************************************** 
+ * 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: ScribeImportContentVersionFilter.java,v 1.1 2014/01/17 22:12:31 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.scribe.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.scribe.model.Scribe;
+
+/**
+ * Import filter class for different version of Scribe content.
+ * 
+ */
+public class ScribeImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20090226 version content to 20140102 version tool server.
+     */
+    public void up20090226To20140102() {
+	this.removeField(Scribe.class, "runOffline");
+	this.removeField(Scribe.class, "onlineInstructions");
+	this.removeField(Scribe.class, "offlineInstructions");
+	this.removeField(Scribe.class, "scribeAttachments");
+    }
+}
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java,v
diff -u -r1.25 -r1.26
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	29 Jul 2013 23:12:09 -0000	1.25
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	17 Jan 2014 22:12:31 -0000	1.26
@@ -64,13 +64,11 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.scribe.dao.IScribeAttachmentDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeHeadingDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeSessionDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeUserDAO;
 import org.lamsfoundation.lams.tool.scribe.model.Scribe;
-import org.lamsfoundation.lams.tool.scribe.model.ScribeAttachment;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeHeading;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeReportEntry;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeSession;
@@ -104,18 +102,12 @@
 
     private IScribeUserDAO scribeUserDAO = null;
 
-    private IScribeAttachmentDAO scribeAttachmentDAO = null;
-
     private ILearnerService learnerService;
 
     private ILamsToolService toolService;
 
     private IToolContentHandler scribeToolContentHandler = null;
 
-    private IRepositoryService repositoryService = null;
-
-    private IAuditService auditService = null;
-
     private IExportToolContentService exportContentService;
 
     private ICoreNotebookService coreNotebookService;
@@ -205,28 +197,10 @@
 	    // create the fromContent using the default tool content
 	    fromContent = getDefaultContent();
 	}
-	Scribe toContent = Scribe.newInstance(fromContent, toContentId, scribeToolContentHandler);
+	Scribe toContent = Scribe.newInstance(fromContent, toContentId);
 	scribeDAO.saveOrUpdate(toContent);
     }
 
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Scribe scribe = scribeDAO.getByContentId(toolContentId);
-	if (scribe == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	scribe.setDefineLater(value);
-	scribeDAO.saveOrUpdate(scribe);
-    }
-
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Scribe scribe = scribeDAO.getByContentId(toolContentId);
-	if (scribe == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	scribe.setRunOffline(value);
-	scribeDAO.saveOrUpdate(scribe);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	// TODO Auto-generated method stub
@@ -252,22 +226,15 @@
 
 	// set ResourceToolContentHandler as null to avoid copy file node in
 	// repository again.
-	scribe = Scribe.newInstance(scribe, toolContentId, null);
-	scribe.setToolContentHandler(null);
+	scribe = Scribe.newInstance(scribe, toolContentId);
 	scribe.setScribeSessions(null);
-	// wipe out the links from ScribeAttachments, ScribeHeading back to Scribe, or it will try to
+	// wipe out the links from ScribeHeading back to Scribe, or it will try to
 	// include the hibernate object version of the Scribe within the XML
-	Set<ScribeAttachment> atts = scribe.getScribeAttachments();
-	for (ScribeAttachment att : atts) {
-	    att.setScribe(null);
-	}
 	Set<ScribeHeading> headings = scribe.getScribeHeadings();
 	for (ScribeHeading heading : headings) {
 	    heading.setScribe(null);
 	}
 	try {
-	    exportContentService.registerFileClassForExport(ScribeAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, scribe, scribeToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -283,9 +250,9 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(ScribeAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(ScribeImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, scribeToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof Scribe)) {
@@ -390,7 +357,7 @@
 	Scribe defaultContent = getDefaultContent();
 	// create new scribe using the newContentID
 	Scribe newContent = new Scribe();
-	newContent = Scribe.newInstance(defaultContent, newContentID, scribeToolContentHandler);
+	newContent = Scribe.newInstance(defaultContent, newContentID);
 	scribeDAO.saveOrUpdate(newContent);
 	return newContent;
     }
@@ -423,38 +390,6 @@
 	return scribeUserDAO.getByUID(uid);
     }
 
-    public ScribeAttachment uploadFileToContent(Long toolContentId, FormFile file, String type) {
-	if (file == null || StringUtils.isEmpty(file.getFileName())) {
-	    throw new ScribeException("Could not find upload file: " + file);
-	}
-
-	NodeKey nodeKey = processFile(file, type);
-
-	ScribeAttachment attachment = new ScribeAttachment();
-	attachment.setFileType(type);
-	attachment.setFileUuid(nodeKey.getUuid());
-	attachment.setFileVersionId(nodeKey.getVersion());
-	attachment.setFileName(file.getFileName());
-	attachment.setCreateDate(new Date());
-
-	return attachment;
-    }
-
-    public void deleteFromRepository(Long uuid, Long versionID) throws ScribeException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new ScribeException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type) {
-	scribeDAO.deleteInstructionFile(contentID, uuid, versionID, type);
-
-    }
-
     public void saveOrUpdateScribe(Scribe scribe) {
 	scribeDAO.saveOrUpdate(scribe);
     }
@@ -477,73 +412,9 @@
 	return toolService.isGroupedActivity(toolContentID);
     }
 
-    public IAuditService getAuditService() {
-	return auditService;
-    }
-
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
-    }
-
-    /* ********** Private methods ********** */
-
-    private NodeKey processFile(FormFile file, String type) {
-	NodeKey node = null;
-	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
-	    String fileName = file.getFileName();
-	    try {
-		node = getScribeToolContentHandler().uploadFile(file.getInputStream(), fileName, file.getContentType(),
-			type);
-	    } catch (InvalidParameterException e) {
-		throw new ScribeException("InvalidParameterException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (FileNotFoundException e) {
-		throw new ScribeException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-	    } catch (RepositoryCheckedException e) {
-		throw new ScribeException("RepositoryCheckedException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (IOException e) {
-		throw new ScribeException("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 ScribeException {
-	ICredentials credentials = new SimpleCredentials(ScribeToolContentHandler.repositoryUser,
-		ScribeToolContentHandler.repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials, ScribeToolContentHandler.repositoryWorkspaceName);
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new ScribeException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new ScribeException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new ScribeException("Login failed." + e.getMessage());
-	}
-    }
-
     /* ********** Used by Spring to "inject" the linked objects ************* */
 
-    public IScribeAttachmentDAO getScribeAttachmentDAO() {
-	return scribeAttachmentDAO;
-    }
 
-    public void setScribeAttachmentDAO(IScribeAttachmentDAO attachmentDAO) {
-	scribeAttachmentDAO = attachmentDAO;
-    }
-
     public IScribeDAO getScribeDAO() {
 	return scribeDAO;
     }
@@ -608,14 +479,6 @@
 	this.coreNotebookService = coreNotebookService;
     }
 
-    public IRepositoryService getRepositoryService() {
-	return repositoryService;
-    }
-
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
     public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) {
 	return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry);
     }
@@ -643,11 +506,8 @@
 	scribe.setCreateDate(now);
 	scribe.setDefineLater(Boolean.FALSE);
 	scribe.setInstructions(null);
-	scribe.setOfflineInstructions(null);
-	scribe.setOnlineInstructions(null);
 	scribe.setReflectInstructions(null);
 	scribe.setReflectOnActivity(Boolean.FALSE);
-	scribe.setRunOffline(Boolean.FALSE);
 	scribe.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 	scribe.setToolContentId(toolContentId);
 	scribe.setUpdateDate(now);
@@ -681,7 +541,6 @@
 	}
 
 	// leave as empty, no need to set them to anything.
-	// setScribeAttachments(Set scribeAttachments);
 	// setScribeSessions(Set scribeSessions);
 	scribeDAO.saveOrUpdate(scribe);
     }
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeConstants.java,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeConstants.java	17 Sep 2006 06:28:16 -0000	1.2
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeConstants.java	17 Jan 2014 22:12:32 -0000	1.3
@@ -34,8 +34,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_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java,v
diff -u -r1.14 -r1.15
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	5 May 2008 05:26:58 -0000	1.14
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	17 Jan 2014 22:12:31 -0000	1.15
@@ -47,7 +47,6 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.scribe.model.Scribe;
-import org.lamsfoundation.lams.tool.scribe.model.ScribeAttachment;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeHeading;
 import org.lamsfoundation.lams.tool.scribe.service.IScribeService;
 import org.lamsfoundation.lams.tool.scribe.service.ScribeServiceProxy;
@@ -60,8 +59,6 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
- * @author
- * @version
  * 
  * @struts.action path="/authoring" name="authoringForm" parameter="dispatch"
  *                scope="request" validate="false"
@@ -86,16 +83,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";
-
 	private static final String KEY_HEADINGS = "headings";
 
 	/**
@@ -180,24 +167,6 @@
 		ToolAccessMode mode = (ToolAccessMode) map.get(KEY_MODE);
 		updateScribe(scribe, authForm, mode);
 
-		// remove attachments marked for deletion.
-		Set<ScribeAttachment> attachments = scribe.getScribeAttachments();
-		if (attachments == null) {
-			attachments = new HashSet<ScribeAttachment>();
-		}
-
-		for (ScribeAttachment att : getAttList(KEY_DELETED_FILES, map)) {
-			// remove from db, leave in repository
-			attachments.remove(att);
-		}
-
-		// add unsaved attachments
-		attachments.addAll(getAttList(KEY_UNSAVED_ONLINE_FILES, map));
-		attachments.addAll(getAttList(KEY_UNSAVED_OFFLINE_FILES, map));
-
-		// set attachments in case it didn't exist
-		scribe.setScribeAttachments(attachments);
-
 		// update headings.
 		List<ScribeHeading> updatedHeadings = getHeadingList(map);
 		Set currentHeadings = scribe.getScribeHeadings();
@@ -258,44 +227,6 @@
 		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);
-	}
-
 	public ActionForward loadHeadingForm(ActionMapping mapping,
 			ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
@@ -406,126 +337,6 @@
 
 	/* ========== Private Methods ********** */
 
-	private ActionForward uploadFile(ActionMapping mapping,
-			AuthoringForm authForm, String type, HttpServletRequest request) {
-		SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-		FormFile file;
-		List<ScribeAttachment> unsavedFiles;
-		List<ScribeAttachment> savedFiles;
-		if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-			file = (FormFile) authForm.getOfflineFile();
-			unsavedFiles = getAttList(KEY_UNSAVED_OFFLINE_FILES, map);
-
-			savedFiles = getAttList(KEY_OFFLINE_FILES, map);
-		} else {
-			file = (FormFile) authForm.getOnlineFile();
-			unsavedFiles = getAttList(KEY_UNSAVED_ONLINE_FILES, map);
-
-			savedFiles = getAttList(KEY_ONLINE_FILES, map);
-		}
-
-		// validate file max size
-		ActionMessages errors = new ActionMessages();
-		FileValidatorUtil.validateFileSize(file, true, errors);
-		if (!errors.isEmpty()) {
-			request.setAttribute(ScribeConstants.ATTR_SESSION_MAP, map);
-			this.saveErrors(request, errors);
-			return mapping.findForward("success");
-		}
-
-		if (file.getFileName().length() != 0) {
-
-			// upload file to repository
-			ScribeAttachment newAtt = scribeService.uploadFileToContent(
-					(Long) map.get(KEY_TOOL_CONTENT_ID), file, type);
-
-			// Add attachment to unsavedFiles
-			// check to see if file with same name exists
-			ScribeAttachment currAtt;
-			Iterator iter = savedFiles.iterator();
-			while (iter.hasNext()) {
-				currAtt = (ScribeAttachment) iter.next();
-				if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
-						&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
-					// move from this this list to deleted list.
-					getAttList(KEY_DELETED_FILES, map).add(currAtt);
-					iter.remove();
-					break;
-				}
-			}
-			unsavedFiles.add(newAtt);
-
-			request.setAttribute(ScribeConstants.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(KEY_OFFLINE_FILES, map);
-		} else {
-			fileList = getAttList(KEY_ONLINE_FILES, map);
-		}
-
-		Iterator iter = fileList.iterator();
-
-		while (iter.hasNext()) {
-			ScribeAttachment att = (ScribeAttachment) iter.next();
-
-			if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-				// move to delete file list, deleted at next updateContent
-				getAttList(KEY_DELETED_FILES, map).add(att);
-
-				// remove from this list
-				iter.remove();
-				break;
-			}
-		}
-
-		request.setAttribute(ScribeConstants.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(KEY_UNSAVED_OFFLINE_FILES, map);
-		} else {
-			unsavedFiles = getAttList(KEY_UNSAVED_ONLINE_FILES, map);
-		}
-
-		Iterator iter = unsavedFiles.iterator();
-		while (iter.hasNext()) {
-			ScribeAttachment att = (ScribeAttachment) iter.next();
-
-			if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-				// delete from repository and list
-				scribeService.deleteFromRepository(att.getFileUuid(), att
-						.getFileVersionId());
-				iter.remove();
-				break;
-			}
-		}
-
-		request.setAttribute(ScribeConstants.ATTR_SESSION_MAP, map);
-		request.setAttribute("unsavedChanges", new Boolean(true));
-
-		return mapping.findForward("success");
-	}
-
 	/**
 	 * Updates Scribe content using AuthoringForm inputs.
 	 * 
@@ -538,8 +349,6 @@
 		scribe.setTitle(authForm.getTitle());
 		scribe.setInstructions(authForm.getInstructions());
 		if (mode.isAuthor()) { // Teacher cannot modify following
-			scribe.setOfflineInstructions(authForm.getOnlineInstruction());
-			scribe.setOnlineInstructions(authForm.getOfflineInstruction());
 			scribe.setReflectOnActivity(authForm.isReflectOnActivity());
 			scribe.setReflectInstructions(authForm.getReflectInstructions());
 			scribe.setAutoSelectScribe(authForm.isAutoSelectScribe());
@@ -557,8 +366,6 @@
 	private void updateAuthForm(AuthoringForm authForm, Scribe scribe) {
 		authForm.setTitle(scribe.getTitle());
 		authForm.setInstructions(scribe.getInstructions());
-		authForm.setOnlineInstruction(scribe.getOnlineInstructions());
-		authForm.setOfflineInstruction(scribe.getOfflineInstructions());
 		authForm.setReflectOnActivity(scribe.isReflectOnActivity());
 		authForm.setReflectInstructions(scribe.getReflectInstructions());
 		authForm.setAutoSelectScribe(scribe.isAutoSelectScribe());
@@ -579,28 +386,10 @@
 		map.put(KEY_MODE, mode);
 		map.put(KEY_CONTENT_FOLDER_ID, contentFolderID);
 		map.put(KEY_TOOL_CONTENT_ID, toolContentID);
-		map.put(KEY_ONLINE_FILES, new LinkedList<ScribeAttachment>());
-		map.put(KEY_OFFLINE_FILES, new LinkedList<ScribeAttachment>());
-		map.put(KEY_UNSAVED_ONLINE_FILES, new LinkedList<ScribeAttachment>());
-		map.put(KEY_UNSAVED_OFFLINE_FILES, new LinkedList<ScribeAttachment>());
-		map.put(KEY_DELETED_FILES, new LinkedList<ScribeAttachment>());
 		map.put(KEY_HEADINGS, new LinkedList<ScribeHeading>());
 
-		// adding attachments
-		Iterator iter = scribe.getScribeAttachments().iterator();
-		while (iter.hasNext()) {
-			ScribeAttachment attachment = (ScribeAttachment) iter.next();
-			String type = attachment.getFileType();
-			if (type.equals(IToolContentHandler.TYPE_OFFLINE)) {
-				getAttList(KEY_OFFLINE_FILES, map).add(attachment);
-			}
-			if (type.equals(IToolContentHandler.TYPE_ONLINE)) {
-				getAttList(KEY_ONLINE_FILES, map).add(attachment);
-			}
-		}
-
 		// adding headings
-		iter = scribe.getScribeHeadings().iterator();
+		Iterator iter = scribe.getScribeHeadings().iterator();
 		while (iter.hasNext()) {
 			ScribeHeading element = (ScribeHeading) iter.next();
 			getHeadingList(map).add(element);
@@ -630,18 +419,6 @@
 		return mode;
 	}
 
-	/**
-	 * Retrieves a List of attachments from the map using the key.
-	 * 
-	 * @param key
-	 * @param map
-	 * @return
-	 */
-	private List<ScribeAttachment> getAttList(String key,
-			SessionMap<String, Object> map) {
-		return (List<ScribeAttachment>) map.get(key);
-	}
-
 	private List<ScribeHeading> getHeadingList(SessionMap<String, Object> map) {
 		return (List<ScribeHeading>) map.get(KEY_HEADINGS);
 	}
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	9 Apr 2013 12:45:43 -0000	1.16
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	17 Jan 2014 22:12:31 -0000	1.17
@@ -74,7 +74,6 @@
  *                name="learningForm"
  * @struts.action-forward name="learning" path="tiles:/learning/main"
  * @struts.action-forward name="scribe" path="tiles:/learning/scribe"
- * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  * @struts.action-forward name="waitForScribe" path="tiles:/learning/waitForScribe"
  * @struts.action-forward name="notebook" path="tiles:/learning/notebook"
@@ -170,11 +169,6 @@
 		request.setAttribute("MODE", mode.toString());
 		setupDTOs(request, scribeSession, scribeUser);
 
-		// check runOffline
-		if (scribe.isRunOffline()) {
-			return mapping.findForward("runOffline");
-		}
-
 		// check force complete
 		if (scribeSession.isForceComplete()) {
 			// go to report page
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java,v
diff -u -r1.11 -r1.12
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java	6 Jan 2014 08:42:17 -0000	1.11
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java	17 Jan 2014 22:12:32 -0000	1.12
@@ -99,27 +99,7 @@
 
 		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 {
-        	IScribeService service = ScribeServiceProxy.getScribeService(getServletContext());
-
-        	Scribe content = null;
-            if ( toolContentID != null ) {
-            	content = service.getScribeByContentId(toolContentID);
-            } else {
-            	ScribeSession session=service.getSessionBySessionId(toolSessionID);
-            	if ( session != null )
-            		content = session.getScribe();
-            }
-            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 ScribeException {
Index: lams_tool_scribe/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/web/WEB-INF/tiles-defs.xml	30 Jul 2012 18:53:23 -0000	1.1
+++ lams_tool_scribe/web/WEB-INF/tiles-defs.xml	17 Jan 2014 22:12:32 -0000	1.2
@@ -111,10 +111,6 @@
 	<definition name="tiles:/learning/scribe" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/scribe.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_scribe/web/includes/javascript/authoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/includes/javascript/authoring.js,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/web/includes/javascript/authoring.js	26 Oct 2006 02:32:30 -0000	1.2
+++ lams_tool_scribe/web/includes/javascript/authoring.js	17 Jan 2014 22:12:31 -0000	1.3
@@ -17,9 +17,4 @@
 	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_scribe/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/authoring/authoring.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_scribe/web/pages/authoring/authoring.jsp	14 Dec 2006 03:55:47 -0000	1.6
+++ lams_tool_scribe/web/pages/authoring/authoring.jsp	17 Jan 2014 22:12:31 -0000	1.7
@@ -1,13 +1,9 @@
 <%@ include file="/common/taglibs.jsp"%>
-<%@ page
-	import="org.lamsfoundation.lams.tool.scribe.util.ScribeConstants"%>
+<%@ page import="org.lamsfoundation.lams.tool.scribe.util.ScribeConstants"%>
 
-<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" />
@@ -20,7 +16,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>
 	</div>
@@ -35,9 +30,6 @@
 		</div>
 
 		<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">
@@ -47,14 +39,11 @@
 			</logic:messagesPresent>			
 		</div>
 
-		<lams:help toolSignature="<%=ScribeConstants.TOOL_SIGNATURE%>"
-			module="authoring" />
+		<lams:help toolSignature="<%=ScribeConstants.TOOL_SIGNATURE%>" module="authoring" />
 
 		<%-- Page tabs --%>
 		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
 		<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-		<lams:TabBody id="3" titleKey="button.instructions"
-			page="instructions.jsp" />
 
 		<lams:AuthoringButton formID="authoringForm"
 			clearSessionActionUrl="/clearsession.do" toolSignature="lascrb11"
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_scribe/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_scribe/web/pages/learning/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_scribe/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/web/pages/monitoring/monitoring.jsp	4 May 2007 03:36:57 -0000	1.3
+++ lams_tool_scribe/web/pages/monitoring/monitoring.jsp	17 Jan 2014 22:12:31 -0000	1.4
@@ -4,19 +4,17 @@
 <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>
 </div>
 
 <div id="content">
 	<lams:help toolSignature="<%= ScribeConstants.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_spreadsheet/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml	13 Jul 2008 08:53:49 -0000	1.3
+++ lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml	17 Jan 2014 22:12:26 -0000	1.4
@@ -36,39 +36,6 @@
 			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
 		</action>
 		
-		<!-- ==========  Instrcutions File: online/offline ========== -->
-		<action path="/authoring/uploadOnlineFile"
-			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.AuthoringAction"
-			name="spreadsheetForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOnlineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/uploadOfflineFile"
-			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.AuthoringAction"
-			name="spreadsheetForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOfflineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/deleteOnlineFile"
-			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.AuthoringAction"
-			name="spreadsheetForm" 
-			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.spreadsheet.web.action.AuthoringAction"
-			name="spreadsheetForm" 
-			scope="request" 
-			validate="false"
-			parameter="deleteOfflineFile">
-			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
-		</action>
 
 		<!-- ==========  Review Item  ========== -->
 		<action path="/reviewItem"
@@ -82,8 +49,7 @@
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.LearningAction"
 			parameter="start">
 			<forward name="success" path="/pages/learning/start.jsp" />
-			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
-			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />			
+			<forward name="defineLater" path="/pages/learning/definelater.jsp" />		
 		</action>
 		<action path="/learning/init"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.LearningAction"
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java,v
diff -u -r1.4 -r1.5
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java	11 Feb 2011 08:18:44 -0000	1.4
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java	17 Jan 2014 22:12:26 -0000	1.5
@@ -42,7 +42,6 @@
 	public static final String PARAM_FILE_UUID = "fileUuid";
 	public static final String PARAM_ITEM_INDEX = "itemIndex";
 	public static final String PARAM_RESOURCE_ITEM_UID = "itemUid";	
-	public static final String PARAM_RUN_OFFLINE = "runOffline";
 	public static final String PARAM_OPEN_URL_POPUP = "popupUrl";
 	public static final String PARAM_TITLE = "title";
 	
@@ -51,9 +50,7 @@
 	public static final String ATTR_TOOL_SESSION_ID = "toolSessionID"; 
 	public static final String ATTR_INSTRUCTION_LIST = "instructionList";
 	public static final String ATTR_RESOURCE_ITEM_LIST = "spreadsheetList";
-	public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
 	public static final String ATTR_DELETED_RESOURCE_ITEM_LIST = "deleteSpreadsheetList";
-	public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
 	public static final String ATTR_RESOURCE = "spreadsheet";
 	public static final String ATTR_RESOURCE_ITEM_UID = "itemUid";
 	public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl";	
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	26 Mar 2009 10:00:40 -0000	1.3
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	17 Jan 2014 22:12:25 -0000	1.4
@@ -32,12 +32,6 @@
         </property>
     </bean>
 
-   <bean id="spreadsheetAttachmentDao" class="org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate.SpreadsheetAttachmentDAOHibernate">
-        <property name="sessionFactory">
-            <ref bean="coreSessionFactory"/>
-        </property>
-    </bean>
-
    <bean id="spreadsheetUserDao" class="org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate.SpreadsheetUserDAOHibernate">
         <property name="sessionFactory">
             <ref bean="coreSessionFactory"/>
@@ -66,9 +60,6 @@
         <property name="spreadsheetMarkDao">
             <ref local="spreadsheetMarkDao"/>
         </property>
-        <property name="spreadsheetAttachmentDao">
-            <ref local="spreadsheetAttachmentDao"/>
-        </property>
         <property name="spreadsheetUserDao">
             <ref local="spreadsheetUserDao"/>
         </property>
@@ -78,18 +69,12 @@
         <property name="spreadsheetToolContentHandler">
             <ref local="spreadsheetToolContentHandler"/>
         </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>
@@ -115,9 +100,7 @@
                 <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="release*">PROPAGATION_REQUIRED</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="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>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/SpreadsheetAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetAttachmentDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20140102.sql	17 Jan 2014 22:12:25 -0000	1.1
@@ -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_lasprd10_spreadsheet DROP COLUMN online_instructions;
+ALTER TABLE tl_lasprd10_spreadsheet DROP COLUMN offline_instructions;
+ALTER TABLE tl_lasprd10_spreadsheet DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lasprd10_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lasprd10';
+
+----------------------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_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java,v
diff -u -r1.2 -r1.3
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java	23 Jul 2008 04:46:03 -0000	1.2
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java	17 Jan 2014 22:12:25 -0000	1.3
@@ -23,487 +23,356 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.spreadsheet.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.spreadsheet.util.SpreadsheetToolContentHandler;
 
 /**
  * Spreadsheet
+ * 
  * @author Andrey Balan
- *
- * @hibernate.class  table="tl_lasprd10_spreadsheet"
- *
+ * 
+ * @hibernate.class table="tl_lasprd10_spreadsheet"
+ * 
  */
 public class Spreadsheet implements Cloneable {
-	
-	private static final Logger log = Logger.getLogger(Spreadsheet.class);
-	
-	//key 
-	private Long uid;
-	//tool contentID
-	private Long contentId;
-	private String title;
-	private String instructions;
-	private String code;
-	
-	//advance
-	private boolean runOffline;
-	private boolean isLearnerAllowedToSave;
-	private boolean isMarkingEnabled;
-	
-	private boolean lockWhenFinished;
-	private boolean defineLater;
-	private boolean contentInUse;
-	//instructions
-	private String onlineInstructions;
-	private String offlineInstructions;
-	private Set attachments;
-	
-	//general infomation
-	private Date created;
-	private Date updated;
-	private SpreadsheetUser createdBy;
-	
-	private boolean reflectOnActivity;
-	private String reflectInstructions;
-	
-	//*************** NON Persist Fields ********************
-	private IToolContentHandler toolContentHandler;
 
-	private List<SpreadsheetAttachment> onlineFileList;
-	private List<SpreadsheetAttachment> offlineFileList;
-	/**
-	 * Default contruction method. 
-	 *
-	 */
-  	public Spreadsheet(){
-  		attachments = new HashSet();
-  	}
-//  **********************************************************
-  	//		Function method for Spreadsheet
-//  **********************************************************
-	public static Spreadsheet newInstance(Spreadsheet defaultContent, Long contentId, SpreadsheetToolContentHandler spreadsheetToolContentHandler) {
-		Spreadsheet toContent = new Spreadsheet();
-		defaultContent.toolContentHandler = spreadsheetToolContentHandler;
-		toContent = (Spreadsheet) defaultContent.clone();
-		toContent.setContentId(contentId);
-		
-		//reset user info as well
-		if(toContent.getCreatedBy() != null){
-			toContent.getCreatedBy().setSpreadsheet(toContent);
-		}
-		return toContent;
-	}
-  	public Object clone(){
-  		
-  		Spreadsheet spreadsheet = null;
-  		try{
-  			spreadsheet = (Spreadsheet) super.clone();
-  			spreadsheet.setUid(null);
-  			//clone attachment
-  			if(attachments != null){
-  				Iterator iter = attachments.iterator();
-  				Set set = new HashSet();
-  				while(iter.hasNext()){
-  					SpreadsheetAttachment file = (SpreadsheetAttachment)iter.next(); 
-  					SpreadsheetAttachment newFile = (SpreadsheetAttachment) file.clone();
-  					//just clone old file without duplicate it in repository
-					set.add(newFile);
-  				}
-  				spreadsheet.attachments = set;
-  			}
-  			//clone ReourceUser as well
-  			if(this.createdBy != null){
-  				spreadsheet.setCreatedBy((SpreadsheetUser) this.createdBy.clone());
-  			}
-		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + Spreadsheet.class + " failed");
-		}
-  		
-  		return spreadsheet;
-  	}
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (!(o instanceof Spreadsheet))
-			return false;
+    private static final Logger log = Logger.getLogger(Spreadsheet.class);
 
-		final Spreadsheet genericEntity = (Spreadsheet) o;
+    // key
+    private Long uid;
+    // tool contentID
+    private Long contentId;
+    private String title;
+    private String instructions;
+    private String code;
 
-      	return new EqualsBuilder()
-      	.append(this.uid,genericEntity.uid)
-      	.append(this.title,genericEntity.title)
-      	.append(this.instructions,genericEntity.instructions)
-      	.append(this.code,genericEntity.code)
-      	.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)
-      	.isEquals();
-	}
+    // advance
+    private boolean isLearnerAllowedToSave;
+    private boolean isMarkingEnabled;
 
-	public int hashCode() {
-		return new HashCodeBuilder().append(uid).append(title)
-		.append(instructions).append(onlineInstructions)
-		.append(code).append(code)
-		.append(offlineInstructions).append(created)
-		.append(updated).append(createdBy)
-		.toHashCode();
+    private boolean lockWhenFinished;
+    private boolean defineLater;
+    private boolean contentInUse;
+
+    // general infomation
+    private Date created;
+    private Date updated;
+    private SpreadsheetUser createdBy;
+
+    private boolean reflectOnActivity;
+    private String reflectInstructions;
+
+    // **********************************************************
+    // Function method for Spreadsheet
+    // **********************************************************
+    public static Spreadsheet newInstance(Spreadsheet defaultContent, Long contentId) {
+	Spreadsheet toContent = new Spreadsheet();
+	toContent = (Spreadsheet) defaultContent.clone();
+	toContent.setContentId(contentId);
+
+	// reset user info as well
+	if (toContent.getCreatedBy() != null) {
+	    toContent.getCreatedBy().setSpreadsheet(toContent);
 	}
-	
-	/**
-	 * Updates the modification data for this entity.
-	 */
-	public void updateModificationData() {
-	
-		long now = System.currentTimeMillis();
-		if (created == null) {
-			this.setCreated (new Date(now));
-		}
-		this.setUpdated(new Date(now));
-	}
+	return toContent;
+    }
 
-	public void toDTO(){
-		onlineFileList = new ArrayList<SpreadsheetAttachment>();
-		offlineFileList = new ArrayList<SpreadsheetAttachment>();
-		Set<SpreadsheetAttachment> fileSet = this.getAttachments();
-		if(fileSet != null){
-			for(SpreadsheetAttachment file:fileSet){
-				if(StringUtils.equalsIgnoreCase(file.getFileType(),IToolContentHandler.TYPE_OFFLINE))
-					offlineFileList.add(file);
-				else
-					onlineFileList.add(file);
-			}
-		}
+    public Object clone() {
+
+	Spreadsheet spreadsheet = null;
+	try {
+	    spreadsheet = (Spreadsheet) super.clone();
+	    spreadsheet.setUid(null);
+	    // clone ReourceUser as well
+	    if (this.createdBy != null) {
+		spreadsheet.setCreatedBy((SpreadsheetUser) this.createdBy.clone());
+	    }
+	} catch (CloneNotSupportedException e) {
+	    log.error("When clone " + Spreadsheet.class + " failed");
 	}
-	
-	//**********************************************************
-	// get/set methods
-	//**********************************************************
-	/**
-	 * Returns the object's creation date
-	 *
-	 * @return date
-	 * @hibernate.property column="create_date"
-	 */
-	public Date getCreated() {
-      return created;
-	}
-	/**
-	 * Sets the object's creation date
-	 *
-	 * @param created
-	 */
-	public void setCreated(Date created) {
-	    this.created = created;
-	}
 
-	/**
-	 * Returns the object's date of last update
-	 *
-	 * @return date updated
-	 * @hibernate.property column="update_date"
-	 */
-	public Date getUpdated() {
-        return updated;
+	return spreadsheet;
+    }
+
+    public boolean equals(Object o) {
+	if (this == o)
+	    return true;
+	if (!(o instanceof Spreadsheet))
+	    return false;
+
+	final Spreadsheet genericEntity = (Spreadsheet) o;
+
+	return new EqualsBuilder().append(this.uid, genericEntity.uid).append(this.title, genericEntity.title)
+		.append(this.instructions, genericEntity.instructions).append(this.code, genericEntity.code)
+		.append(this.created, genericEntity.created).append(this.updated, genericEntity.updated)
+		.append(this.createdBy, genericEntity.createdBy).isEquals();
+    }
+
+    public int hashCode() {
+	return new HashCodeBuilder().append(uid).append(title).append(instructions).append(code).append(code)
+		.append(created).append(updated).append(createdBy).toHashCode();
+    }
+
+    /**
+     * Updates the modification data for this entity.
+     */
+    public void updateModificationData() {
+
+	long now = System.currentTimeMillis();
+	if (created == null) {
+	    this.setCreated(new Date(now));
 	}
-	/**
-	 * Sets the object's date of last update
-	 *
-	 * @param updated
-	 */
-	public void setUpdated(Date updated) {
-        this.updated = updated;
-	}
+	this.setUpdated(new Date(now));
+    }
 
+    // **********************************************************
+    // get/set methods
+    // **********************************************************
     /**
+     * Returns the object's creation date
+     * 
+     * @return date
+     * @hibernate.property column="create_date"
+     */
+    public Date getCreated() {
+	return created;
+    }
+
+    /**
+     * Sets the object's creation date
+     * 
+     * @param created
+     */
+    public void setCreated(Date created) {
+	this.created = created;
+    }
+
+    /**
+     * Returns the object's date of last update
+     * 
+     * @return date updated
+     * @hibernate.property column="update_date"
+     */
+    public Date getUpdated() {
+	return updated;
+    }
+
+    /**
+     * Sets the object's date of last update
+     * 
+     * @param updated
+     */
+    public void setUpdated(Date updated) {
+	this.updated = updated;
+    }
+
+    /**
      * @return Returns the userid of the user who created the Share spreadsheet.
-     *
-     * @hibernate.many-to-one
-     *      cascade="save-update"
-     * 		column="create_by"
+     * 
+     * @hibernate.many-to-one cascade="save-update" column="create_by"
      */
     public SpreadsheetUser getCreatedBy() {
-        return createdBy;
+	return createdBy;
     }
+
     /**
-     * @param createdBy The userid of the user who created this Share spreadsheet.
+     * @param createdBy
+     *            The userid of the user who created this Share spreadsheet.
      */
     public void setCreatedBy(SpreadsheetUser createdBy) {
-        this.createdBy = createdBy;
+	this.createdBy = createdBy;
     }
 
     /**
      * @hibernate.id column="uid" generator-class="native"
      */
-	public Long getUid() {
-		return uid;
-	}
-	public void setUid(Long uid) {
-		this.uid = uid;
-	}
+    public Long getUid() {
+	return uid;
+    }
 
-	/**
-	 * @return Returns the title.
-	 *
-	 * @hibernate.property
-	 * 		column="title"
-	 */
-	public String getTitle() {
-		return title;
-	}
-	/**
-	 * @param title The title to set.
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
+    public void setUid(Long uid) {
+	this.uid = uid;
+    }
 
-	/**
-	 * @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) {
-		this.runOffline = forceOffline;
-	}
-	
-	/**
-	 * @return Returns whether learner is allowed to save spreadsheet.
-	 *
-	 * @hibernate.property column="is_learner_allowed_to_save"
-	 */
-	public boolean isLearnerAllowedToSave() {
-		return isLearnerAllowedToSave;
-	}
-	/**
-	 * @param isLearnerAllowedToSave boolean describing whether learner is allowed to save spreadsheet or not
-	 */
-	public void setLearnerAllowedToSave(boolean isLearnerAllowedToSave) {
-		this.isLearnerAllowedToSave = isLearnerAllowedToSave;
-	}
-	
-	/**
-	 * @return Returns whether the marking is enabled.
-	 *
-	 * @hibernate.property column="is_marking_enabled"
-	 */
-	public boolean isMarkingEnabled() {
-		return isMarkingEnabled;
-	}
-	/**
-	 * @param isMarkingEnabled boolean describing wwhether the marking is enabled
-	 */
-	public void setMarkingEnabled(boolean isMarkingEnabled) {
-		this.isMarkingEnabled = isMarkingEnabled;
-	}
+    /**
+     * @return Returns the title.
+     * 
+     * @hibernate.property column="title"
+     */
+    public String getTitle() {
+	return title;
+    }
 
     /**
+     * @param title
+     *            The title to set.
+     */
+    public void setTitle(String title) {
+	this.title = title;
+    }
+
+    /**
+     * @return Returns whether learner is allowed to save spreadsheet.
+     * 
+     * @hibernate.property column="is_learner_allowed_to_save"
+     */
+    public boolean isLearnerAllowedToSave() {
+	return isLearnerAllowedToSave;
+    }
+
+    /**
+     * @param isLearnerAllowedToSave
+     *            boolean describing whether learner is allowed to save spreadsheet or not
+     */
+    public void setLearnerAllowedToSave(boolean isLearnerAllowedToSave) {
+	this.isLearnerAllowedToSave = isLearnerAllowedToSave;
+    }
+
+    /**
+     * @return Returns whether the marking is enabled.
+     * 
+     * @hibernate.property column="is_marking_enabled"
+     */
+    public boolean isMarkingEnabled() {
+	return isMarkingEnabled;
+    }
+
+    /**
+     * @param isMarkingEnabled
+     *            boolean describing wwhether the marking is enabled
+     */
+    public void setMarkingEnabled(boolean isMarkingEnabled) {
+	this.isMarkingEnabled = isMarkingEnabled;
+    }
+
+    /**
      * @return Returns the lockWhenFinish.
-     *
-     * @hibernate.property
-     * 		column="lock_on_finished"
+     * 
+     * @hibernate.property column="lock_on_finished"
      */
     public boolean getLockWhenFinished() {
-        return lockWhenFinished;
+	return lockWhenFinished;
     }
+
     /**
-     * @param lockWhenFinished Set to true to lock the spreadsheet for finished users.
+     * @param lockWhenFinished
+     *            Set to true to lock the spreadsheet for finished users.
      */
     public void setLockWhenFinished(boolean lockWhenFinished) {
-        this.lockWhenFinished = lockWhenFinished;
+	this.lockWhenFinished = lockWhenFinished;
     }
 
     /**
      * @return Returns the instructions set by the teacher.
-     *
-     * @hibernate.property
-     * 		column="instructions"
-     *      type="text"
+     * 
+     * @hibernate.property column="instructions" type="text"
      */
     public String getInstructions() {
-        return instructions;
+	return instructions;
     }
+
     public void setInstructions(String instructions) {
-        this.instructions = instructions;
+	this.instructions = instructions;
     }
-    
+
     /**
      * @return Returns spreadsheet code.
-     *
-     * @hibernate.property
-     * 		column="code"
-     *      type="text"
+     * 
+     * @hibernate.property column="code" type="text"
      */
     public String getCode() {
-        return code;
+	return code;
     }
+
     public void setCode(String code) {
-    	this.code = code;
-//        this.code = javaScriptEscape(code);;
+	this.code = code;
+	// this.code = javaScriptEscape(code);;
     }
 
     /**
-     * @return Returns the onlineInstructions set by the teacher.
-     *
-     * @hibernate.property
-     * 		column="online_instructions"
-     *      type="text"
+     * @hibernate.property column="content_in_use"
+     * @return
      */
-    public String getOnlineInstructions() {
-        return onlineInstructions;
+    public boolean isContentInUse() {
+	return contentInUse;
     }
-    public void setOnlineInstructions(String onlineInstructions) {
-        this.onlineInstructions = onlineInstructions;
+
+    public void setContentInUse(boolean contentInUse) {
+	this.contentInUse = contentInUse;
     }
 
     /**
-     * @return Returns the onlineInstructions set by the teacher.
-     *
-     * @hibernate.property
-     * 		column="offline_instructions"
-     *      type="text"
+     * @hibernate.property column="define_later"
+     * @return
      */
-    public String getOfflineInstructions() {
-        return offlineInstructions;
+    public boolean isDefineLater() {
+	return defineLater;
     }
-    public void setOfflineInstructions(String offlineInstructions) {
-        this.offlineInstructions = offlineInstructions;
+
+    public void setDefineLater(boolean defineLater) {
+	this.defineLater = defineLater;
     }
 
-	/**
-     *
-     * @hibernate.set   lazy="true"
-     * 					cascade="all"
-     * 					inverse="false"
-     * 					order-by="create_date desc"
-     * @hibernate.collection-key column="spreadsheet_uid"
-     * @hibernate.collection-one-to-many
-     * 			class="org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetAttachment"
-     *
-     * @return a set of Attachments to this Message.
+    /**
+     * @hibernate.property column="content_id" unique="true"
+     * @return
      */
-	public Set getAttachments() {
-		return attachments;
-	}
+    public Long getContentId() {
+	return contentId;
+    }
+
+    public void setContentId(Long contentId) {
+	this.contentId = contentId;
+    }
+
     /**
-	 * @param attachments The attachments to set.
+     * @hibernate.property column="reflect_instructions"
+     * @return
      */
-    public void setAttachments(Set attachments) {
-		this.attachments = attachments;
-	}
+    public String getReflectInstructions() {
+	return reflectInstructions;
+    }
 
-	/**
-	 * @hibernate.property  column="content_in_use"
-	 * @return
-	 */
-	public boolean isContentInUse() {
-		return contentInUse;
-	}
-	public void setContentInUse(boolean contentInUse) {
-		this.contentInUse = contentInUse;
-	}
-	
-	/**
-	 * @hibernate.property column="define_later"
-	 * @return
-	 */
-	public boolean isDefineLater() {
-		return defineLater;
-	}
-	public void setDefineLater(boolean defineLater) {
-		this.defineLater = defineLater;
-	}
-	
-	/**
-	 * @hibernate.property column="content_id" unique="true" 
-	 * @return
-	 */
-	public Long getContentId() {
-		return contentId;
-	}
-	public void setContentId(Long contentId) {
-		this.contentId = contentId;
-	}
+    public void setReflectInstructions(String reflectInstructions) {
+	this.reflectInstructions = reflectInstructions;
+    }
 
-	public List<SpreadsheetAttachment> getOfflineFileList() {
-		return offlineFileList;
-	}
-	public void setOfflineFileList(List<SpreadsheetAttachment> offlineFileList) {
-		this.offlineFileList = offlineFileList;
-	}
-	
-	public List<SpreadsheetAttachment> getOnlineFileList() {
-		return onlineFileList;
-	}
-	public void setOnlineFileList(List<SpreadsheetAttachment> onlineFileList) {
-		this.onlineFileList = onlineFileList;
-	}
-	
-	public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-		this.toolContentHandler = toolContentHandler;
-	}
+    /**
+     * @hibernate.property column="reflect_on_activity"
+     * @return
+     */
+    public boolean isReflectOnActivity() {
+	return reflectOnActivity;
+    }
 
-	/**
-	 * @hibernate.property column="reflect_instructions"
-	 * @return
-	 */	
-	public String getReflectInstructions() {
-		return reflectInstructions;
+    public void setReflectOnActivity(boolean reflectOnActivity) {
+	this.reflectOnActivity = reflectOnActivity;
+    }
+
+    private static String javaScriptEscape(String input) {
+	StringBuffer filtered = new StringBuffer();
+
+	for (char c : input.toCharArray()) {
+	    switch (c) {
+	    case '\'':
+		filtered.append("\\'");
+		break;
+
+	    case '"':
+		filtered.append("\\\"");
+		break;
+
+	    case '\n':
+	    case '\r':
+		break;
+
+	    default:
+		filtered.append(c);
+	    }
 	}
-	public void setReflectInstructions(String reflectInstructions) {
-		this.reflectInstructions = reflectInstructions;
-	}
-	
-	/**
-	 * @hibernate.property column="reflect_on_activity"
-	 * @return
-	 */		
-	public boolean isReflectOnActivity() {
-		return reflectOnActivity;
-	}
-	public void setReflectOnActivity(boolean reflectOnActivity) {
-		this.reflectOnActivity = reflectOnActivity;
-	}
-	
-	private static String javaScriptEscape(String input) {
-		StringBuffer filtered = new StringBuffer();
-		
-		for ( char c : input.toCharArray() ) {
-			switch (c) {
-				case '\'':
-					filtered.append("\\'");
-				break;
-				
-				case '"':
-					filtered.append("\\\"");
-				break;
-					
-				case '\n': case '\r':					
-				break;
-				
-				default:
-					filtered.append(c);			
-			}
-		}		
-		return filtered.toString();
-	}
+	return filtered.toString();
+    }
 }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java,v
diff -u -r1.5 -r1.6
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java	11 Feb 2011 08:18:44 -0000	1.5
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java	17 Jan 2014 22:12:25 -0000	1.6
@@ -27,13 +27,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.spreadsheet.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.spreadsheet.dto.StatisticDTO;
 import org.lamsfoundation.lams.tool.spreadsheet.dto.Summary;
 import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet;
-import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetAttachment;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
 import org.lamsfoundation.lams.tool.spreadsheet.model.UserModifiedSpreadsheet;
@@ -61,15 +59,6 @@
 	 */
 	Spreadsheet getDefaultContent(Long contentId) throws SpreadsheetApplicationException;
 	
-	/**
-	 * Upload instruciton file into repository.
-	 * @param file
-	 * @param type
-	 * @return
-	 * @throws UploadSpreadsheetFileException
-	 */
-	SpreadsheetAttachment uploadInstructionFile(FormFile file, String type) throws UploadSpreadsheetFileException;
-	
 	//********** user methods *************
 	/**
 	 * Save or update SpreadsheetUser in database, mostly for saving userModifiedSpreadsheet.
@@ -114,25 +103,12 @@
 	 * @return
 	 */
 	SpreadsheetUser getUser(Long uid);
-	
-	//********** Repository methods ***********************
-	/**
-	 * Delete file from repository.
-	 */
-	void deleteFromRepository(Long fileUuid, Long fileVersionId) throws SpreadsheetApplicationException ;
 
 	/**
 	 * Save or update spreadsheet into database.
 	 * @param Spreadsheet
 	 */
 	void saveOrUpdateSpreadsheet(Spreadsheet Spreadsheet);
-	/**
-	 * Delete reource attachment(i.e., offline/online instruction file) from database. This method does not
-	 * delete the file from repository.
-	 * 
-	 * @param attachmentUid
-	 */
-	void deleteSpreadsheetAttachment(Long attachmentUid);
 	
 	/**
 	 * Get spreadsheet which is relative with the special toolSession.
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetImportContentVersionFilter.java	17 Jan 2014 22:12:25 -0000	1.1
@@ -0,0 +1,44 @@
+/**************************************************************** 
+ * 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: SpreadsheetImportContentVersionFilter.java,v 1.1 2014/01/17 22:12:25 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.spreadsheet.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet;
+
+/**
+ * Import filter class for different version of Spreadsheet content.
+ * 
+ */
+public class SpreadsheetImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20080612 version content to 20140102 version tool server.
+     */
+    public void up20080612To20140102() {
+	this.removeField(Spreadsheet.class, "runOffline");
+	this.removeField(Spreadsheet.class, "onlineInstructions");
+	this.removeField(Spreadsheet.class, "offlineInstructions");
+	this.removeField(Spreadsheet.class, "attachments");
+    }
+}
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java,v
diff -u -r1.9 -r1.10
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	29 Jul 2013 23:12:06 -0000	1.9
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	17 Jan 2014 22:12:25 -0000	1.10
@@ -71,7 +71,6 @@
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
-import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetAttachmentDAO;
 import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetDAO;
 import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetMarkDAO;
 import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetSessionDAO;
@@ -81,7 +80,6 @@
 import org.lamsfoundation.lams.tool.spreadsheet.dto.StatisticDTO;
 import org.lamsfoundation.lams.tool.spreadsheet.dto.Summary;
 import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet;
-import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetAttachment;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetMark;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
@@ -103,7 +101,6 @@
 	ToolContentImport102Manager {
     static Logger log = Logger.getLogger(SpreadsheetServiceImpl.class.getName());
     private SpreadsheetDAO spreadsheetDao;
-    private SpreadsheetAttachmentDAO spreadsheetAttachmentDao;
     private SpreadsheetUserDAO spreadsheetUserDao;
     private SpreadsheetSessionDAO spreadsheetSessionDao;
     private UserModifiedSpreadsheetDAO userModifiedSpreadsheetDao;
@@ -112,82 +109,17 @@
     private SpreadsheetToolContentHandler spreadsheetToolContentHandler;
     private MessageService messageService;
     // system services
-    private IRepositoryService repositoryService;
     private ILamsToolService toolService;
     private ILearnerService learnerService;
-    private IAuditService auditService;
     private IUserManagementService userManagementService;
     private IExportToolContentService exportContentService;
     private ICoreNotebookService coreNotebookService;
 
     // *******************************************************************************
     // 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 SpreadsheetApplicationException {
 
-	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.";
-	    SpreadsheetServiceImpl.log.error(error);
-	    throw new SpreadsheetApplicationException(error, e);
-
-	} catch (Exception e) {
-
-	    String error = "Unable to access repository to get file uuid " + uuid + " version id " + versionId
-		    + " path " + relativePath + "." + " Exception: " + e.getMessage();
-	    SpreadsheetServiceImpl.log.error(error);
-	    throw new SpreadsheetApplicationException(error, e);
-
-	}
-    }
-
-    /**
-     * This method verifies the credentials of the Spreadsheet 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 SpreadsheetApplicationException
-     */
-    private ITicket getRepositoryLoginTicket() throws SpreadsheetApplicationException {
-	ICredentials credentials = new SimpleCredentials(spreadsheetToolContentHandler.getRepositoryUser(),
-		spreadsheetToolContentHandler.getRepositoryId());
-	try {
-	    ITicket ticket = repositoryService.login(credentials, spreadsheetToolContentHandler
-		    .getRepositoryWorkspaceName());
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new SpreadsheetApplicationException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new SpreadsheetApplicationException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new SpreadsheetApplicationException("Login failed." + e.getMessage());
-	}
-    }
-
     public Spreadsheet getSpreadsheetByContentId(Long contentId) {
 	Spreadsheet rs = spreadsheetDao.getByContentId(contentId);
 	if (rs == null) {
@@ -206,31 +138,10 @@
 	Spreadsheet defaultContent = getDefaultSpreadsheet();
 	// save default content by given ID.
 	Spreadsheet content = new Spreadsheet();
-	content = Spreadsheet.newInstance(defaultContent, contentId, spreadsheetToolContentHandler);
+	content = Spreadsheet.newInstance(defaultContent, contentId);
 	return content;
     }
 
-    public SpreadsheetAttachment uploadInstructionFile(FormFile uploadFile, String fileType)
-	    throws UploadSpreadsheetFileException {
-	if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
-	    throw new UploadSpreadsheetFileException(messageService.getMessage("error.msg.upload.file.not.found",
-		    new Object[] { uploadFile }));
-	}
-
-	// upload file to repository
-	NodeKey nodeKey = processFile(uploadFile, fileType);
-
-	// create new attachement
-	SpreadsheetAttachment file = new SpreadsheetAttachment();
-	file.setFileType(fileType);
-	file.setFileUuid(nodeKey.getUuid());
-	file.setFileVersionId(nodeKey.getVersion());
-	file.setFileName(uploadFile.getFileName());
-	file.setCreated(new Date());
-
-	return file;
-    }
-
     public void saveOrUpdateUser(SpreadsheetUser spreadsheetUser) {
 	spreadsheetUserDao.saveObject(spreadsheetUser);
     }
@@ -252,25 +163,10 @@
 	return userList;
     }
 
-    public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws SpreadsheetApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, fileUuid, fileVersionId);
-	} catch (Exception e) {
-	    throw new SpreadsheetApplicationException("Exception occured while deleting files from"
-		    + " the repository " + e.getMessage());
-	}
-    }
-
     public void saveOrUpdateSpreadsheet(Spreadsheet spreadsheet) {
 	spreadsheetDao.saveObject(spreadsheet);
     }
 
-    public void deleteSpreadsheetAttachment(Long attachmentUid) {
-	spreadsheetAttachmentDao.removeObject(SpreadsheetAttachment.class, attachmentUid);
-
-    }
-
     public List<Summary> exportForLearner(Long sessionId, SpreadsheetUser learner) {
 	SpreadsheetSession session = spreadsheetSessionDao.getSessionBySessionId(sessionId);
 	if (session == null) {
@@ -320,7 +216,7 @@
 	// for(SpreadsheetItem item:sessList){
 	// if(skipHide && item.isHide())
 	// continue;
-	//			
+	//
 	// //to skip all item create by author
 	// if(!item.isCreateByAuthor()){
 	// Summary sum = new Summary(session.getSessionId(), session.getSessionName(),item,false);
@@ -509,7 +405,7 @@
 	    }
 	}
     }
-    
+
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
@@ -540,86 +436,9 @@
 	return contentId;
     }
 
-    /**
-     * Process an uploaded file.
-     * 
-     * @throws SpreadsheetApplicationException
-     * @throws FileNotFoundException
-     * @throws IOException
-     * @throws RepositoryCheckedException
-     * @throws InvalidParameterException
-     */
-    private NodeKey processFile(FormFile file, String fileType) throws UploadSpreadsheetFileException {
-	NodeKey node = null;
-	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
-	    String fileName = file.getFileName();
-	    try {
-		node = spreadsheetToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType(),
-			fileType);
-	    } catch (InvalidParameterException e) {
-		throw new UploadSpreadsheetFileException(messageService.getMessage("error.msg.invaid.param.upload"));
-	    } catch (FileNotFoundException e) {
-		throw new UploadSpreadsheetFileException(messageService.getMessage("error.msg.file.not.found"));
-	    } catch (RepositoryCheckedException e) {
-		throw new UploadSpreadsheetFileException(messageService.getMessage("error.msg.repository"));
-	    } catch (IOException e) {
-		throw new UploadSpreadsheetFileException(messageService.getMessage("error.msg.io.exception"));
-	    }
-	}
-	return node;
-    }
-
-    private NodeKey processPackage(String packageDirectory, String initFile) throws UploadSpreadsheetFileException {
-	NodeKey node = null;
-	try {
-	    node = spreadsheetToolContentHandler.uploadPackage(packageDirectory, initFile);
-	} catch (InvalidParameterException e) {
-	    throw new UploadSpreadsheetFileException(messageService.getMessage("error.msg.invaid.param.upload"));
-	} catch (RepositoryCheckedException e) {
-	    throw new UploadSpreadsheetFileException(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;
-	}
-    }
-
     // *****************************************************************************
     // set methods for Spring Bean
     // *****************************************************************************
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
-    }
-
     public void setLearnerService(ILearnerService learnerService) {
 	this.learnerService = learnerService;
     }
@@ -632,14 +451,6 @@
 	return messageService;
     }
 
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
-    public void setSpreadsheetAttachmentDao(SpreadsheetAttachmentDAO spreadsheetAttachmentDao) {
-	this.spreadsheetAttachmentDao = spreadsheetAttachmentDao;
-    }
-
     public void setSpreadsheetDao(SpreadsheetDAO spreadsheetDao) {
 	this.spreadsheetDao = spreadsheetDao;
     }
@@ -686,13 +497,8 @@
 	}
 
 	// set SpreadsheetToolContentHandler as null to avoid copy file node in repository again.
-	toolContentObj = Spreadsheet.newInstance(toolContentObj, toolContentId, null);
-	toolContentObj.setToolContentHandler(null);
-	toolContentObj.setOfflineFileList(null);
-	toolContentObj.setOnlineFileList(null);
+	toolContentObj = Spreadsheet.newInstance(toolContentObj, toolContentId);
 	try {
-	    exportContentService.registerFileClassForExport(SpreadsheetAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, spreadsheetToolContentHandler,
 		    rootPath);
 	} catch (ExportToolContentException e) {
@@ -704,9 +510,9 @@
 	    String toVersion) throws ToolException {
 
 	try {
-	    exportContentService.registerFileClassForImport(SpreadsheetAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(SpreadsheetImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, spreadsheetToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof Spreadsheet)) {
@@ -766,30 +572,14 @@
 	    }
 	}
 
-	Spreadsheet toContent = Spreadsheet.newInstance(spreadsheet, toContentId, spreadsheetToolContentHandler);
+	Spreadsheet toContent = Spreadsheet.newInstance(spreadsheet, toContentId);
 	spreadsheetDao.saveObject(toContent);
     }
-    
+
     public String getToolContentTitle(Long toolContentId) {
 	return getSpreadsheetByContentId(toolContentId).getTitle();
     }
-   
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Spreadsheet spreadsheet = spreadsheetDao.getByContentId(toolContentId);
-	if (spreadsheet == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	spreadsheet.setDefineLater(value);
-    }
 
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Spreadsheet spreadsheet = spreadsheetDao.getByContentId(toolContentId);
-	if (spreadsheet == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	spreadsheet.setRunOffline(value);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	Spreadsheet spreadsheet = spreadsheetDao.getByContentId(toolContentId);
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java	25 Jul 2013 05:55:20 -0000	1.3
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java	17 Jan 2014 22:12:25 -0000	1.4
@@ -50,7 +50,6 @@
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
 import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet;
-import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetAttachment;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
 import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService;
 import org.lamsfoundation.lams.tool.spreadsheet.service.UploadSpreadsheetFileException;
@@ -64,483 +63,250 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-
 /**
- * @author Steve.Ni
- * @version $Revision$
  */
 public class AuthoringAction extends Action {
 
-	private static Logger log = Logger.getLogger(AuthoringAction.class);
-	
-	public ActionForward execute(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
-		String param = mapping.getParameter();
-		//-----------------------Spreadsheet Author function ---------------------------
-		if(param.equals("start")){
-			ToolAccessMode mode = getAccessMode(request);
-			//teacher mode "check for new" button enter.
-			if(mode != null)
-				request.setAttribute(AttributeNames.ATTR_MODE,mode.toString());
-			else
-				request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR.toString());
-			return start(mapping, form, request, response);
-		}
-		if (param.equals("definelater")) {
-			//update define later flag to true
-			Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-			ISpreadsheetService service = getSpreadsheetService();
-			Spreadsheet spreadsheet = service.getSpreadsheetByContentId(contentId);
-			
-			spreadsheet.setDefineLater(true);
-			service.saveOrUpdateSpreadsheet(spreadsheet);
-			
-			request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER.toString());
-			return start(mapping, form, request, response);
-		}		
-	  	if (param.equals("initPage")) {
-       		return initPage(mapping, form, request, response);
-        }
+    private static Logger log = Logger.getLogger(AuthoringAction.class);
 
-	  	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);
-        }
+    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
 
-        return mapping.findForward(SpreadsheetConstants.ERROR);
+	String param = mapping.getParameter();
+	// -----------------------Spreadsheet Author function ---------------------------
+	if (param.equals("start")) {
+	    ToolAccessMode mode = getAccessMode(request);
+	    // teacher mode "check for new" button enter.
+	    if (mode != null)
+		request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	    else
+		request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString());
+	    return start(mapping, form, request, response);
 	}
+	if (param.equals("definelater")) {
+	    // update define later flag to true
+	    Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+	    ISpreadsheetService service = getSpreadsheetService();
+	    Spreadsheet spreadsheet = service.getSpreadsheetByContentId(contentId);
 
-	/**
-	 * Read spreadsheet data from database and put them into HttpSession. It will redirect to init.do directly after this
-	 * method run successfully. 
-	 *  
-	 * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
-	 * @throws ServletException 
-	 * 
-	 */
-	private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException {
-		
-		//save toolContentID into HTTPSession
-		Long contentId = new Long(WebUtil.readLongParam(request,SpreadsheetConstants.PARAM_TOOL_CONTENT_ID));
-		
-//		get back the spreadsheet and item list and display them on page
-		ISpreadsheetService service = getSpreadsheetService();
+	    spreadsheet.setDefineLater(true);
+	    service.saveOrUpdateSpreadsheet(spreadsheet);
 
-		Spreadsheet spreadsheet = null;
-		SpreadsheetForm spreadsheetForm = (SpreadsheetForm)form;
-		
-		// Get contentFolderID and save to form.
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		spreadsheetForm.setContentFolderID(contentFolderID);
-				
-		//initial Session Map 
-		SessionMap sessionMap = new SessionMap();
-		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-		spreadsheetForm.setSessionMapID(sessionMap.getSessionID());
-		
-		try {
-			spreadsheet = service.getSpreadsheetByContentId(contentId);
-			//if spreadsheet does not exist, try to use default content instead.
-			if(spreadsheet == null){
-				spreadsheet = service.getDefaultContent(contentId);
-			}
-			spreadsheetForm.setSpreadsheet(spreadsheet);
+	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
+	    return start(mapping, form, request, response);
+	}
+	if (param.equals("initPage")) {
+	    return initPage(mapping, form, request, response);
+	}
 
-			//initialize instruction attachment list
-			List attachmentList = getAttachmentList(sessionMap);
-			attachmentList.clear();
-			attachmentList.addAll(spreadsheet.getAttachments());
-		} catch (Exception e) {
-			log.error(e);
-			throw new ServletException(e);
-		}
-		
-		sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE_FORM, spreadsheetForm);
-		request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL,
-			request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL));
-		return mapping.findForward(SpreadsheetConstants.SUCCESS);
+	if (param.equals("updateContent")) {
+	    return updateContent(mapping, form, request, response);
 	}
 
+	return mapping.findForward(SpreadsheetConstants.ERROR);
+    }
 
-	/**
-	 * Display same entire authoring page content from HttpSession variable.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws ServletException 
-	 */
-	private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws ServletException {
-		String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
-		SpreadsheetForm existForm = (SpreadsheetForm) sessionMap.get(SpreadsheetConstants.ATTR_RESOURCE_FORM);
-		
-		SpreadsheetForm spreadsheetForm = (SpreadsheetForm )form;
-		try {
-			PropertyUtils.copyProperties(spreadsheetForm, existForm);
-		} catch (Exception e) {
-			throw new ServletException(e);
-		}
-		
-		ToolAccessMode mode = getAccessMode(request);
-		if(mode.isAuthor())
-			return mapping.findForward(SpreadsheetConstants.SUCCESS);
-		else
-			return mapping.findForward(SpreadsheetConstants.DEFINE_LATER);
-	}
-	/**
-	 * This method will persist all inforamtion in this authoring page, include all spreadsheet item, information etc.
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws ServletException 
-	 */
-	private ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,	HttpServletResponse response) throws Exception {
-		SpreadsheetForm spreadsheetForm = (SpreadsheetForm)(form);
-		
-		//get back sessionMAP
-		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(spreadsheetForm.getSessionMapID());
-		
-		ToolAccessMode mode = getAccessMode(request);
-    	
-		ActionMessages errors = validate(spreadsheetForm, mapping, request);
-		if(!errors.isEmpty()){
-			saveErrors(request, errors);
-			if(mode.isAuthor())
-	    		return mapping.findForward("author");
-	    	else
-	    		return mapping.findForward("monitor");			
-		}
-			
-		Spreadsheet spreadsheet = spreadsheetForm.getSpreadsheet();
-		ISpreadsheetService service = getSpreadsheetService();
-		
-		//**********************************Get Spreadsheet PO*********************
-		Spreadsheet spreadsheetPO = service.getSpreadsheetByContentId(spreadsheetForm.getSpreadsheet().getContentId());
-		if(spreadsheetPO == null){
-			//new Spreadsheet, create it.
-			spreadsheetPO = spreadsheet;
-			spreadsheetPO.setCreated(new Timestamp(new Date().getTime()));
-			spreadsheetPO.setUpdated(new Timestamp(new Date().getTime()));
-		}else{
-			if(mode.isAuthor()){
-				Long uid = spreadsheetPO.getUid();
-				PropertyUtils.copyProperties(spreadsheetPO,spreadsheet);
-				//get back UID
-				spreadsheetPO.setUid(uid);
-			}else{ //if it is Teacher, then just update basic tab content (definelater)
-				spreadsheetPO.setInstructions(spreadsheet.getInstructions());
-				spreadsheetPO.setCode(spreadsheet.getCode());
-				spreadsheetPO.setTitle(spreadsheet.getTitle());
-//				change define later status
-				spreadsheetPO.setDefineLater(false);
-			}
-			spreadsheetPO.setUpdated(new Timestamp(new Date().getTime()));
-		}
-		
-		//*******************************Handle user*******************
-		//try to get form system session
-		HttpSession ss = SessionManager.getSession();
-		//get back login user DTO
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		SpreadsheetUser spreadsheetUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue())
-						,spreadsheetForm.getSpreadsheet().getContentId());
-		if(spreadsheetUser == null){
-			spreadsheetUser = new SpreadsheetUser(user,spreadsheetPO);
-		}
+    /**
+     * Read spreadsheet data from database and put them into HttpSession. It will redirect to init.do directly after
+     * this method run successfully.
+     * 
+     * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
+     * 
+     * @throws ServletException
+     * 
+     */
+    private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
 
-		spreadsheetPO.setCreatedBy(spreadsheetUser);
-		
-		//**********************************Handle Authoring Instruction Attachement *********************
-    	//merge attachment info
-		//so far, attPOSet will be empty if content is existed. because PropertyUtils.copyProperties() is executed
-		Set attPOSet = spreadsheetPO.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()){
-			SpreadsheetAttachment newAtt = (SpreadsheetAttachment) 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()){
-			SpreadsheetAttachment delAtt = (SpreadsheetAttachment) 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()){
-					SpreadsheetAttachment att = (SpreadsheetAttachment) attIter.next();
-					if(delAtt.getUid().equals(att.getUid())){
-						attIter.remove();
-						break;
-					}
-				}
-				service.deleteSpreadsheetAttachment(delAtt.getUid());
-			}//end remove from persist value
-		}
-		
-		//copy back
-		spreadsheetPO.setAttachments(attPOSet);
-		
-		//finally persist spreadsheetPO again
-		service.saveOrUpdateSpreadsheet(spreadsheetPO);
-		
-		//initialize attachmentList again
-		attachmentList = getAttachmentList(sessionMap);
-		attachmentList.addAll(spreadsheet.getAttachments());
-		spreadsheetForm.setSpreadsheet(spreadsheetPO);
-		
-		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
-    	if(mode.isAuthor())
-    		return mapping.findForward("author");
-    	else
-    		return mapping.findForward("monitor");
-	}
+	// save toolContentID into HTTPSession
+	Long contentId = new Long(WebUtil.readLongParam(request, SpreadsheetConstants.PARAM_TOOL_CONTENT_ID));
 
-	/**
-	 * Handle upload online instruction files request. 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws UploadSpreadsheetFileException 
-	 */
-	public ActionForward uploadOnline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) throws UploadSpreadsheetFileException {
-		return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE,request);
-	}
-	/**
-	 * Handle upload offline instruction files request.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws UploadSpreadsheetFileException 
-	 */
-	public ActionForward uploadOffline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) throws UploadSpreadsheetFileException {
-		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 UploadSpreadsheetFileException 
-	 */
-	private ActionForward uploadFile(ActionMapping mapping, ActionForm form,
-			String type,HttpServletRequest request) throws UploadSpreadsheetFileException {
+	// get back the spreadsheet and item list and display them on page
+	ISpreadsheetService service = getSpreadsheetService();
 
-		SpreadsheetForm spreadsheetForm = (SpreadsheetForm) form;
-		//get back sessionMAP
-		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(spreadsheetForm.getSessionMapID());
+	Spreadsheet spreadsheet = null;
+	SpreadsheetForm spreadsheetForm = (SpreadsheetForm) form;
 
-		FormFile file;
-		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type))
-			file = (FormFile) spreadsheetForm.getOfflineFile();
-		else
-			file = (FormFile) spreadsheetForm.getOnlineFile();
-		
-		if(file == null || StringUtils.isBlank(file.getFileName()))
-			return mapping.findForward(SpreadsheetConstants.SUCCESS);
-		
-		//validate file size
-		ActionMessages errors = new ActionMessages();
-		FileValidatorUtil.validateFileSize(file, true, errors );
-		if(!errors.isEmpty()){
-			this.saveErrors(request, errors);
-			return mapping.findForward(SpreadsheetConstants.SUCCESS);
-		}
-		
-		ISpreadsheetService service = getSpreadsheetService();
-		//upload to repository
-		SpreadsheetAttachment  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();
-		SpreadsheetAttachment existAtt;
-		while(iter.hasNext()){
-			existAtt = (SpreadsheetAttachment) 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);
+	// Get contentFolderID and save to form.
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	spreadsheetForm.setContentFolderID(contentFolderID);
 
-		return mapping.findForward(SpreadsheetConstants.SUCCESS);
+	// initial Session Map
+	SessionMap sessionMap = new SessionMap();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	spreadsheetForm.setSessionMapID(sessionMap.getSessionID());
 
+	try {
+	    spreadsheet = service.getSpreadsheetByContentId(contentId);
+	    // if spreadsheet does not exist, try to use default content instead.
+	    if (spreadsheet == null) {
+		spreadsheet = service.getDefaultContent(contentId);
+	    }
+	    spreadsheetForm.setSpreadsheet(spreadsheet);
+	} catch (Exception e) {
+	    log.error(e);
+	    throw new ServletException(e);
 	}
-	/**
-	 * Delete offline instruction file from current Spreadsheet 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);
+
+	sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE_FORM, spreadsheetForm);
+	request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL,
+		request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL));
+	return mapping.findForward(SpreadsheetConstants.SUCCESS);
+    }
+
+    /**
+     * Display same entire authoring page content from HttpSession variable.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+    private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
+	String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SpreadsheetForm existForm = (SpreadsheetForm) sessionMap.get(SpreadsheetConstants.ATTR_RESOURCE_FORM);
+
+	SpreadsheetForm spreadsheetForm = (SpreadsheetForm) form;
+	try {
+	    PropertyUtils.copyProperties(spreadsheetForm, existForm);
+	} catch (Exception e) {
+	    throw new ServletException(e);
 	}
-	/**
-	 * Delete online instruction file from current Spreadsheet 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,SpreadsheetConstants.PARAM_FILE_VERSION_ID));
-		Long uuID = new Long(WebUtil.readLongParam(request,SpreadsheetConstants.PARAM_FILE_UUID));
-		
-		//get back sessionMAP
-		String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.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();
-		SpreadsheetAttachment existAtt;
-		while(iter.hasNext()){
-			existAtt = (SpreadsheetAttachment) 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();
-			}
-		}
+	ToolAccessMode mode = getAccessMode(request);
+	if (mode.isAuthor())
+	    return mapping.findForward(SpreadsheetConstants.SUCCESS);
+	else
+	    return mapping.findForward(SpreadsheetConstants.DEFINE_LATER);
+    }
 
-		request.setAttribute(SpreadsheetConstants.ATTR_FILE_TYPE_FLAG, type);
-		request.setAttribute(SpreadsheetConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-		return mapping.findForward(SpreadsheetConstants.SUCCESS);
+    /**
+     * This method will persist all inforamtion in this authoring page, include all spreadsheet item, information etc.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+    private ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	SpreadsheetForm spreadsheetForm = (SpreadsheetForm) (form);
 
+	// get back sessionMAP
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(spreadsheetForm.getSessionMapID());
+
+	ToolAccessMode mode = getAccessMode(request);
+
+	ActionMessages errors = validate(spreadsheetForm, mapping, request);
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    if (mode.isAuthor())
+		return mapping.findForward("author");
+	    else
+		return mapping.findForward("monitor");
 	}
-	//*************************************************************************************
-	// Private method 
-	//*************************************************************************************
-	/**
-	 * Return SpreadsheetService bean.
-	 */
-	private ISpreadsheetService getSpreadsheetService() {
-	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-	      return (ISpreadsheetService) wac.getBean(SpreadsheetConstants.RESOURCE_SERVICE);
-	}
-	/**
-	 * @param request
-	 * @return
-	 */
-	private List getAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap,SpreadsheetConstants.ATT_ATTACHMENT_LIST);
-	}
-	/**
-	 * @param request
-	 * @return
-	 */
-	private List getDeletedAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap,SpreadsheetConstants.ATTR_DELETED_ATTACHMENT_LIST);
-	}
 
-	/**
-	 * Get <code>java.util.List</code> from HttpSession by given name.
-	 * 
-	 * @param request
-	 * @param name
-	 * @return
-	 */
-	private List getListFromSession(SessionMap sessionMap,String name) {
-		List list = (List) sessionMap.get(name);
-		if(list == null){
-			list = new ArrayList();
-			sessionMap.put(name,list);
-		}
-		return list;
+	Spreadsheet spreadsheet = spreadsheetForm.getSpreadsheet();
+	ISpreadsheetService service = getSpreadsheetService();
+
+	// **********************************Get Spreadsheet PO*********************
+	Spreadsheet spreadsheetPO = service.getSpreadsheetByContentId(spreadsheetForm.getSpreadsheet().getContentId());
+	if (spreadsheetPO == null) {
+	    // new Spreadsheet, create it.
+	    spreadsheetPO = spreadsheet;
+	    spreadsheetPO.setCreated(new Timestamp(new Date().getTime()));
+	    spreadsheetPO.setUpdated(new Timestamp(new Date().getTime()));
+	} else {
+	    if (mode.isAuthor()) {
+		Long uid = spreadsheetPO.getUid();
+		PropertyUtils.copyProperties(spreadsheetPO, spreadsheet);
+		// get back UID
+		spreadsheetPO.setUid(uid);
+	    } else { // if it is Teacher, then just update basic tab content (definelater)
+		spreadsheetPO.setInstructions(spreadsheet.getInstructions());
+		spreadsheetPO.setCode(spreadsheet.getCode());
+		spreadsheetPO.setTitle(spreadsheet.getTitle());
+		// change define later status
+		spreadsheetPO.setDefineLater(false);
+	    }
+	    spreadsheetPO.setUpdated(new Timestamp(new Date().getTime()));
 	}
 
-	/**
-	 * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
-	 * @param request
-	 * @return
-	 */
-	private ToolAccessMode getAccessMode(HttpServletRequest request) {
-		ToolAccessMode mode;
-		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-		if(StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.TEACHER.toString()))
-			mode = ToolAccessMode.TEACHER;
-		else
-			mode = ToolAccessMode.AUTHOR;
-		return mode;
+	// *******************************Handle user*******************
+	// try to get form system session
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	SpreadsheetUser spreadsheetUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()),
+		spreadsheetForm.getSpreadsheet().getContentId());
+	if (spreadsheetUser == null) {
+	    spreadsheetUser = new SpreadsheetUser(user, spreadsheetPO);
 	}
-	
-	
-	private ActionMessages validate(SpreadsheetForm spreadsheetForm, ActionMapping mapping, HttpServletRequest request) {
-		ActionMessages errors = new ActionMessages();
-//		if (StringUtils.isBlank(spreadsheetForm.getSpreadsheet().getTitle())) {
-//			ActionMessage error = new ActionMessage("error.resource.item.title.blank");
-//			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-//		}
-		
-		//define it later mode(TEACHER) skip below validation.
-		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-		if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
-			return errors;
-		}
 
-		//Some other validation outside basic Tab.
-		
-		return errors;
+	spreadsheetPO.setCreatedBy(spreadsheetUser);
+
+	// finally persist spreadsheetPO again
+	service.saveOrUpdateSpreadsheet(spreadsheetPO);
+
+	spreadsheetForm.setSpreadsheet(spreadsheetPO);
+
+	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	if (mode.isAuthor())
+	    return mapping.findForward("author");
+	else
+	    return mapping.findForward("monitor");
+    }
+
+    // *************************************************************************************
+    // Private method
+    // *************************************************************************************
+    /**
+     * Return SpreadsheetService bean.
+     */
+    private ISpreadsheetService getSpreadsheetService() {
+	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		.getServletContext());
+	return (ISpreadsheetService) wac.getBean(SpreadsheetConstants.RESOURCE_SERVICE);
+    }
+
+    /**
+     * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
+     * 
+     * @param request
+     * @return
+     */
+    private ToolAccessMode getAccessMode(HttpServletRequest request) {
+	ToolAccessMode mode;
+	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+	if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString()))
+	    mode = ToolAccessMode.TEACHER;
+	else
+	    mode = ToolAccessMode.AUTHOR;
+	return mode;
+    }
+
+    private ActionMessages validate(SpreadsheetForm spreadsheetForm, ActionMapping mapping, HttpServletRequest request) {
+	ActionMessages errors = new ActionMessages();
+	// if (StringUtils.isBlank(spreadsheetForm.getSpreadsheet().getTitle())) {
+	// ActionMessage error = new ActionMessage("error.resource.item.title.blank");
+	// errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	// }
+
+	// define it later mode(TEACHER) skip below validation.
+	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+	if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
+	    return errors;
 	}
 
+	// Some other validation outside basic Tab.
+
+	return errors;
+    }
+
 }
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java,v
diff -u -r1.6 -r1.7
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	9 Apr 2013 12:47:21 -0000	1.6
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	17 Jan 2014 22:12:25 -0000	1.7
@@ -177,13 +177,6 @@
             	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
             		request, getServlet().getServletContext());
             	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
-
-		//add run offline support
-		if(spreadsheet.getRunOffline()){
-			sessionMap.put(SpreadsheetConstants.PARAM_RUN_OFFLINE, true);
-			return mapping.findForward("runOffline");
-		}else
-			sessionMap.put(SpreadsheetConstants.PARAM_RUN_OFFLINE, false);
 				
 		sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE,spreadsheet);
 		
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java,v
diff -u -r1.8 -r1.9
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java	15 Aug 2011 14:50:58 -0000	1.8
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java	17 Jan 2014 22:12:25 -0000	1.9
@@ -121,7 +121,6 @@
 		request.setAttribute(SpreadsheetConstants.ATTR_STATISTIC_LIST, statisticList);
 
 		Spreadsheet spreadsheet = service.getSpreadsheetByContentId(contentId);
-		spreadsheet.toDTO();
 
 		Map<Long, Set<ReflectDTO>> reflectList = service.getReflectList(contentId, false);
 
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java	23 Jul 2008 04:46:03 -0000	1.2
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java	17 Jan 2014 22:12:25 -0000	1.3
@@ -73,7 +73,6 @@
     	if(!StringUtils.equals(param,"start") && !StringUtils.equals(param,"initPage")){
 	    	spreadsheet.setLockWhenFinished(false);
 	    	spreadsheet.setDefineLater(false);
-	    	spreadsheet.setRunOffline(false);
 	    	spreadsheet.setLearnerAllowedToSave(true);
 	    	spreadsheet.setMarkingEnabled(false);
 	    	spreadsheet.setReflectOnActivity(false);
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java,v
diff -u -r1.6 -r1.7
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java	6 Jan 2014 08:42:13 -0000	1.6
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java	17 Jan 2014 22:12:26 -0000	1.7
@@ -113,27 +113,7 @@
 
 		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 {
 
-        	Spreadsheet content = null;
-            if ( toolContentID != null ) {
-            	content = service.getSpreadsheetByContentId(toolContentID);
-            } else {
-            	SpreadsheetSession session=service.getSessionBySessionId(toolSessionID);
-            	if ( session != null )
-            		content = session.getSpreadsheet();
-            }
-            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 SpreadsheetApplicationException {
 
 		if (userID == null || toolSessionID == null) {
Index: lams_tool_spreadsheet/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/authoring/authoring.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	27 Nov 2012 16:00:51 -0000	1.4
+++ lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	17 Jan 2014 22:12:25 -0000	1.5
@@ -27,18 +27,7 @@
 	    	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();
-        }
         
     	function onSubmitHandler() {
         	var code = window.frames["externalSpreadsheet"].cellsToJS();
@@ -60,7 +49,6 @@
 		<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:Tabs></div>
 		<!-- start tabs -->
 <div id="content">
@@ -85,17 +73,7 @@
 		<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) -->
-
 		<!-- 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="<%=SpreadsheetConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.spreadsheet.contentId}" 
 			 customiseSessionID="${formBean.sessionMapID}"
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/authoring/parts/instructionfilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/learning/runoffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp	11 Jul 2008 08:19:57 -0000	1.2
+++ lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp	17 Jan 2014 22:12:26 -0000	1.3
@@ -23,7 +23,7 @@
 		   		selectTab(tabId);
 
 	    		//for statistic page change:
-	    		if(tabId == 4) doStatistic();
+	    		if(tabId == 3) doStatistic();
 	       	} 
 	        
 		    function viewItem(itemUid,sessionMapID){
@@ -76,18 +76,16 @@
 	<div id="header">
 		<lams:Tabs useKey="true" control="true">
 			<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="<%= SpreadsheetConstants.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="statistics.jsp" />
+			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
+			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistics.jsp" />
 	</div>
 	<div id="footer"></div>