Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r823871bf3fd2d695c40bc974a24e66b4100d731b -re0263882ae316e5436f2140916dade4df7120bfc
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision e0263882ae316e5436f2140916dade4df7120bfc)
@@ -63,7 +63,7 @@
 
     <property
         name="creationDate"
-        type="java.lang.String"
+        type="java.util.Date"
         access="property"        
         column="creation_date"
         length="10"
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -r823871bf3fd2d695c40bc974a24e66b4100d731b -re0263882ae316e5436f2140916dade4df7120bfc
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision e0263882ae316e5436f2140916dade4df7120bfc)
@@ -3,7 +3,7 @@
      , qa_content_id BIGINT(20) NOT NULL
      , title TEXT
      , instructions TEXT
-     , creation_date VARCHAR(100)
+     , creation_date DATETIME
      , update_date DATETIME
      , questions_sequenced TINYINT(1) NOT NULL DEFAULT 0
      , username_visible TINYINT(1) NOT NULL DEFAULT 0
@@ -88,6 +88,7 @@
                   REFERENCES tl_laqa11_content (uid)
 )TYPE=InnoDB;
 
+
 -- data for content table
 INSERT INTO tl_laqa11_content (qa_content_id, title, instructions, creation_date)  VALUES (${default_content_id}, 'Q&A Title', 'Q&A Instructions', NOW());
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r823871bf3fd2d695c40bc974a24e66b4100d731b -re0263882ae316e5436f2140916dade4df7120bfc
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision e0263882ae316e5436f2140916dade4df7120bfc)
@@ -63,7 +63,7 @@
 
     <property
         name="creationDate"
-        type="java.lang.String"
+        type="java.util.Date"
         access="property"        
         column="creation_date"
         length="10"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re0263882ae316e5436f2140916dade4df7120bfc
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision e0263882ae316e5436f2140916dade4df7120bfc)
@@ -104,10 +104,7 @@
     private boolean contentLocked;
     
     /** nullable persistent field */
-    private String endLearningMessage;
-    
-    /** nullable persistent field */
-    private String creationDate;
+    private Date creationDate;
 	
     /** nullable persistent field */
     private Date updateDate;
@@ -133,15 +130,14 @@
 	                 String 	monitoringReportTitle,
 	                 String 	offlineInstructions,
 	                 String 	onlineInstructions,
-	                 String 	endLearningMessage,
 	                 long		createdBy,
 	                 boolean 	defineLater,
 					 boolean	runOffline,
 					 boolean 	questionsSequenced,
 	                 boolean 	usernameVisible,
 	                 boolean 	synchInMonitor,
 	                 boolean 	contentLocked,
-	                 String		creationDate,
+	                 Date		creationDate,
 	                 Date 		updateDate,
 	                 Set 		qaQueContents,
 	                 Set 		qaSessions,
@@ -155,7 +151,6 @@
         this.monitoringReportTitle=monitoringReportTitle;
         this.offlineInstructions = offlineInstructions;
         this.onlineInstructions  = onlineInstructions;
-        this.endLearningMessage	 = endLearningMessage;
         this.createdBy 			 = createdBy;
         this.defineLater 		 = defineLater;
         this.runOffline 		 = runOffline;
@@ -191,7 +186,6 @@
 					 qa.getMonitoringReportTitle(),
                      qa.getOfflineInstructions(),
                      qa.getOnlineInstructions(),
-					 qa.getEndLearningMessage(),
                      qa.getCreatedBy(),
                      qa.isDefineLater(),
 					 qa.isRunOffline(),
@@ -312,10 +306,6 @@
                                         .append("qa title:", getTitle())
                                         .append("qa instructions:",
                                                 getInstructions())
-                                        .append("date created:",
-                                        		getCreationDate())
-										.append("update date:",
-												getUpdateDate())												
                                         .append("creator user id",
                                         		getCreatedBy())
                                         .append("username_visible:", isUsernameVisible())
@@ -358,18 +348,6 @@
 		this.createdBy = createdBy;
 	}
 	/**
-	 * @return Returns the creationDate.
-	 */
-	public String getCreationDate() {
-		return creationDate;
-	}
-	/**
-	 * @param creationDate The creationDate to set.
-	 */
-	public void setCreationDate(String creationDate) {
-		this.creationDate = creationDate;
-	}
-	/**
 	 * @return Returns the defineLater.
 	 */
 	public boolean isDefineLater() {
@@ -479,18 +457,6 @@
 		this.questionsSequenced = questionsSequenced;
 	}
 	/**
-	 * @return Returns the endLearningMessage.
-	 */
-	public String getEndLearningMessage() {
-		return endLearningMessage;
-	}
-	/**
-	 * @param endLearningMessage The endLearningMessage to set.
-	 */
-	public void setEndLearningMessage(String endLearningMessage) {
-		this.endLearningMessage = endLearningMessage;
-	}
-	/**
 	 * @return Returns the runOffline.
 	 */
 	public boolean isRunOffline() {
@@ -564,4 +530,28 @@
 	public void setContent(String content) {
 		this.content = content;
 	}
+    /**
+     * @return Returns the logger.
+     */
+    public static Logger getLogger() {
+        return logger;
+    }
+    /**
+     * @param logger The logger to set.
+     */
+    public static void setLogger(Logger logger) {
+        QaContent.logger = logger;
+    }
+    /**
+     * @return Returns the creationDate.
+     */
+    public Date getCreationDate() {
+        return creationDate;
+    }
+    /**
+     * @param creationDate The creationDate to set.
+     */
+    public void setCreationDate(Date creationDate) {
+        this.creationDate = creationDate;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
diff -u -r0e25eab07d7153c61f50deb6332abc0d4ed3ec69 -re0263882ae316e5436f2140916dade4df7120bfc
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision 0e25eab07d7153c61f50deb6332abc0d4ed3ec69)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision e0263882ae316e5436f2140916dade4df7120bfc)
@@ -69,7 +69,6 @@
 		
 	    qaGeneralAuthoringDTO.setReportTitle(defaultQaContent.getReportTitle());
 	    qaGeneralAuthoringDTO.setMonitoringReportTitle(defaultQaContent.getMonitoringReportTitle());
