Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20140102.sql	17 Jan 2014 21:45:01 -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_lagmap10_gmap DROP COLUMN online_instructions;
+ALTER TABLE tl_lagmap10_gmap DROP COLUMN offline_instructions;
+ALTER TABLE tl_lagmap10_gmap DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lagmap10_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lagmap10';
+
+----------------------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_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java,v
diff -u -r1.10 -r1.11
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	29 Jul 2008 04:10:17 -0000	1.10
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	17 Jan 2014 21:45:01 -0000	1.11
@@ -25,17 +25,16 @@
 
 package org.lamsfoundation.lams.tool.gmap.dto;
 
+import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Set;
 import java.util.List;
+import java.util.Set;
 import java.util.TreeSet;
-import java.util.HashSet;
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
 import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
-import org.lamsfoundation.lams.tool.gmap.model.GmapAttachment;
 import org.lamsfoundation.lams.tool.gmap.model.GmapSession;
 
 /**
@@ -52,10 +51,6 @@
 	public String title;
 
 	public String instructions;
-
-	public String onlineInstructions;
-
-	public String offlineInstructions;
 	
 	public boolean defineLater;
 	
@@ -96,11 +91,7 @@
 	String defaultGeocoderAddress;
 	
 	public Set<GmapMarkerDTO> gmapMarkers = new HashSet<GmapMarkerDTO>();
-	
-	public Set<GmapAttachmentDTO> onlineInstructionsFiles;
 
-	public Set<GmapAttachmentDTO> offlineInstructionsFiles;
-
 	public Set<GmapSessionDTO> sessionDTOs = new TreeSet<GmapSessionDTO>();
 	
 	/* Constructors */
@@ -110,8 +101,6 @@
 		toolContentId = gmap.getToolContentId();
 		title = gmap.getTitle();
 		instructions = gmap.getInstructions();
-		onlineInstructions = gmap.getOnlineInstructions();
-		offlineInstructions = gmap.getOfflineInstructions();
 		contentInUse = gmap.isContentInUse();
 		//allowRichEditor = gmap.isAllowRichEditor();	
 		lockOnFinish = gmap.isLockOnFinished();
@@ -131,25 +120,6 @@
 		reflectInstructions = gmap.getReflectInstructions();
 		defaultGeocoderAddress = gmap.getDefaultGeocoderAddress();
 		
