Index: lams_tool_laqa/db/sql/tool_insert.sql
===================================================================
diff -u -r40529cd9dba723f60bb5b2ae6143638371651625 -r139266c30da4c42fbf9d5d20094393f355d13dad
--- lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 40529cd9dba723f60bb5b2ae6143638371651625)
+++ lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 139266c30da4c42fbf9d5d20094393f355d13dad)
@@ -55,7 +55,7 @@
 'Question and Answer',
 'Q/A Tool',
 'qa',
-'20061102',
+'20061113',
 NULL,
 NULL,
 0,
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java	(revision 139266c30da4c42fbf9d5d20094393f355d13dad)
@@ -0,0 +1,41 @@
+/***************************************************************************
+ * 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
+ * ************************************************************************
+ */
+package org.lamsfoundation.lams.tool.qa.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.qa.QaContent;
+
+/**
+ * Import filter class for different versions of Q&A content.
+ */
+public class QaImportContentVersionFilter extends ToolContentVersionFilter{
+
+	/**
+	 * Import 2.0RC1 version content to 2.0RC2 version. Added lock on finish
+	 * field.
+	 */
+	public void up20061102To20061113(){
+		// Change name to suit the version you give the tool.
+		this.addField(QaContent.class, "lockWhenFinished", true);
+	}
+}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r139266c30da4c42fbf9d5d20094393f355d13dad
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 139266c30da4c42fbf9d5d20094393f355d13dad)
@@ -1485,6 +1485,9 @@
 		 try {
 				exportContentService.registerFileClassForImport(QaUploadedFile.class.getName(),"uuid",null,"fileName","fileProperty",null,null);
 				
+				//register version filter class
+				exportContentService.registerImportVersionFilterClass(QaImportContentVersionFilter.class);
+
 				Object toolPOJO =  exportContentService.importToolContent(toolContentPath,qaToolContentHandler,fromVersion,toVersion);
 				if(!(toolPOJO instanceof QaContent))
 					throw new ImportToolContentException("Import QA tool content failed. Deserialized object is " + toolPOJO);
@@ -2104,25 +2107,25 @@
     {
     	Date now = new Date();
     	QaContent toolContentObj = new QaContent();
-    	toolContentObj.setContentLocked(Boolean.FALSE.booleanValue() );
+    	toolContentObj.setContentLocked(false);
     	toolContentObj.setCreatedBy(user.getUserID().longValue());
     	toolContentObj.setCreationDate(now);
-    	toolContentObj.setDefineLater(Boolean.FALSE.booleanValue());
+    	toolContentObj.setDefineLater(false);
     	toolContentObj.setInstructions(null);
     	toolContentObj.setOfflineInstructions(null);
     	toolContentObj.setOnlineInstructions(null);
- 	    toolContentObj.setReflect(Boolean.FALSE.booleanValue());
+ 	    toolContentObj.setReflect(false);
     	toolContentObj.setReflectionSubject(null);
-    	toolContentObj.setRunOffline(Boolean.FALSE.booleanValue());
+    	toolContentObj.setRunOffline(false);
     	toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
     	toolContentObj.setQaContentId(toolContentId);
     	toolContentObj.setUpdateDate(now);
-    	toolContentObj.setQuestionsSequenced(Boolean.FALSE.booleanValue()); // there is only 1 question
+    	toolContentObj.setQuestionsSequenced(false); // there is only 1 question
     	toolContentObj.setContent(null);
     	toolContentObj.setReportTitle(null);
     	toolContentObj.setMonitoringReportTitle(null);
     	toolContentObj.setSynchInMonitor(false); // doesn't appear to be used in LAMS 2.0
-    	toolContentObj.setLockWhenFinished(Boolean.TRUE.booleanValue()); // doesn't appear to be used in LAMS 2.0
+    	toolContentObj.setLockWhenFinished(true); 
     	
     	Boolean bool;
 		try {
@@ -2163,7 +2166,7 @@
 	       			+" as the tool content does not exist.");
     	}
     	
-    	qaContent.setReflect(Boolean.TRUE.booleanValue());
+    	qaContent.setReflect(true);
     	qaContent.setReflectionSubject(description);
     }