-	    qaGeneralAuthoringDTO.setEndLearningMessage(defaultQaContent.getEndLearningMessage());
 	    qaGeneralAuthoringDTO.setOnlineInstructions(defaultQaContent.getOnlineInstructions());
 	    qaGeneralAuthoringDTO.setOfflineInstructions(defaultQaContent.getOfflineInstructions());
 		
@@ -137,7 +136,6 @@
 		
 		qaGeneralAuthoringDTO.setReportTitle(qaContent.getReportTitle());
 	    qaGeneralAuthoringDTO.setMonitoringReportTitle(qaContent.getMonitoringReportTitle());
-	    qaGeneralAuthoringDTO.setEndLearningMessage(qaContent.getEndLearningMessage());
 	    qaGeneralAuthoringDTO.setOnlineInstructions(qaContent.getOnlineInstructions());
 	    qaGeneralAuthoringDTO.setOfflineInstructions(qaContent.getOfflineInstructions());
 	    
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r2c5c7c68e66e26cef44208bc922b056e3bfb1dd6 -re0263882ae316e5436f2140916dade4df7120bfc
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 2c5c7c68e66e26cef44208bc922b056e3bfb1dd6)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision e0263882ae316e5436f2140916dade4df7120bfc)
@@ -63,7 +63,7 @@
 
     <property
         name="creationDate"
-        type="java.lang.String"
+        type="java.util.Date"
         access="property"        
         column="creation_date"
         length="10"
@@ -133,7 +133,7 @@
         name="contentLocked"
         type="boolean"
         access="property"        
-        column="content_locked"
+        column="content_inUse"
         length="1"
     />
     
@@ -155,14 +155,6 @@
         length="65535"
     />
     
-    <property
-        name="endLearningMessage"
-        type="java.lang.String"
-        access="property"        
-        column="end_learning_message"
-        length="65535"
-    />
-    
 
    	 <set
             name="qaQueContents"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re0263882ae316e5436f2140916dade4df7120bfc
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java	(.../QaDataAccessTestCase.java)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java	(.../QaDataAccessTestCase.java)	(revision e0263882ae316e5436f2140916dade4df7120bfc)
@@ -103,22 +103,6 @@
     }
     
     /*
-    protected QaQueUsr getExistingUser2(String username, String fullname)
-    {
-    	QaQueContent qaQueContent = qaQueContentDAO.getQaQueById(TEST_NEW_QUE_CONTENT_ID);
-		QaSession qaSession = qaSessionDAO.getQaSessionById(TEST_NEW_SESSION_ID);
-    	
-        QaQueUsr qaQueUsr= new QaQueUsr(new Long(TEST_NEW_USER_ID),
-    									username,
-										fullname,
-										qaQueContent, 
-										qaSession, 
-										new TreeSet());
-    	qaQueUsrDAO.createUsr(qaQueUsr);
-    	return qaQueUsr;
-    }
-    
-    
     protected QaQueUsr getExistingUser(String username, String fullname)
     {
     	QaQueContent qaQueContent = qaQueContentDAO.getQaQueById(TEST_EXISTING_QUE_CONTENT_ID);
@@ -145,19 +129,6 @@
 		qaUsrRespDAO.createUserResponse(qaUsrResp);
 		return qaUsrResp;
     }
-    
-    protected QaUsrResp getExistingResponse(String response)
-    {
-    	QaQueContent qaQueContent = qaQueContentDAO.getQaQueById(TEST_EXISTING_QUE_CONTENT_ID);
-    	
-		QaUsrResp qaUsrResp= new QaUsrResp(response, false,
-											new Date(System.currentTimeMillis()),
-											"",
-											qaQueContent,
-											getExistingUser("randomstriker","Michael Random"));
-		qaUsrRespDAO.createUserResponse(qaUsrResp);
-		return qaUsrResp;
-    }
     */
     
     
@@ -167,7 +138,7 @@
     	qa.setQaContentId(new Long(TEST_NEW_CONTENT_ID+1));
     	qa.setTitle("New - Put Title Here");
     	qa.setInstructions("New - Put instructions here.");
-    	qa.setCreationDate(new Date(System.currentTimeMillis()).toString() );
+    	qa.setCreationDate(new Date(System.currentTimeMillis()));
     	qa.setCreatedBy(0);
         qa.setUsernameVisible(false);
         qa.setDefineLater(false);
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re0263882ae316e5436f2140916dade4df7120bfc
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	(.../TestQaContent.java)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	(.../TestQaContent.java)	(revision e0263882ae316e5436f2140916dade4df7120bfc)
@@ -22,11 +22,6 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.qa;
 
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.TreeSet;
-
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 
 
@@ -200,8 +195,6 @@
     /*
     public void testRemoveQaContent()
     {
-    //	qaQueContentDAO.removeQueContent(TEST_EXISTING_QUE_CONTENT_ID);
-    //	System.out.println(this.getClass().getName() + " TEST_EXISTING_QUE_CONTENT_ID removed");
     	
     	qaContentDAO.removeQa(new Long(DEFAULT_CONTENT_ID));
     	System.out.println(this.getClass().getName() + " DEFAULT_CONTENT_ID removed");