-		onlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
-		offlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
-
-		for (Iterator<GmapAttachment> i = gmap.getGmapAttachments().iterator(); i.hasNext();) {
-			GmapAttachment att = (GmapAttachment) i.next();
-			if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) {
-				GmapAttachmentDTO attDTO = new GmapAttachmentDTO(att);
-				offlineInstructionsFiles.add(attDTO);
-			} else if (att.getFileType()
-					.equals(IToolContentHandler.TYPE_ONLINE)) {
-				GmapAttachmentDTO attDTO = new GmapAttachmentDTO(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<GmapSession> iter = gmap.getGmapSessions().iterator(); iter.hasNext();) {
 			GmapSession session = (GmapSession) iter.next();
 			GmapSessionDTO sessionDTO = new GmapSessionDTO(session);			
@@ -174,40 +144,6 @@
 		this.instructions = instructions;
 	}
 
-	public String getOfflineInstructions() {
-		return offlineInstructions;
-	}
-
-	public void setOfflineInstructions(String offlineInstructions) {
-		this.offlineInstructions = offlineInstructions;
-	}
-
-	public Set<GmapAttachmentDTO> getOfflineInstructionsFiles() {
-		return offlineInstructionsFiles;
-	}
-
-	public void setOfflineInstructionsFiles(
-			Set<GmapAttachmentDTO> offlineInstructionsFiles) {
-		this.offlineInstructionsFiles = offlineInstructionsFiles;
-	}
-
-	public String getOnlineInstructions() {
-		return onlineInstructions;
-	}
-
-	public void setOnlineInstructions(String onlineInstructions) {
-		this.onlineInstructions = onlineInstructions;
-	}
-
-	public Set<GmapAttachmentDTO> getOnlineInstructionsFiles() {
-		return onlineInstructionsFiles;
-	}
-
-	public void setOnlineInstructionsFiles(
-			Set<GmapAttachmentDTO> onlineInstructionsFiles) {
-		this.onlineInstructionsFiles = onlineInstructionsFiles;
-	}
-
 	public String getTitle() {
 		return title;
 	}
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java,v
diff -u -r1.4 -r1.5
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java	18 Sep 2008 01:41:10 -0000	1.4
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java	17 Jan 2014 21:45:01 -0000	1.5
@@ -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_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java,v
diff -u -r1.13 -r1.14
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	18 Sep 2008 01:41:09 -0000	1.13
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	17 Jan 2014 21:45:01 -0000	1.14
@@ -26,9 +26,6 @@
 
 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;
@@ -40,13 +37,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.gmap.model.Gmap;
-import org.lamsfoundation.lams.tool.gmap.model.GmapAttachment;
 import org.lamsfoundation.lams.tool.gmap.model.GmapConfigItem;
 import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
 import org.lamsfoundation.lams.tool.gmap.model.GmapUser;
@@ -55,7 +48,6 @@
 import org.lamsfoundation.lams.tool.gmap.util.GmapConstants;
 import org.lamsfoundation.lams.tool.gmap.web.forms.AuthoringForm;
 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;
@@ -85,16 +77,6 @@
 
 	private static final String KEY_MODE = "mode";
 
-	private static final String KEY_ONLINE_FILES = "onlineFiles";
-
-	private static final String KEY_OFFLINE_FILES = "offlineFiles";
-
-	private static final String KEY_UNSAVED_ONLINE_FILES = "unsavedOnlineFiles";
-
-	private static final String KEY_UNSAVED_OFFLINE_FILES = "unsavedOfflineFiles";
-
-	private static final String KEY_DELETED_FILES = "deletedFiles";
-
 	/**
 	 * Default method when no dispatch parameter is specified. It is expected
 	 * that the parameter <code>toolContentID</code> will be passed in. This
@@ -196,31 +178,13 @@
 		
 		
 		updateGmap(gmap, authForm, mode, gmapUser);
-
-		// remove attachments marked for deletion.
-		Set<GmapAttachment> attachments = gmap.getGmapAttachments();
-		if (attachments == null) {
-			attachments = new HashSet<GmapAttachment>();
-		}
 		
 		// do the same for the gmap markers
 		Set<GmapMarker> markers = gmap.getGmapMarkers();
 		if (markers == null) {
 			markers = new HashSet<GmapMarker>();
 		}
 
-		for (GmapAttachment 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
-		gmap.setGmapAttachments(attachments);
-
 		// set the update date
 		gmap.setUpdateDate(new Date());
 
@@ -247,166 +211,9 @@
 		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<GmapAttachment> unsavedFiles;
-		List<GmapAttachment> 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(GmapConstants.ATTR_SESSION_MAP, map);
-			this.saveErrors(request, errors);
-			return mapping.findForward("success");
-		}
-
-		if (file.getFileName().length() != 0) {
-
-			// upload file to repository
-			GmapAttachment newAtt = gmapService.uploadFileToContent(
-					(Long) map.get(KEY_TOOL_CONTENT_ID), file, type);
-
-			// Add attachment to unsavedFiles
-			// check to see if file with same name exists
-			GmapAttachment currAtt;
-			Iterator iter = savedFiles.iterator();
-			while (iter.hasNext()) {
-				currAtt = (GmapAttachment) iter.next();
-				if (StringUtils.equals(currAtt.getFileName(), newAtt
-						.getFileName())) {
-					// move from this this list to deleted list.
-					getAttList(KEY_DELETED_FILES, map).add(currAtt);
-					iter.remove();
-					break;
-				}
-			}
-			unsavedFiles.add(newAtt);
-
-			request.setAttribute(GmapConstants.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()) {
-			GmapAttachment att = (GmapAttachment) 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(GmapConstants.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()) {
-			GmapAttachment att = (GmapAttachment) iter.next();
-
-			if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-				// delete from repository and list
-				gmapService.deleteFromRepository(att.getFileUuid(), att
-						.getFileVersionId());
-				iter.remove();
-				break;
-			}
-		}
-
-		request.setAttribute(GmapConstants.ATTR_SESSION_MAP, map);
-		request.setAttribute("unsavedChanges", new Boolean(true));
-
-		return mapping.findForward("success");
-	}
-
-
 	/**
 	 * Updates Gmap content using AuthoringForm inputs.
 	 * 
@@ -424,8 +231,6 @@
 		
 		if (mode.isAuthor()) { // Teacher cannot modify following
 			gmap.setCreateBy(guser.getUid());
-			gmap.setOfflineInstructions(authForm.getOnlineInstruction());
-			gmap.setOnlineInstructions(authForm.getOfflineInstruction());
 			gmap.setLockOnFinished(authForm.isLockOnFinished());
 			gmap.setAllowEditMarkers(authForm.isAllowEditMarkers());
 			gmap.setAllowShowAllMarkers(authForm.isAllowShowAllMarkers());
@@ -456,8 +261,6 @@
 	{
 		authForm.setTitle(gmap.getTitle());
 		authForm.setInstructions(gmap.getInstructions());
-		authForm.setOnlineInstruction(gmap.getOnlineInstructions());
-		authForm.setOfflineInstruction(gmap.getOfflineInstructions());
 		authForm.setLockOnFinished(gmap.isLockOnFinished());
 		authForm.setAllowEditMarkers(gmap.isAllowEditMarkers());
 		authForm.setAllowShowAllMarkers(gmap.isAllowShowAllMarkers());
@@ -490,24 +293,7 @@
 		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<GmapAttachment>());
-		map.put(KEY_OFFLINE_FILES, new LinkedList<GmapAttachment>());
-		map.put(KEY_UNSAVED_ONLINE_FILES, new LinkedList<GmapAttachment>());
-		map.put(KEY_UNSAVED_OFFLINE_FILES,new LinkedList<GmapAttachment>());
-		map.put(KEY_DELETED_FILES, new LinkedList<GmapAttachment>());
 
-		Iterator<GmapAttachment> iter = gmap.getGmapAttachments().iterator();
-		while (iter.hasNext()) {
-			GmapAttachment attachment = (GmapAttachment) 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);
-			}
-		}
-
 		return map;
 	}
 
@@ -530,19 +316,6 @@
 	}
 
 	/**
-	 * Retrieves a List of attachments from the map using the key.
-	 * 
-	 * @param key
-	 * @param map
-	 * @return
-	 */
-	private List<GmapAttachment> getAttList(String key,
-			SessionMap<String, Object> map) {
-		List<GmapAttachment> list = (List<GmapAttachment>) map.get(key);
-		return list;
-	}
-
-	/**
 	 * Retrieve the SessionMap from the HttpSession using the author form.
 	 * 
 	 * @param request
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java,v
diff -u -r1.18 -r1.19
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	9 Apr 2013 12:47:00 -0000	1.18
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	17 Jan 2014 21:45:01 -0000	1.19
@@ -65,7 +65,6 @@
  * @struts.action path="/learning" parameter="dispatch" scope="request"
  *                name="learningForm"
  * @struts.action-forward name="gmap" path="tiles:/learning/main"
- * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  * @struts.action-forward name="notebook" path="/pages/learning/notebook.jsp"
  */
@@ -128,11 +127,6 @@
 		LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
 			.getServletContext());
 		
-		// check runOffline
-		if (gmap.isRunOffline()) {
-			return mapping.findForward("runOffline");
-		}
-		
 		GmapUser gmapUser;
 		if (mode.equals(ToolAccessMode.TEACHER)) {
 			Long userID = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false);
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java,v
diff -u -r1.14 -r1.15
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	6 Jan 2014 08:42:10 -0000	1.14
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	17 Jan 2014 21:45:01 -0000	1.15
@@ -109,30 +109,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 (gmapService == null) {
-		gmapService = GmapServiceProxy.getGmapService(getServletContext());
-	    }
-
-	    Gmap content = null;
-	    if (toolContentID != null) {
-		content = gmapService.getGmapByContentId(toolContentID);
-	    } else {
-		GmapSession session = gmapService.getSessionBySessionId(toolSessionID);
-		if (session != null)
-		    content = session.getGmap();
-	    }
-	    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 GmapException {
 
Index: lams_tool_gmap/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_gmap/web/WEB-INF/tiles-defs.xml	30 Jul 2012 18:51:35 -0000	1.1
+++ lams_tool_gmap/web/WEB-INF/tiles-defs.xml	17 Jan 2014 21:45:01 -0000	1.2
@@ -86,10 +86,6 @@
 	<definition name="tiles:/learning/main" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/gmap.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_gmap/web/includes/javascript/authoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/includes/javascript/authoring.js,v
diff -u -r1.7 -r1.8
--- lams_tool_gmap/web/includes/javascript/authoring.js	6 Jun 2008 00:24:19 -0000	1.7
+++ lams_tool_gmap/web/includes/javascript/authoring.js	17 Jan 2014 21:45:01 -0000	1.8
@@ -26,10 +26,5 @@
 	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_gmap/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/authoring/authoring.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_gmap/web/pages/authoring/authoring.jsp	27 Nov 2012 16:02:11 -0000	1.5
+++ lams_tool_gmap/web/pages/authoring/authoring.jsp	17 Jan 2014 21:45:01 -0000	1.6
@@ -11,7 +11,6 @@
     		saveMapState();
     	}
     	return save;
