Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -163,14 +163,6 @@
     />
     
     <property
-        name="contentLocked"
-        type="boolean"
-        access="property"        
-        column="content_inUse"
-        length="1"
-    />
-    
-    <property
         name="showOtherAnswers"
         type="boolean"
         access="property"        
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -raf2294a9411ee67e92a614ee7e60df3c1c764b6e -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision af2294a9411ee67e92a614ee7e60df3c1c764b6e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -96,7 +96,6 @@
     public static final String REFLECT = "reflect";
     public static final String REFLECTION_SUBJECT = "reflectionSubject";
 
-    public static final String IS_MONITORED_CONTENT_IN_USE = "isMonitoredContentInUse";
     public static final String LOAD_MONITORING_CONTENT_EDITACTIVITY = "loadMonitoringEditActivity";
     public static final String IS_PORTFOLIO_EXPORT = "isPortfolioExport";
     public static final String GENERAL_LEARNER_FLOW_DTO = "generalLearnerFlowDTO";
@@ -172,7 +171,6 @@
 
     public static final String COUNT_ALL_USERS = "countAllUsers";
     public static final String LIST_MONITORED_ANSWERS_CONTAINER_DTO = "listMonitoredAnswersContainerDto";
-    public static final String EDIT_ACTIVITY_DTO = "editActivityDTO";
 
     public static final String ACTIVITY_TITLE = "activityTitle";
     public static final String ACTIVITY_INSTRUCTIONS = "activityInstructions";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -105,9 +105,6 @@
     private boolean synchInMonitor;
 
     /** nullable persistent field */
-    private boolean contentLocked;
-
-    /** nullable persistent field */
     private Date creationDate;
 
     /** nullable persistent field */