-    	
 	}
 </script>
 
@@ -24,20 +23,13 @@
 	<c:if test="${sessionMap.mode == 'teacher'}">
 		<c:set var="defineLater" value="yes" />
 	</c:if>
-	
-	<script type="text/javascript">
-	<!--
-		var toolContentID = "${sessionMap.toolContentID}";
-	//-->
-	</script>
 
 	<div id="header">
 		<!--  TITLE KEY PAGE GOES HERE -->
 		<lams:Tabs control="true">
 			<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>
@@ -54,11 +46,7 @@
 		<html:hidden property="mapCenterLongitude" value="" styleId="mapCenterLongitude" />
 		<html:hidden property="mapType" value="" styleId="mapType" />
 
-
 		<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">
@@ -68,15 +56,12 @@
 			</logic:messagesPresent>			
 		</div>
 
-		<lams:help toolSignature="<%=GmapConstants.TOOL_SIGNATURE%>"
-			module="authoring" />
+		<lams:help toolSignature="<%=GmapConstants.TOOL_SIGNATURE%>" module="authoring" />
 
 		<%-- Page tabs --%>
 		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
 		<c:if test="${sessionMap.mode == 'author'}">
 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-			<lams:TabBody id="3" titleKey="button.instructions"
-				page="instructions.jsp" />
 		</c:if>
 
 		<lams:AuthoringButton formID="authoringForm"
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/conf/xdoclet/struts-actions.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/conf/xdoclet/struts-actions.xml	7 Jun 2011 20:58:39 -0000	1.2
+++ lams_tool_imscc/conf/xdoclet/struts-actions.xml	17 Jan 2014 21:45:04 -0000	1.3
@@ -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.commonCartridge.web.action.AuthoringAction"
-			name="commonCartridgeForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOnlineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/uploadOfflineFile"
-			type="org.lamsfoundation.lams.tool.commonCartridge.web.action.AuthoringAction"
-			name="commonCartridgeForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOfflineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/deleteOnlineFile"
-			type="org.lamsfoundation.lams.tool.commonCartridge.web.action.AuthoringAction"
-			name="commonCartridgeForm" 
-			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.commonCartridge.web.action.AuthoringAction"
-			name="commonCartridgeForm" 
-			scope="request" 
-			validate="false"
-			parameter="deleteOfflineFile">
-			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
-		</action>
 		<!-- ==========  CommonCartridge Item : URL ========== -->
 		<action path="/authoring/newItemInit"
 			type="org.lamsfoundation.lams.tool.commonCartridge.web.action.AuthoringAction"
@@ -170,8 +137,7 @@
 			type="org.lamsfoundation.lams.tool.commonCartridge.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.commonCartridge.web.action.LearningAction"
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java,v
diff -u -r1.3 -r1.4
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java	8 Jun 2011 12:31:16 -0000	1.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java	17 Jan 2014 21:45:04 -0000	1.4
@@ -59,8 +59,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";
@@ -72,14 +70,8 @@
 
     public static final String ATTR_RESOURCE_ITEM_LIST = "commonCartridgeList";
 
-    public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
-
     public static final String ATTR_DELETED_RESOURCE_ITEM_LIST = "deleteCommonCartridgeList";
 
-    public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
-
-    public static final String ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST = "deletedItemAttachmmentList";;
-
     public static final String ATTR_RESOURCE_REVIEW_URL = "commonCartridgeItemReviewUrl";
 
     public static final String ATTR_RESOURCE = "commonCartridge";
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	28 May 2011 18:03:46 -0000	1.1
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	17 Jan 2014 21:45:04 -0000	1.2
@@ -31,12 +31,6 @@
         <property name="sessionFactory">
             <ref bean="coreSessionFactory"/>
         </property>
-    </bean>      
-
-   <bean id="commonCartridgeAttachmentDao" class="org.lamsfoundation.lams.tool.commonCartridge.dao.hibernate.CommonCartridgeAttachmentDAOHibernate">
-        <property name="sessionFactory">
-            <ref bean="coreSessionFactory"/>
-        </property>
     </bean>
 
    <bean id="commonCartridgeUserDao" class="org.lamsfoundation.lams.tool.commonCartridge.dao.hibernate.CommonCartridgeUserDAOHibernate">
@@ -69,9 +63,6 @@
         </property>
         <property name="commonCartridgeConfigItemDao">
             <ref local="commonCartridgeConfigItemDao"/>
-        </property>        
-        <property name="commonCartridgeAttachmentDao">
-            <ref local="commonCartridgeAttachmentDao"/>
         </property>
         <property name="commonCartridgeUserDao">
             <ref local="commonCartridgeUserDao"/>
@@ -125,8 +116,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.2 refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/CommonCartridgeAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeAttachmentDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20140102.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20140102.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20140102.sql	17 Jan 2014 21:45:04 -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_laimsc11_commonCartridge DROP COLUMN online_instructions;
+ALTER TABLE tl_laimsc11_commonCartridge DROP COLUMN offline_instructions;
+ALTER TABLE tl_laimsc11_commonCartridge DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_laimsc11_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='laimsc11';
+
+----------------------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_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java	28 May 2011 18:03:37 -0000	1.1
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java	17 Jan 2014 21:45:03 -0000	1.2
@@ -60,7 +60,6 @@
     private String instructions;
 
     // advance
-    private boolean runOffline;
 
     private boolean runAuto;
 
@@ -72,13 +71,6 @@
 
     private boolean contentInUse;
 
-    // instructions
-    private String onlineInstructions;
-
-    private String offlineInstructions;
-
-    private Set attachments;
-
     // general infomation
     private Date created;
 
@@ -94,30 +86,22 @@
     private String reflectInstructions;
 
     // *************** NON Persist Fields ********************
-    private IToolContentHandler toolContentHandler;
 
     private String miniViewNumberStr;
 
-    private List<CommonCartridgeAttachment> onlineFileList;
-
-    private List<CommonCartridgeAttachment> offlineFileList;
-
     /**
      * Default contruction method.
      * 
      */
     public CommonCartridge() {
-	attachments = new HashSet();
 	commonCartridgeItems = new HashSet();
     }
 
     // **********************************************************
     // Function method for CommonCartridge
     // **********************************************************
-    public static CommonCartridge newInstance(CommonCartridge defaultContent, Long contentId,
-	    CommonCartridgeToolContentHandler commonCartridgeToolContentHandler) {
+    public static CommonCartridge newInstance(CommonCartridge defaultContent, Long contentId) {
 	CommonCartridge toContent = new CommonCartridge();
-	defaultContent.toolContentHandler = commonCartridgeToolContentHandler;
 	toContent = (CommonCartridge) defaultContent.clone();
 	toContent.setContentId(contentId);
 
@@ -150,19 +134,6 @@
 		}
 		commonCartridge.commonCartridgeItems = set;
 	    }
-	    // clone attachment
-	    if (attachments != null) {
-		Iterator iter = attachments.iterator();
-		Set set = new HashSet();
-		while (iter.hasNext()) {
-		    CommonCartridgeAttachment file = (CommonCartridgeAttachment) iter.next();
-		    CommonCartridgeAttachment newFile = (CommonCartridgeAttachment) file.clone();
-		    // just clone old file without duplicate it in repository
-
-		    set.add(newFile);
-		}
-		commonCartridge.attachments = set;
-	    }
 	    // clone ReourceUser as well
 	    if (createdBy != null) {
 		commonCartridge.setCreatedBy((CommonCartridgeUser) createdBy.clone());
@@ -186,16 +157,13 @@
 	final CommonCartridge genericEntity = (CommonCartridge) 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).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();
     }
 
     /**
@@ -210,21 +178,6 @@
 	this.setUpdated(new Date(now));
     }
 
-    public void toDTO() {
-	onlineFileList = new ArrayList<CommonCartridgeAttachment>();
-	offlineFileList = new ArrayList<CommonCartridgeAttachment>();
-	Set<CommonCartridgeAttachment> fileSet = this.getAttachments();
-	if (fileSet != null) {
-	    for (CommonCartridgeAttachment file : fileSet) {
-		if (StringUtils.equalsIgnoreCase(file.getFileType(), IToolContentHandler.TYPE_OFFLINE)) {
-		    offlineFileList.add(file);
-		} else {
-		    onlineFileList.add(file);
-		}
-	    }
-	}
-    }
-
     // **********************************************************
     // get/set methods
     // **********************************************************
@@ -314,26 +267,6 @@
     }
 
     /**
-     * @return Returns the runOffline.
-     * 
-     * @hibernate.property column="run_offline"
-     * 
-     */
-    public boolean getRunOffline() {
-	return runOffline;
-    }
-
-    /**
-     * @param runOffline
-     *            The forceOffLine to set.
-     * 
-     * 
-     */
-    public void setRunOffline(boolean forceOffline) {
-	runOffline = forceOffline;
-    }
-
-    /**
      * @return Returns the lockWhenFinish.
      * 
      * @hibernate.property column="lock_on_finished"
@@ -365,54 +298,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="commonCartridge_uid"
-     * @hibernate.collection-one-to-many 
-     *                                   class="org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeAttachment"
-     * 
-     * @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="create_date desc"
      * @hibernate.collection-key column="commonCartridge_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem"
@@ -500,26 +387,6 @@
 	miniViewNumberStr = minViewNumber;
     }
 
-    public List<CommonCartridgeAttachment> getOfflineFileList() {
-	return offlineFileList;
-    }
-
-    public void setOfflineFileList(List<CommonCartridgeAttachment> offlineFileList) {
-	this.offlineFileList = offlineFileList;
-    }
-
-    public List<CommonCartridgeAttachment> getOnlineFileList() {
-	return onlineFileList;
-    }
-
-    public void setOnlineFileList(List<CommonCartridgeAttachment> 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_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeImportContentVersionFilter.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeImportContentVersionFilter.java	17 Jan 2014 21:45:04 -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: CommonCartridgeImportContentVersionFilter.java,v 1.1 2014/01/17 21:45:04 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.commonCartridge.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge;
+
+/**
+ * Import filter class for different version of CommonCartridge content.
+ */
+public class CommonCartridgeImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20110511 version content to 20140102 version tool server.
+     */
+    public void up20110511To20140102() {
+	this.removeField(CommonCartridge.class, "runOffline");
+	this.removeField(CommonCartridge.class, "onlineInstructions");
+	this.removeField(CommonCartridge.class, "offlineInstructions");
+	this.removeField(CommonCartridge.class, "attachments");
+    }
+}
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java,v
diff -u -r1.4 -r1.5
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	29 Jul 2013 23:11:43 -0000	1.4
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	17 Jan 2014 21:45:04 -0000	1.5
@@ -30,7 +30,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -40,7 +39,6 @@
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.Vector;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -72,7 +70,6 @@
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.commonCartridge.CommonCartridgeConstants;
-import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeAttachmentDAO;
 import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeConfigItemDAO;
 import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeDAO;
 import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeItemDAO;
@@ -85,7 +82,6 @@
 import org.lamsfoundation.lams.tool.commonCartridge.ims.ImscpApplicationException;
 import org.lamsfoundation.lams.tool.commonCartridge.ims.SimpleCommonCartridgeConverter;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge;
-import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeAttachment;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeConfigItem;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItemInstruction;
@@ -102,7 +98,6 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -124,8 +119,6 @@
 
     private CommonCartridgeItemDAO commonCartridgeItemDao;
 
-    private CommonCartridgeAttachmentDAO commonCartridgeAttachmentDao;
-
     private CommonCartridgeUserDAO commonCartridgeUserDao;
 
     private CommonCartridgeSessionDAO commonCartridgeSessionDao;