@@ -130,10 +127,9 @@
     /** full constructor */
     public QaContent(Long qaContentId, String content, String title, String instructions, String reportTitle,
 	    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<QaCondition> conditions, boolean allowRichEditor,
-	    boolean useSelectLeaderToolOuput) {
+	    boolean allowRateAnswers, boolean synchInMonitor, boolean lockWhenFinished, boolean showOtherAnswers,
+	    boolean reflect, String reflectionSubject, Date creationDate, Date updateDate, Set qaQueContents,
+	    Set qaSessions, Set<QaCondition> conditions, boolean allowRichEditor, boolean useSelectLeaderToolOuput) {
 	this.qaContentId = qaContentId;
 	this.content = content;
 	this.title = title;
@@ -146,7 +142,6 @@
 	this.allowRateAnswers = allowRateAnswers;
 	this.synchInMonitor = synchInMonitor;
 	this.lockWhenFinished = lockWhenFinished;
-	this.contentLocked = contentLocked;
 	this.showOtherAnswers = showOtherAnswers;
 	this.reflect = reflect;
 	this.reflectionSubject = reflectionSubject;
@@ -174,8 +169,8 @@
 	QaContent newContent = new QaContent(newContentId, qa.getContent(), qa.getTitle(), qa.getInstructions(),
 		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>(
+		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));
@@ -451,21 +446,6 @@
     }
 
     /**
-     * @return Returns the contentLocked.
-     */
-    public boolean isContentLocked() {
-	return contentLocked;
-    }
-
-    /**
-     * @param contentLocked
-     *            The contentLocked to set.
-     */
-    public void setContentLocked(boolean contentLocked) {
-	this.contentLocked = contentLocked;
-    }
-
-    /**
      * @return Returns the uid.
      */
     public Long getUid() {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140527.sql
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140527.sql	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140527.sql	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -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-3236 Ability to change, add, remove Q&A questions even after student have reached it
+ALTER TABLE tl_laqa11_content DROP COLUMN content_inUse;
+
+UPDATE lams_tool SET tool_version='20140527' 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
Fisheye: Tag dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/EditActivityDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralMonitoringDTO.java
===================================================================
diff -u -r9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90 -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralMonitoringDTO.java	(.../GeneralMonitoringDTO.java)	(revision 9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralMonitoringDTO.java	(.../GeneralMonitoringDTO.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -35,7 +35,6 @@
 public class GeneralMonitoringDTO implements Comparable {
     protected String userExceptionNoStudentActivity;
     protected String userExceptionContentInUse;
-    protected String monitoredContentInUse;
 
     protected String defineLaterInEditMode;
 
@@ -49,16 +48,6 @@
 
     protected String contentFolderID;
 
-    public String toString() {
-	return new ToStringBuilder(this).append("userExceptionNoStudentActivity: ", userExceptionNoStudentActivity)
-		.append("userExceptionContentInUse: ", userExceptionContentInUse)
-		.append("defineLaterInEditMode: ", defineLaterInEditMode)
-		.append("monitoredContentInUse: ", monitoredContentInUse).append("activityTitle: ", activityTitle)
-		.append("activityInstructions: ", activityInstructions)
-		.append("defaultQuestionContent: ", defaultQuestionContent).append("countAllUsers: ", countAllUsers)
-		.append("countSessionComplete: ", countSessionComplete).toString();
-    }
-
     public int compareTo(Object o) {
 	GeneralMonitoringDTO generalMonitoringDTO = (GeneralMonitoringDTO) o;
 
@@ -84,21 +73,6 @@
     }
 
     /**
-     * @return Returns the monitoredContentInUse.
-     */
-    public String getMonitoredContentInUse() {
-	return monitoredContentInUse;
-    }
-
-    /**
-     * @param monitoredContentInUse
-     *            The monitoredContentInUse to set.
-     */
-    public void setMonitoredContentInUse(String monitoredContentInUse) {
-	this.monitoredContentInUse = monitoredContentInUse;
-    }
-
-    /**
      * @return Returns the userExceptionContentInUse.
      */
     public String getUserExceptionContentInUse() {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaGeneralAuthoringDTO.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaGeneralAuthoringDTO.java	(.../QaGeneralAuthoringDTO.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaGeneralAuthoringDTO.java	(.../QaGeneralAuthoringDTO.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -58,8 +58,6 @@
     protected Boolean allowRichEditor;
     protected Boolean useSelectLeaderToolOuput;
 
-    protected String monitoredContentInUse;
-
     protected String httpSessionID;
     protected String requestedModule;
     protected String isDefineLater;
@@ -81,13 +79,12 @@
 		.append("targetMode: ", targetMode).append("defaultQuestionContent: ", defaultQuestionContent)
 		.append("defaultContentIdStr: ", defaultContentIdStr).append("activityTitle: ", activityTitle)
 		.append("activityInstructions: ", activityInstructions).append("reflect: ", reflect)
-		.append("usernameVisible: ", usernameVisible)
-		.append("allowRateAnswers: ", allowRateAnswers).append("showOtherAnswers: ", showOtherAnswers)
-		.append("synchInMonitor: ", synchInMonitor).append("questionsSequenced: ", questionsSequenced)
-		.append("lockWhenFinished: ", lockWhenFinished).append("editActivityEditMode: ", editActivityEditMode)
+		.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("sbmtSuccess: ", sbmtSuccess)
+		.append("isDefineLater: ", isDefineLater).append("sbmtSuccess: ", sbmtSuccess)
 		.append("userExceptionQuestionsDuplicate: ", userExceptionQuestionsDuplicate).toString();
     }
 
@@ -100,7 +97,7 @@
 
     /**
      * @param userExceptionQuestionsDuplicate
-     *                The userExceptionQuestionsDuplicate to set.
+     *            The userExceptionQuestionsDuplicate to set.
      */
     public void setUserExceptionQuestionsDuplicate(String userExceptionQuestionsDuplicate) {
 	this.userExceptionQuestionsDuplicate = userExceptionQuestionsDuplicate;
@@ -115,28 +112,13 @@
 
     /**
      * @param httpSessionID
-     *                The httpSessionID to set.
+     *            The httpSessionID to set.
      */
     public void setHttpSessionID(String httpSessionID) {
 	this.httpSessionID = httpSessionID;
     }
 
     /**
-     * @return Returns the monitoredContentInUse.
-     */
-    public String getMonitoredContentInUse() {
-	return monitoredContentInUse;
-    }
-
-    /**
-     * @param monitoredContentInUse
-     *                The monitoredContentInUse to set.
-     */
-    public void setMonitoredContentInUse(String monitoredContentInUse) {
-	this.monitoredContentInUse = monitoredContentInUse;
-    }
-
-    /**
      * @return Returns the editActivityEditMode.
      */
     public String getEditActivityEditMode() {
@@ -145,7 +127,7 @@
 
     /**
      * @param editActivityEditMode
-     *                The editActivityEditMode to set.
+     *            The editActivityEditMode to set.
      */
     public void setEditActivityEditMode(String editActivityEditMode) {
 	this.editActivityEditMode = editActivityEditMode;
@@ -160,7 +142,7 @@
 
     /**
      * @param isDefineLater
-     *                The isDefineLater to set.
+     *            The isDefineLater to set.
      */
     public void setIsDefineLater(String isDefineLater) {
 	this.isDefineLater = isDefineLater;
@@ -175,7 +157,7 @@
 
     /**
      * @param toolContentID
-     *                The toolContentID to set.
+     *            The toolContentID to set.
      */
     public void setToolContentID(String toolContentID) {
 	this.toolContentID = toolContentID;
@@ -190,7 +172,7 @@
 
     /**
      * @param targetMode
-     *                The targetMode to set.
+     *            The targetMode to set.
      */
     public void setTargetMode(String targetMode) {
 	this.targetMode = targetMode;
@@ -205,7 +187,7 @@
 
     /**
      * @param monitoringOriginatedDefineLater
-     *                The monitoringOriginatedDefineLater to set.
+     *            The monitoringOriginatedDefineLater to set.
      */
     public void setMonitoringOriginatedDefineLater(String monitoringOriginatedDefineLater) {
 	this.monitoringOriginatedDefineLater = monitoringOriginatedDefineLater;
@@ -220,7 +202,7 @@
 
     /**
      * @param activeModule
-     *                The activeModule to set.
+     *            The activeModule to set.
      */
     public void setActiveModule(String activeModule) {
 	this.activeModule = activeModule;
@@ -235,7 +217,7 @@
 
     /**
      * @param defineLaterInEditMode
-     *                The defineLaterInEditMode to set.
+     *            The defineLaterInEditMode to set.
      */
     public void setDefineLaterInEditMode(String defineLaterInEditMode) {
 	this.defineLaterInEditMode = defineLaterInEditMode;
@@ -250,7 +232,7 @@
 
     /**
      * @param showAuthoringTabs
-     *                The showAuthoringTabs to set.
+     *            The showAuthoringTabs to set.
      */
     public void setShowAuthoringTabs(String showAuthoringTabs) {
 	this.showAuthoringTabs = showAuthoringTabs;
@@ -274,7 +256,7 @@
 
     /**
      * @param defaultContentIdStr
-     *                The defaultContentIdStr to set.
+     *            The defaultContentIdStr to set.
      */
     public void setDefaultContentIdStr(String defaultContentIdStr) {
 	this.defaultContentIdStr = defaultContentIdStr;
@@ -289,7 +271,7 @@
 
     /**
      * @param defaultQuestionContent
-     *                The defaultQuestionContent to set.
+     *            The defaultQuestionContent to set.
      */
     public void setDefaultQuestionContent(String defaultQuestionContent) {
 	this.defaultQuestionContent = defaultQuestionContent;
@@ -304,7 +286,7 @@
 
     /**
      * @param requestedModule
-     *                The requestedModule to set.
+     *            The requestedModule to set.
      */
     public void setRequestedModule(String requestedModule) {
 	this.requestedModule = requestedModule;
@@ -319,7 +301,7 @@
 
     /**
      * @param activityInstructions
-     *                The activityInstructions to set.
+     *            The activityInstructions to set.
      */
     public void setActivityInstructions(String activityInstructions) {
 	this.activityInstructions = activityInstructions;
@@ -334,7 +316,7 @@
 
     /**
      * @param activityTitle
-     *                The activityTitle to set.
+     *            The activityTitle to set.
      */
     public void setActivityTitle(String activityTitle) {
 	this.activityTitle = activityTitle;
@@ -349,7 +331,7 @@
 
     /**
      * @param questionsSequenced
-     *                The questionsSequenced to set.
+     *            The questionsSequenced to set.
      */
     public void setQuestionsSequenced(String questionsSequenced) {
 	this.questionsSequenced = questionsSequenced;
@@ -364,7 +346,7 @@
 
     /**
      * @param synchInMonitor
-     *                The synchInMonitor to set.
+     *            The synchInMonitor to set.
      */
     public void setSynchInMonitor(String synchInMonitor) {
 	this.synchInMonitor = synchInMonitor;
@@ -379,12 +361,12 @@
 
     /**
      * @param usernameVisible
-     *                The usernameVisible to set.
+     *            The usernameVisible to set.
      */
     public void setUsernameVisible(String usernameVisible) {
 	this.usernameVisible = usernameVisible;
     }
-    
+
     /**
      * @return Returns the allowRateAnswers.
      */
@@ -394,12 +376,12 @@
 
     /**
      * @param allowRateAnswers
-     *                The allowRateAnswers to set.
+     *            The allowRateAnswers to set.
      */
     public void setAllowRateAnswers(String allowRateAnswers) {
 	this.allowRateAnswers = allowRateAnswers;
     }
-    
+
     /**
      * @return Returns the currentTab.
      */
@@ -409,7 +391,7 @@
 
     /**
      * @param currentTab
-     *                The currentTab to set.
+     *            The currentTab to set.
      */
     public void setCurrentTab(String currentTab) {
 	this.currentTab = currentTab;
@@ -424,7 +406,7 @@
 
     /**
      * @param sbmtSuccess
-     *                The sbmtSuccess to set.
+     *            The sbmtSuccess to set.
      */
     public void setSbmtSuccess(String sbmtSuccess) {
 	this.sbmtSuccess = sbmtSuccess;
@@ -439,7 +421,7 @@
 
     /**
      * @param contentFolderID
-     *                The contentFolderID to set.
+     *            The contentFolderID to set.
      */
     public void setContentFolderID(String contentFolderID) {
 	this.contentFolderID = contentFolderID;
@@ -454,7 +436,7 @@
 
     /**
      * @param editableQuestionText
-     *                The editableQuestionText to set.
+     *            The editableQuestionText to set.
      */
     public void setEditableQuestionText(String editableQuestionText) {
 	this.editableQuestionText = editableQuestionText;
@@ -469,7 +451,7 @@
 
     /**
      * @param editableQuestionFeedback
-     *                The editableQuestionFeedback to set.
+     *            The editableQuestionFeedback to set.
      */
     public void setEditableQuestionFeedback(String editableQuestionFeedback) {
 	this.editableQuestionFeedback = editableQuestionFeedback;
@@ -484,7 +466,7 @@
 
     /**
      * @param reflect
-     *                The reflect to set.
+     *            The reflect to set.
      */
     public void setReflect(String reflect) {
 	this.reflect = reflect;
@@ -499,7 +481,7 @@
 
     /**
      * @param reflectionSubject
-     *                The reflectionSubject to set.
+     *            The reflectionSubject to set.
      */
     public void setReflectionSubject(String reflectionSubject) {
 	this.reflectionSubject = reflectionSubject;
@@ -514,7 +496,7 @@
 
     /**
      * @param lockWhenFinished
-     *                The lockWhenFinished to set.
+     *            The lockWhenFinished to set.
      */
     public void setLockWhenFinished(String lockWhenFinished) {
 	this.lockWhenFinished = lockWhenFinished;
@@ -529,27 +511,26 @@
 
     /**
      * @param showOtherAnswers
-     *                The showOtherAnswers to set.
+     *            The showOtherAnswers to set.
      */
     public void setShowOtherAnswers(String showOtherAnswers) {
 	this.showOtherAnswers = showOtherAnswers;
     }
 
     public Boolean getAllowRichEditor() {
-        return allowRichEditor;
+	return allowRichEditor;
     }
 
     public void setAllowRichEditor(Boolean allowRichEditor) {
-        this.allowRichEditor = allowRichEditor;
+	this.allowRichEditor = allowRichEditor;
     }
-    
+
     public Boolean getUseSelectLeaderToolOuput() {
-        return useSelectLeaderToolOuput;
+	return useSelectLeaderToolOuput;
     }
 
     public void setUseSelectLeaderToolOuput(Boolean useSelectLeaderToolOuput) {
-        this.useSelectLeaderToolOuput = useSelectLeaderToolOuput;
+	this.useSelectLeaderToolOuput = useSelectLeaderToolOuput;
     }
-    
-    
+
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java	(.../QaImportContentVersionFilter.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java	(.../QaImportContentVersionFilter.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -55,4 +55,11 @@
 	this.removeField(QaContent.class, "offlineInstructions");
 	this.removeField(QaContent.class, "qaUploadedFiles");
     }
+    
+    /**
+     * Import 20140102 version content to 20140527 version tool server.
+     */
+    public void up20140102To20140102() {
+	this.removeField(QaContent.class, "contentLocked");
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r739a0ff882dea8faf9d6a9be39a61308adbff050 -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 739a0ff882dea8faf9d6a9be39a61308adbff050)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -375,11 +375,6 @@
 
 	QaSession session = getSessionById(new Long(toolSessionID));
 	QaContent qaContent = session.getQaContent();
-	//set content in use
-	if (!qaContent.isContentLocked()) {
-	    qaContent.setContentLocked(true);
-	    updateQa(qaContent);
-	}
 	
 	QaQueContent question = getQuestionByContentAndDisplayOrder(new Long(questionDisplayOrder),
 		qaContent.getUid());
@@ -1264,7 +1259,6 @@
     public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) {
 	Date now = new Date();
 	QaContent toolContentObj = new QaContent();
-	toolContentObj.setContentLocked(false);
 	toolContentObj.setCreatedBy(user.getUserID().longValue());
 	toolContentObj.setCreationDate(now);
 	toolContentObj.setDefineLater(false);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java
===================================================================
diff -u -raf2294a9411ee67e92a614ee7e60df3c1c764b6e -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java	(.../QaUtils.java)	(revision af2294a9411ee67e92a614ee7e60df3c1c764b6e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java	(.../QaUtils.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -262,7 +262,6 @@
 	request.getSession().removeAttribute(SHOW_AUTHORING_TABS);
 	request.getSession().removeAttribute(DEFINE_LATER);
 	request.getSession().removeAttribute(SOURCE_MC_STARTER);
-	request.getSession().removeAttribute(IS_MONITORED_CONTENT_IN_USE);
 	request.getSession().removeAttribute(LOAD_MONITORING_CONTENT_EDITACTIVITY);
 	request.getSession().removeAttribute(MONITORING_ORIGINATED_DEFINELATER);
 	request.getSession().removeAttribute(REQUEST_LEARNING_REPORT);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
diff -u -raf2294a9411ee67e92a614ee7e60df3c1c764b6e -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision af2294a9411ee67e92a614ee7e60df3c1c764b6e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -50,7 +50,6 @@
 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.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;
@@ -1000,21 +999,6 @@
 	qaAuthoringForm.setDefineLaterInEditMode(new Boolean(true).toString());
 	qaGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 
-	boolean isContentInUse = qaContent.isContentLocked();
-
-	qaGeneralAuthoringDTO.setMonitoredContentInUse(new Boolean(false).toString());
-	if (isContentInUse == true) {
-	    //monitoring url does not allow editActivity since the content is in use
-	    persistError(request, "error.content.inUse");
-	    qaGeneralAuthoringDTO.setMonitoredContentInUse(new Boolean(true).toString());
-	}
-
-	EditActivityDTO editActivityDTO = new EditActivityDTO();
-	if (isContentInUse == true) {
-	    editActivityDTO.setMonitoredContentInUse(new Boolean(true).toString());
-	}
-	request.setAttribute(QaAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
-
 	QaUtils.setDefineLater(request, true, strToolContentID, qaService);
 
 	QaUtils.setFormProperties(request, qaService, qaAuthoringForm, qaGeneralAuthoringDTO, strToolContentID,
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
diff -u -raf2294a9411ee67e92a614ee7e60df3c1c764b6e -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision af2294a9411ee67e92a614ee7e60df3c1c764b6e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -49,7 +49,6 @@
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
-import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO;
 import org.lamsfoundation.lams.tool.qa.dto.GeneralMonitoringDTO;
 import org.lamsfoundation.lams.tool.qa.dto.QaGeneralAuthoringDTO;
 import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
@@ -135,13 +134,6 @@
 	
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
-	EditActivityDTO editActivityDTO = new EditActivityDTO();
-	boolean isContentInUse = qaContent.isContentLocked();
-	if (isContentInUse == true) {
-	    editActivityDTO.setMonitoredContentInUse(new Boolean(true).toString());
-	}
-	request.setAttribute(QaAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
-
 	
 	request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
@@ -167,12 +159,6 @@
 
 	GeneralMonitoringDTO generalMonitoringDTO = new GeneralMonitoringDTO();
 
-	generalMonitoringDTO.setMonitoredContentInUse(new Boolean(false).toString());
-
-	EditActivityDTO editActivityDTO = new EditActivityDTO();
-	editActivityDTO.setMonitoredContentInUse(new Boolean(false).toString());
-	request.setAttribute(QaAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
-
 	generalMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 
 	
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
diff -u -raf2294a9411ee67e92a614ee7e60df3c1c764b6e -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	(.../QaMonitoringStarterAction.java)	(revision af2294a9411ee67e92a614ee7e60df3c1c764b6e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	(.../QaMonitoringStarterAction.java)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -48,7 +48,6 @@
 import org.lamsfoundation.lams.tool.qa.QaCondition;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
-import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO;
 import org.lamsfoundation.lams.tool.qa.dto.GeneralMonitoringDTO;
 import org.lamsfoundation.lams.tool.qa.dto.QaGeneralAuthoringDTO;
 import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
@@ -126,13 +125,6 @@
 
 	/* this section is related to summary tab. Starts here. */
 
-	EditActivityDTO editActivityDTO = new EditActivityDTO();
-	boolean isContentInUse = qaContent.isContentLocked();
-	if (isContentInUse == true) {
-	    editActivityDTO.setMonitoredContentInUse(new Boolean(true).toString());
-	}
-	request.setAttribute(QaAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
-
 	generalMonitoringDTO.setContentFolderID(contentFolderID);
 	int countSessionComplete = qaService.countSessionComplete(qaContent);
 	generalMonitoringDTO.setCountSessionComplete(new Integer(countSessionComplete).toString());
Index: lams_tool_laqa/web/monitoring/Edit.jsp
===================================================================
diff -u -r1ee1717d34cafe922d727dd9cd95b796db90eea4 -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 1ee1717d34cafe922d727dd9cd95b796db90eea4)
+++ lams_tool_laqa/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -5,22 +5,6 @@
 
 <%@ include file="/common/messages.jsp"%>
 
-<c:if test="${editActivityDTO.monitoredContentInUse != 'true'}"> 
-	<c:if test="${qaGeneralMonitoringDTO.defineLaterInEditMode != 'true'}">
-		<jsp:include page="/authoring/BasicContentViewOnly.jsp" />
-	</c:if>
-						
-	<c:if test="${qaGeneralMonitoringDTO.defineLaterInEditMode == 'true'}">
-		<jsp:include page="/authoring/BasicContent.jsp" />
-	</c:if>
-</c:if>
-
-
-	<c:if test="${editActivityDTO.monitoredContentInUse == 'true'}"> 			
-		<div class="warning">
-			<fmt:message key="error.content.inUse"/>
-		</div>
-		<br/>
 		<table>
 			<tr>
 			 <td width="10%" nowrap valign="top" class="field-name">
@@ -38,6 +22,5 @@
 			 	<c:out value="${content.instructions}" escapeXml="false"/>
 			 </td>
 			</tr>			 
-		</table>
-	</c:if> 																									
+		</table>																								
 		
\ No newline at end of file
Index: lams_tool_laqa/web/monitoring/editQuestionBox.jsp
===================================================================
diff -u -r9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90 -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d
--- lams_tool_laqa/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90)
+++ lams_tool_laqa/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d)
@@ -20,9 +20,8 @@
 	</lams:head>
 	
 	<body class="stripes">
-		<table cellpadding="0">
 
-			<html:form  action="/monitoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">			
+		<html:form  action="/monitoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">			
 			<html:hidden property="dispatch" value="saveSingleQuestion"/>
 			<html:hidden property="toolContentID"/>
 			<html:hidden property="currentTab" styleId="currentTab" />
@@ -34,9 +33,6 @@
 			<html:hidden property="editableQuestionIndex"/>														
 			<html:hidden property="editQuestionBoxRequest" value="true"/>																	
 
-		
-			<tr>
-			<td>
 			<table class="innerforms">
 		
 				<tr>
@@ -95,13 +91,9 @@
 				</tr>
 				
 
-			</table>				
-			</td>
-			</tr>
+			</table>
 				
-			</html:form>
-			
-		</table>
+		</html:form>
 
 	</body>
 </lams:html>
\ No newline at end of file