@@ -145,7 +138,7 @@
     private ILamsToolService toolService;
 
     private ILearnerService learnerService;
-
+    
     private IAuditService auditService;
 
     private IUserManagementService userManagementService;
@@ -254,35 +247,14 @@
 	CommonCartridge defaultContent = getDefaultCommonCartridge();
 	// save default content by given ID.
 	CommonCartridge content = new CommonCartridge();
-	content = CommonCartridge.newInstance(defaultContent, contentId, commonCartridgeToolContentHandler);
+	content = CommonCartridge.newInstance(defaultContent, contentId);
 	return content;
     }
 
     public List getAuthoredItems(Long commonCartridgeUid) {
 	return commonCartridgeItemDao.getAuthoringItems(commonCartridgeUid);
     }
 
-    public CommonCartridgeAttachment uploadInstructionFile(FormFile uploadFile, String fileType)
-	    throws UploadCommonCartridgeFileException {
-	if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
-	    throw new UploadCommonCartridgeFileException(messageService.getMessage("error.msg.upload.file.not.found",
-		    new Object[] { uploadFile }));
-	}
-
-	// upload file to repository
-	NodeKey nodeKey = processFile(uploadFile, fileType);
-
-	// create new attachement
-	CommonCartridgeAttachment file = new CommonCartridgeAttachment();
-	file.setFileType(fileType);
-	file.setFileUuid(nodeKey.getUuid());
-	file.setFileVersionId(nodeKey.getVersion());
-	file.setFileName(uploadFile.getFileName());
-	file.setCreated(new Date());
-
-	return file;
-    }
-
     public void createUser(CommonCartridgeUser commonCartridgeUser) {
 	commonCartridgeUserDao.saveObject(commonCartridgeUser);
     }
@@ -313,11 +285,6 @@
 	commonCartridgeDao.saveObject(commonCartridge);
     }
 
-    public void deleteCommonCartridgeAttachment(Long attachmentUid) {
-	commonCartridgeAttachmentDao.removeObject(CommonCartridgeAttachment.class, attachmentUid);
-
-    }
-
     public void saveOrUpdateCommonCartridgeItem(CommonCartridgeItem item) {
 	commonCartridgeItemDao.saveObject(item);
     }
@@ -680,47 +647,6 @@
 	return contentId;
     }
 
-    /**
-     * Process an uploaded file.
-     * 
-     * @throws CommonCartridgeApplicationException
-     * @throws FileNotFoundException
-     * @throws IOException
-     * @throws RepositoryCheckedException
-     * @throws InvalidParameterException
-     */
-    private NodeKey processFile(FormFile file, String fileType) throws UploadCommonCartridgeFileException {
-	NodeKey node = null;
-	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
-	    String fileName = file.getFileName();
-	    try {
-		node = commonCartridgeToolContentHandler.uploadFile(file.getInputStream(), fileName,
-			file.getContentType(), fileType);
-	    } catch (InvalidParameterException e) {
-		throw new UploadCommonCartridgeFileException(messageService.getMessage("error.msg.invaid.param.upload"));
-	    } catch (FileNotFoundException e) {
-		throw new UploadCommonCartridgeFileException(messageService.getMessage("error.msg.file.not.found"));
-	    } catch (RepositoryCheckedException e) {
-		throw new UploadCommonCartridgeFileException(messageService.getMessage("error.msg.repository"));
-	    } catch (IOException e) {
-		throw new UploadCommonCartridgeFileException(messageService.getMessage("error.msg.io.exception"));
-	    }
-	}
-	return node;
-    }
-
-    private NodeKey processPackage(String packageDirectory, String initFile) throws UploadCommonCartridgeFileException {
-	NodeKey node = null;
-	try {
-	    node = commonCartridgeToolContentHandler.uploadPackage(packageDirectory, initFile);
-	} catch (InvalidParameterException e) {
-	    throw new UploadCommonCartridgeFileException(messageService.getMessage("error.msg.invaid.param.upload"));
-	} catch (RepositoryCheckedException e) {
-	    throw new UploadCommonCartridgeFileException(messageService.getMessage("error.msg.repository"));
-	}
-	return node;
-    }
-
     public List<CommonCartridgeItem> uploadCommonCartridgeFile(CommonCartridgeItem item, FormFile file)
 	    throws UploadCommonCartridgeFileException {
 	try {
@@ -794,10 +720,6 @@
 	this.repositoryService = repositoryService;
     }
 
-    public void setCommonCartridgeAttachmentDao(CommonCartridgeAttachmentDAO commonCartridgeAttachmentDao) {
-	this.commonCartridgeAttachmentDao = commonCartridgeAttachmentDao;
-    }
-
     public void setCommonCartridgeDao(CommonCartridgeDAO commonCartridgeDao) {
 	this.commonCartridgeDao = commonCartridgeDao;
     }
@@ -856,14 +778,9 @@
 	}
 
 	// set CommonCartridgeToolContentHandler as null to avoid copy file node in repository again.
-	toolContentObj = CommonCartridge.newInstance(toolContentObj, toolContentId, null);
-	toolContentObj.setToolContentHandler(null);
-	toolContentObj.setOfflineFileList(null);
-	toolContentObj.setOnlineFileList(null);
+	toolContentObj = CommonCartridge.newInstance(toolContentObj, toolContentId);
 	toolContentObj.setMiniViewNumberStr(null);
 	try {
-	    exportContentService.registerFileClassForExport(CommonCartridgeAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.registerFileClassForExport(CommonCartridgeItem.class.getName(), "fileUuid",
 		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, commonCartridgeToolContentHandler,
@@ -877,8 +794,9 @@
 	    String toVersion) throws ToolException {
 
 	try {
-	    exportContentService.registerFileClassForImport(CommonCartridgeAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(CommonCartridgeImportContentVersionFilter.class);
+	    
 	    exportContentService.registerFileClassForImport(CommonCartridgeItem.class.getName(), "fileUuid",
 		    "fileVersionId", "fileName", "fileType", null, "initialItem");
 
@@ -950,8 +868,7 @@
 	    }
 	}
 
-	CommonCartridge toContent = CommonCartridge.newInstance(commonCartridge, toContentId,
-		commonCartridgeToolContentHandler);
+	CommonCartridge toContent = CommonCartridge.newInstance(commonCartridge, toContentId);
 	commonCartridgeDao.saveObject(toContent);
 
 	// save commonCartridge items as well
@@ -968,23 +885,7 @@
     public String getToolContentTitle(Long toolContentId) {
 	return getCommonCartridgeByContentId(toolContentId).getTitle();
     }
-    
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	CommonCartridge commonCartridge = commonCartridgeDao.getByContentId(toolContentId);
-	if (commonCartridge == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	commonCartridge.setDefineLater(value);
-    }
 
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	CommonCartridge commonCartridge = commonCartridgeDao.getByContentId(toolContentId);
-	if (commonCartridge == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	commonCartridge.setRunOffline(value);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	CommonCartridge commonCartridge = commonCartridgeDao.getByContentId(toolContentId);
@@ -1070,118 +971,6 @@
      * Import the data for a 1.0.2 Noticeboard or HTMLNoticeboard
      */
     public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) {
-	Date now = new Date();
-	CommonCartridge toolContentObj = new CommonCartridge();
-
-	try {
-	    toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
-	    toolContentObj.setContentId(toolContentId);
-	    toolContentObj.setContentInUse(Boolean.FALSE);
-	    toolContentObj.setCreated(now);
-	    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);
-
-	    toolContentObj.setRunAuto(Boolean.FALSE);
-	    Integer minToComplete = WDDXProcessor.convertToInteger(importValues,
-		    ToolContentImport102Manager.CONTENT_URL_MIN_NUMBER_COMPLETE);
-	    toolContentObj.setMiniViewCommonCartridgeNumber(minToComplete != null ? minToComplete.intValue() : 0);
-	    toolContentObj.setLockWhenFinished(Boolean.FALSE);
-	    toolContentObj.setRunAuto(Boolean.FALSE);
-
-	    // leave as empty, no need to set them to anything.
-	    // toolContentObj.setAttachments(attachments);
-
-	    /*
-	     * unused entries from 1.0.2 [directoryName=] no equivalent in 2.0 [runtimeSubmissionStaffFile=true] no
-	     * equivalent in 2.0 [contentShowUser=false] no equivalent in 2.0 [isHTML=false] no equivalent in 2.0
-	     * [showbuttons=false] no equivalent in 2.0 [isReusable=false] not used in 1.0.2 (would be lock when
-	     * finished)
-	     */
-	    CommonCartridgeUser ruser = new CommonCartridgeUser();
-	    ruser.setUserId(new Long(user.getUserID().longValue()));
-	    ruser.setFirstName(user.getFirstName());
-	    ruser.setLastName(user.getLastName());
-	    ruser.setLoginName(user.getLogin());
-	    createUser(ruser);
-	    toolContentObj.setCreatedBy(ruser);
-
-	    // CommonCartridge Items. They are ordered on the screen by create date so they need to be saved in the
-	    // right
-	    // order.
-	    // So read them all in first, then go through and assign the dates in the correct order and then save.
-	    Vector urls = (Vector) importValues.get(ToolContentImport102Manager.CONTENT_URL_URLS);
-	    SortedMap<Integer, CommonCartridgeItem> items = new TreeMap<Integer, CommonCartridgeItem>();
-	    if (urls != null) {
-		Iterator iter = urls.iterator();
-		while (iter.hasNext()) {
-		    Hashtable urlMap = (Hashtable) iter.next();
-		    Integer itemOrder = WDDXProcessor.convertToInteger(urlMap,
-			    ToolContentImport102Manager.CONTENT_URL_URL_VIEW_ORDER);
-		    CommonCartridgeItem item = new CommonCartridgeItem();
-		    item.setTitle((String) urlMap.get(ToolContentImport102Manager.CONTENT_TITLE));
-		    item.setCreateBy(ruser);
-		    item.setCreateByAuthor(true);
-		    item.setHide(false);
-
-		    Vector instructions = (Vector) urlMap
-			    .get(ToolContentImport102Manager.CONTENT_URL_URL_INSTRUCTION_ARRAY);
-		    if (instructions != null && instructions.size() > 0) {
-			item.setItemInstructions(new HashSet());
-			Iterator insIter = instructions.iterator();
-			while (insIter.hasNext()) {
-			    item.getItemInstructions().add(createInstruction((Hashtable) insIter.next()));
-			}
-		    }
-
-		    String commonCartridgeType = (String) urlMap.get(ToolContentImport102Manager.CONTENT_URL_URL_TYPE);
-		    if (ToolContentImport102Manager.URL_RESOURCE_TYPE_URL.equals(commonCartridgeType)) {
-			item.setType(CommonCartridgeConstants.RESOURCE_TYPE_BASIC_LTI);
-			item.setUrl((String) urlMap.get(ToolContentImport102Manager.CONTENT_URL_URL_URL));
-			item.setOpenUrlNewWindow(false);
-		    } else if (ToolContentImport102Manager.URL_RESOURCE_TYPE_FILE.equals(commonCartridgeType)) {
-			item.setType(CommonCartridgeConstants.RESOURCE_TYPE_COMMON_CARTRIDGE);
-		    } else {
-			throw new ToolException("Invalid shared commonCartridge type. Type was " + commonCartridgeType);
-		    }
-
-		    items.put(itemOrder, item);
-		}
-	    }
-
-	    Iterator iter = items.values().iterator();
-	    Date itemDate = null;
-	    while (iter.hasNext()) {
-		if (itemDate != null) {
-		    try {
-			Thread.sleep(1000);
-		    } catch (Exception e) {
-		    }
-		}
-		itemDate = new Date();
-
-		CommonCartridgeItem item = (CommonCartridgeItem) iter.next();
-		item.setCreateDate(itemDate);
-		toolContentObj.getCommonCartridgeItems().add(item);
-	    }
-
-	} catch (WDDXProcessorConversionException e) {
-	    CommonCartridgeServiceImpl.log.error("Unable to content for activity " + toolContentObj.getTitle()
-		    + "properly due to a WDDXProcessorConversionException.", e);
-	    throw new ToolException(
-		    "Invalid import data format for activity "
-			    + toolContentObj.getTitle()
-			    + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details.");
-	}
-
-	commonCartridgeDao.saveObject(toolContentObj);
-
     }
 
     private CommonCartridgeItemInstruction createInstruction(Hashtable instructionEntry)
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java	28 May 2011 18:03:43 -0000	1.1
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java	17 Jan 2014 21:45:04 -0000	1.2
@@ -35,7 +35,6 @@
 import org.lamsfoundation.lams.tool.commonCartridge.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.commonCartridge.dto.Summary;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge;
-import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeAttachment;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeConfigItem;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeSession;
@@ -86,16 +85,6 @@
     List getAuthoredItems(Long commonCartridgeUid);
 
     /**
-     * Upload instruciton file into repository.
-     * 
-     * @param file
-     * @param type
-     * @return
-     * @throws UploadCommonCartridgeFileException
-     */
-    CommonCartridgeAttachment uploadInstructionFile(FormFile file, String type) throws UploadCommonCartridgeFileException;
-
-    /**
      * Upload commonCartridge item file to repository. i.e., single file, websize zip file, or learning object zip file.
      * 
      * @param item
@@ -142,14 +131,6 @@
     void saveOrUpdateCommonCartridge(CommonCartridge CommonCartridge);
 
     /**
-     * Delete reource attachment(i.e., offline/online instruction file) from database. This method does not delete the
-     * file from repository.
-     * 
-     * @param attachmentUid
-     */
-    void deleteCommonCartridgeAttachment(Long attachmentUid);
-
-    /**
      * Delete resoruce item from database.
      * 
      * @param uid
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	25 Jul 2013 05:55:01 -0000	1.4
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	17 Jan 2014 21:45:03 -0000	1.5
@@ -25,18 +25,14 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.sql.Timestamp;
 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.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -63,7 +59,6 @@
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.commonCartridge.CommonCartridgeConstants;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge;
-import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeAttachment;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeUser;
 import org.lamsfoundation.lams.tool.commonCartridge.service.CommonCartridgeApplicationException;
@@ -125,18 +120,6 @@
 	if (param.equals("updateContent")) {
 	    return updateContent(mapping, form, request, response);
 	}
-	if (param.equals("uploadOnlineFile")) {
-	    return uploadOnline(mapping, form, request, response);
-	}
-	if (param.equals("uploadOfflineFile")) {
-	    return uploadOffline(mapping, form, request, response);
-	}
-	if (param.equals("deleteOnlineFile")) {
-	    return deleteOnlineFile(mapping, form, request, response);
-	}
-	if (param.equals("deleteOfflineFile")) {
-	    return deleteOfflineFile(mapping, form, request, response);
-	}
 	// ----------------------- Add commonCartridge item function ---------------------------
 	if (param.equals("newItemInit")) {
 	    return newItemlInit(mapping, form, request, response);
@@ -400,11 +383,6 @@
 	    }
 
 	    commonCartridgeForm.setCommonCartridge(commonCartridge);
-
-	    // initialize instruction attachment list
-	    List attachmentList = getAttachmentList(sessionMap);
-	    attachmentList.clear();
-	    attachmentList.addAll(commonCartridge.getAttachments());
 	} catch (Exception e) {
 	    AuthoringAction.log.error(e);
 	    throw new ServletException(e);
@@ -539,52 +517,12 @@
 	}
 
 	commonCartridgePO.setCreatedBy(commonCartridgeUser);
-
-	// **********************************Handle Authoring Instruction Attachement *********************
-	// merge attachment info
-	// so far, attPOSet will be empty if content is existed. because PropertyUtils.copyProperties() is executed
-	Set attPOSet = commonCartridgePO.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()) {
-	    CommonCartridgeAttachment newAtt = (CommonCartridgeAttachment) 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()) {
-	    CommonCartridgeAttachment delAtt = (CommonCartridgeAttachment) 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()) {
-		    CommonCartridgeAttachment att = (CommonCartridgeAttachment) attIter.next();
-		    if (delAtt.getUid().equals(att.getUid())) {
-			attIter.remove();
-			break;
-		    }
-		}
-		service.deleteCommonCartridgeAttachment(delAtt.getUid());
-	    }// end remove from persist value
-	}
-
-	// copy back
-	commonCartridgePO.setAttachments(attPOSet);
 	
 	// ************************* Handle commonCartridge items *******************
 	
 	Set itemList = new LinkedHashSet();
 	SortedSet topics = getCommonCartridgeItemList(sessionMap);
-	iter = topics.iterator();
+	Iterator iter = topics.iterator();
 	while (iter.hasNext()) {
 	    CommonCartridgeItem item = (CommonCartridgeItem) iter.next();
 	    if (item != null) {
@@ -604,13 +542,6 @@
 		service.deleteCommonCartridgeItem(item.getUid());
 	    }
 	}
-	// handle commonCartridge item attachment file:
-	List delItemAttList = getDeletedItemAttachmentList(sessionMap);
-	iter = delItemAttList.iterator();
-	while (iter.hasNext()) {
-	    CommonCartridgeItem delAtt = (CommonCartridgeItem) iter.next();
-	    iter.remove();
-	}
 
 	// if miniview number is bigger than available items, then set it topics size
 	if (commonCartridgePO.getMiniViewCommonCartridgeNumber() > topics.size()) {
@@ -620,9 +551,6 @@
 	// finally persist commonCartridgePO again
 	service.saveOrUpdateCommonCartridge(commonCartridgePO);
 
-	// initialize attachmentList again
-	attachmentList = getAttachmentList(sessionMap);
-	attachmentList.addAll(commonCartridge.getAttachments());
 	commonCartridgeForm.setCommonCartridge(commonCartridgePO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
@@ -633,166 +561,6 @@
 	}
     }
 
-    /**
-     * Handle upload online instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws UploadCommonCartridgeFileException
-     */
-    public ActionForward uploadOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws UploadCommonCartridgeFileException {
-	return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    /**
-     * Handle upload offline instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws UploadCommonCartridgeFileException
-     */
-    public ActionForward uploadOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws UploadCommonCartridgeFileException {
-	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 UploadCommonCartridgeFileException
-     */
-    private ActionForward uploadFile(ActionMapping mapping, ActionForm form, String type, HttpServletRequest request)
-	    throws UploadCommonCartridgeFileException {
-
-	CommonCartridgeForm commonCartridgeForm = (CommonCartridgeForm) form;
-	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(commonCartridgeForm.getSessionMapID());
-
-	FormFile file;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    file = commonCartridgeForm.getOfflineFile();
-	} else {
-	    file = commonCartridgeForm.getOnlineFile();
-	}
-
-	if (file == null || StringUtils.isBlank(file.getFileName())) {
-	    return mapping.findForward(CommonCartridgeConstants.SUCCESS);
-	}
-
-	// validate file size
-	ActionMessages errors = new ActionMessages();
-	FileValidatorUtil.validateFileSize(file, true, errors);
-	if (!errors.isEmpty()) {
-	    this.saveErrors(request, errors);
-	    return mapping.findForward(CommonCartridgeConstants.SUCCESS);
-	}
-
-	ICommonCartridgeService service = getCommonCartridgeService();
-	// upload to repository
-	CommonCartridgeAttachment 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();
-	CommonCartridgeAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (CommonCartridgeAttachment) 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(CommonCartridgeConstants.SUCCESS);
-
-    }
-
-    /**
-     * Delete offline instruction file from current CommonCartridge 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 CommonCartridge 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, CommonCartridgeConstants.PARAM_FILE_VERSION_ID));
-	Long uuID = new Long(WebUtil.readLongParam(request, CommonCartridgeConstants.PARAM_FILE_UUID));
-
-	// get back sessionMAP
-	String sessionMapID = WebUtil.readStrParam(request, CommonCartridgeConstants.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();
-	CommonCartridgeAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (CommonCartridgeAttachment) 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(CommonCartridgeConstants.ATTR_FILE_TYPE_FLAG, type);
-	request.setAttribute(CommonCartridgeConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(CommonCartridgeConstants.SUCCESS);
-
-    }
-
     // *************************************************************************************
     // Private method
     // *************************************************************************************
@@ -806,22 +574,6 @@
     }
 
     /**
-     * @param request
-     * @return
-     */
-    private List getAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, CommonCartridgeConstants.ATT_ATTACHMENT_LIST);
-    }
-
-    /**
-     * @param request
-     * @return
-     */
-    private List getDeletedAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, CommonCartridgeConstants.ATTR_DELETED_ATTACHMENT_LIST);
-    }
-
-    /**
      * List items from fresh uploaded cartridge.
      * 
      * @param request
@@ -858,18 +610,6 @@
     }
 
     /**
-     * If a commonCartridge item has attahment file, and the user edit this item and change the attachment to new file,
-     * then the old file need be deleted when submitting the whole authoring page. Save the file uuid and version id
-     * into CommonCartridgeItem object for temporarily use.
-     * 
-     * @param request
-     * @return
-     */
-    private List getDeletedItemAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, CommonCartridgeConstants.ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST);
-    }
-
-    /**
      * Get <code>java.util.List</code> from HttpSession by given name.
      * 
      * @param request
@@ -1136,26 +876,9 @@
 	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	    plannerForm.setContentFolderID(contentFolderId);
 	    return mapping.findForward(CommonCartridgeConstants.SUCCESS);
-	} else {
-	    try {
-		String onlineInstructions = taskList.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(taskList.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		AuthoringAction.log.error(e);
-	    }
-	    return null;
 	}
+	
+	return null;
 
     }
 
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	9 Apr 2013 12:46:56 -0000	1.2
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	17 Jan 2014 21:45:03 -0000	1.3
@@ -196,14 +196,6 @@
 		request, getServlet().getServletContext());
 	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
 
-	// add run offline support
-	if (commonCartridge.getRunOffline()) {
-	    sessionMap.put(CommonCartridgeConstants.PARAM_RUN_OFFLINE, true);
-	    return mapping.findForward("runOffline");
-	} else {
-	    sessionMap.put(CommonCartridgeConstants.PARAM_RUN_OFFLINE, false);
-	}
-
 	// init commonCartridge item list
 	SortedSet<CommonCartridgeItem> commonCartridgeItemList = getCommonCartridgeItemList(sessionMap);
 	commonCartridgeItemList.clear();
@@ -375,9 +367,7 @@
 	ICommonCartridgeService service = getCommonCartridgeService();
 	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(CommonCartridgeConstants.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_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java	28 May 2011 18:03:49 -0000	1.1
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java	17 Jan 2014 21:45:03 -0000	1.2
@@ -152,7 +152,6 @@
 	List<List<Summary>> groupList = service.getSummary(contentId);
 
 	CommonCartridge commonCartridge = service.getCommonCartridgeByContentId(contentId);
-	commonCartridge.toDTO();
 
 	Map<Long, Set<ReflectDTO>> relectList = service.getReflectList(contentId, false);
 
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgeForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgeForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgeForm.java	28 May 2011 18:03:48 -0000	1.1
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgeForm.java	17 Jan 2014 21:45:04 -0000	1.2
@@ -76,7 +76,6 @@
 	    commonCartridge.setLockWhenFinished(false);
 	    commonCartridge.setDefineLater(false);
 	    commonCartridge.setRunAuto(false);
-	    commonCartridge.setRunOffline(false);
 	    commonCartridge.setReflectOnActivity(false);
 	}
     }
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/ExportServlet.java,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/ExportServlet.java	6 Jan 2014 08:42:32 -0000	1.2
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/ExportServlet.java	17 Jan 2014 21:45:03 -0000	1.3
@@ -111,27 +111,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 {
-
-	    CommonCartridge content = null;
-	    if (toolContentID != null) {
-		content = service.getCommonCartridgeByContentId(toolContentID);
-	    } else {
-		CommonCartridgeSession session = service.getCommonCartridgeSessionBySessionId(toolSessionID);
-		if (session != null)
-		    content = session.getCommonCartridge();
-	    }
-	    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 CommonCartridgeApplicationException {
 
Index: lams_tool_imscc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/authoring.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_imscc/web/pages/authoring/authoring.jsp	11 Dec 2012 11:29:51 -0000	1.5
+++ lams_tool_imscc/web/pages/authoring/authoring.jsp	17 Jan 2014 21:45:04 -0000	1.6
@@ -36,18 +36,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");
@@ -96,7 +85,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">
@@ -121,11 +109,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) -->
-
-
 			<!-- Button Row -->
 			<%--  Default value 
 				cancelButtonLabelKey="label.authoring.cancel.button"
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_imscc/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_imscc/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_imscc/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_imscc/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/web/pages/monitoring/monitoring.jsp	7 Jun 2011 20:58:39 -0000	1.2
+++ lams_tool_imscc/web/pages/monitoring/monitoring.jsp	17 Jan 2014 21:45:03 -0000	1.3
@@ -39,18 +39,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="<%= CommonCartridgeConstants.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>