Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml
===================================================================
diff -u -r92a8f83706fa45c3ee72fb07aae85ad3107bb28e -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 92a8f83706fa45c3ee72fb07aae85ad3107bb28e)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -38,7 +38,7 @@
             name="fileName"
             type="java.lang.String"
             access="property"
-            column="fileName"
+            column="filename"
    />
    
        <!--  property
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
===================================================================
diff -u -r29b508d4481abb4c95cbbf153b49f698c58f433b -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision 29b508d4481abb4c95cbbf153b49f698c58f433b)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -31,6 +31,9 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
+import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 
 
@@ -175,8 +178,9 @@
      * @param newContentId the new qa content id.
      * @return the new qa content object.
      */
-    public static QaContent newInstance(QaContent qa,
+    public static QaContent newInstance(IToolContentHandler toolContentHandler, QaContent qa,
             Long newContentId)
+    	throws ItemNotFoundException, RepositoryCheckedException
     {
     	QaContent newContent = new QaContent(newContentId,
     				 qa.getContent(),
@@ -202,10 +206,12 @@
     	logger.debug(logger + " " + "QaContent" +  " " + "before doing deepCopyQaQueContent");
     	newContent.setQaQueContents(qa.deepCopyQaQueContent(newContent));
     	logger.debug(logger + " " + "QaContent" +  " " + "after doing deepCopyQaQueContent");
+
+    	newContent.setQaUploadedFiles(qa.deepCopyQaAttachments(toolContentHandler, newContent));	
+		
     	return newContent;
 	}
 
-    
     public Set deepCopyQaQueContent(QaContent newQaContent)
     {
     	logger.debug(logger + " " + "QaContent" +  " " + "start of deepCopyQaQueContent");
@@ -222,6 +228,25 @@
     }
     
     
+    public Set deepCopyQaAttachments(IToolContentHandler toolContentHandler,QaContent newQaContent)
+    throws ItemNotFoundException, RepositoryCheckedException
+    {
+    	Set attachments = new TreeSet();
+        for (Iterator i = this.getQaUploadedFiles().iterator(); i.hasNext();)
+        {
+        	QaUploadedFile qaUploadedFile = (QaUploadedFile) i.next();
+            if (qaUploadedFile.getQaContent() != null)
+            {
+            	QaUploadedFile newQaUploadedFile=QaUploadedFile.newInstance(toolContentHandler, qaUploadedFile,
+            			newQaContent);
+            	attachments.add(newQaUploadedFile);
+            }
+        }
+        return attachments;
+    }
+    
+    
+    
     public Set deepCopyQaSession(QaContent newQaSession)
     {
         return new TreeSet();
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml
===================================================================
diff -u -r6582f99968f17e3e54b6f83230f6fe0b67b019e6 -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 6582f99968f17e3e54b6f83230f6fe0b67b019e6)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -38,7 +38,7 @@
             name="fileName"
             type="java.lang.String"
             access="property"
-            column="fileName"
+            column="filename"
    />
    
        <!--  property
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java
===================================================================
diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java	(.../QaUploadedFile.java)	(revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java	(.../QaUploadedFile.java)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -26,6 +26,11 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
+import org.lamsfoundation.lams.contentrepository.NodeKey;
+import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 
 /**
  * 
@@ -43,8 +48,9 @@
  * Holds question content within a particular content  
  */
 
-public class QaUploadedFile implements Serializable
+public class QaUploadedFile implements Serializable, Comparable
 {
+	static Logger logger = Logger.getLogger(QaUploadedFile.class.getName());
 	/** identifier field */
     private Long submissionId;
     
@@ -75,12 +81,41 @@
         this.fileName = fileName;
         this.qaContent=qaContent;
     }
+    
+    
+    public static QaUploadedFile newInstance(IToolContentHandler toolContentHandler, QaUploadedFile qaUploadedFile,
+			QaContent newMcContent) throws ItemNotFoundException, RepositoryCheckedException
+			
+	{
+    	QaUploadedFile newMcUploadedFile=null;
 
+    	try
+		{
+    		NodeKey copiedNodeKey =  toolContentHandler.copyFile(new Long(qaUploadedFile.getUuid()));
+        	logger.debug("copied NodeKey: " + copiedNodeKey);
+        	logger.debug("copied NodeKey uuid: " + copiedNodeKey.getUuid().toString());
+        	newMcUploadedFile = new QaUploadedFile(copiedNodeKey.getUuid().toString(),
+        			qaUploadedFile.isFileOnline(),
+        			qaUploadedFile.getFileName(),
+					newMcContent);
+
+		}
+		catch(RepositoryCheckedException e)
+		{
+			logger.debug("error occurred: " + e);
+		}
+		
+    	return newMcUploadedFile;
+	}
+    
+    
+
     public QaUploadedFile(String uuid, 
     					boolean fileOnline, 
     					String fileName,
 						QaContent qaContent)  
     {
+    	logger.debug("constructor gets called.");
         this.uuid = uuid;
         this.fileOnline = fileOnline;
         this.fileName = fileName;
@@ -172,4 +207,14 @@
 	public void setFileOnline(boolean fileOnline) {
 		this.fileOnline = fileOnline;
 	}
+	
+	public int compareTo(Object o)
+    {
+		QaUploadedFile file = (QaUploadedFile) o;
+        //if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference.
+        if (submissionId == null)
+        	return 1;
+		else
+			return (int) (submissionId.longValue() - file.submissionId.longValue());
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaContentDAO.java
===================================================================
diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaContentDAO.java	(.../IQaContentDAO.java)	(revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaContentDAO.java	(.../IQaContentDAO.java)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -39,6 +39,8 @@
 	
 	public QaContent getQaBySession(Long sessionId);
     
+	public void saveOrUpdateQa(QaContent qa);
+	
     public void saveQa(QaContent qa);
     
     public void updateQa(QaContent qa);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java
===================================================================
diff -u -r1f174bd80945a04023d087aba42b4041e450d557 -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java	(.../QaContentDAO.java)	(revision 1f174bd80945a04023d087aba42b4041e450d557)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java	(.../QaContentDAO.java)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -110,9 +110,18 @@
 	     
 	    public void saveQa(QaContent qa) 
 	    {
+	    	this.getSession().setFlushMode(FlushMode.AUTO);
 	    	this.getHibernateTemplate().save(qa);
 	    }
 	    
+	 	public void saveOrUpdateQa(QaContent qa)
+	    {
+	 		this.getSession().setFlushMode(FlushMode.AUTO);
+			logger.debug("before saveOrUpdateQa: " + qa);
+			this.getHibernateTemplate().saveOrUpdate(qa);
+	    }
+
+	    
 	    public void createQa(QaContent qa) 
 	    {
 	    	this.getSession().setFlushMode(FlushMode.AUTO);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r6582f99968f17e3e54b6f83230f6fe0b67b019e6 -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 6582f99968f17e3e54b6f83230f6fe0b67b019e6)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -79,6 +79,7 @@
 					<property name="toolService"><ref bean="lamsToolService"/></property>
 					<property name="repositoryService"><ref bean="repositoryService"/></property>
 					<property name="learnerService"><ref bean="learnerService"/></property>			
+					<property name="qaToolContentHandler"><ref bean="qaToolContentHandler"/></property>								
 				</bean>
 			</property>
 			<property name="transactionAttributes">
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
diff -u -r29b508d4481abb4c95cbbf153b49f698c58f433b -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision 29b508d4481abb4c95cbbf153b49f698c58f433b)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -63,6 +63,8 @@
      */
     
 	public QaContent loadQa(long toolContentId) throws QaApplicationException;
+	
+	public void saveOrUpdateQa(QaContent qa) throws QaApplicationException;
 
 	public QaContent getQaContentByUID(Long uid) throws QaApplicationException;
 	
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r29b508d4481abb4c95cbbf153b49f698c58f433b -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 29b508d4481abb4c95cbbf153b49f698c58f433b)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -38,6 +38,7 @@
 import org.lamsfoundation.lams.contentrepository.LoginException;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
@@ -108,6 +109,7 @@
     private IQaUsrRespDAO 		qaUsrRespDAO;
     private IQaUploadedFileDAO  qaUploadedFileDAO;
     
+    private IToolContentHandler qaToolContentHandler = null;
     private IUserManagementService userManagementService;
     private ILamsToolService toolService;
     private ILearnerService learnerService;
@@ -180,6 +182,21 @@
 														   e);
         }
     }
+    
+    public void saveOrUpdateQa(QaContent qa) throws QaApplicationException
+	{
+        try
+        {
+            qaDAO.saveOrUpdateQa(qa);
+        }
+        catch (DataAccessException e)
+        {
+            throw new QaApplicationException("Exception occured when lams is saveOrUpdating qa content: "
+                                                         + e.getMessage(),
+														   e);
+        }
+    	
+	}
 
     /**
      * returns null if not found
@@ -820,6 +837,7 @@
 	 * 
 	 */
     public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException
+     
     {
     	logger.debug("start of copyToolContent with ids: " + fromContentId + " and " + toContentId);
 
@@ -873,7 +891,9 @@
             
             logger.debug("final - retrieved fromContent: " + fromContent);
             logger.debug("final - before new instance using " + fromContent + " and " + toContentId);
-            QaContent toContent = QaContent.newInstance(fromContent,toContentId);
+            
+            
+            QaContent toContent = QaContent.newInstance(qaToolContentHandler, fromContent,toContentId);
             if (toContent == null)
             {
             	logger.debug("throwing ToolException: WARNING!, retrieved toContent is null.");
@@ -892,6 +912,15 @@
         	logger.debug("throwing ToolException: Exception occured when lams is copying content between content ids.");
             throw new ToolException("Exception occured when lams is copying content between content ids."); 
         }
+        catch (ItemNotFoundException e)
+        {
+            throw new ToolException("Exception occured when lams is copying content between content ids."); 
+        }
+        catch (RepositoryCheckedException e)
+        {
+            throw new ToolException("Exception occured when lams is copying content between content ids."); 
+        }
+        
     }
 
 
@@ -1534,22 +1563,17 @@
     /**
      * adds a new entry to the uploaded files table
      */
-    public void persistFile(QaContent content, QaUploadedFile file) throws QaApplicationException {       
+    public void persistFile(QaContent content, QaUploadedFile file) throws QaApplicationException {
+    	logger.debug("in persistFile: " + file);
         content.getQaUploadedFiles().add(file);
         file.setQaContent(content);
-        if ( content.getQaContentId() == null ) {
-            qaDAO.saveQa(content);
-        } else {            
-            qaDAO.updateQa(content);
-        }
-        
-        //qaUploadedFileDAO.saveUploadFile(file);
+        qaDAO.saveOrUpdateQa(content);
         logger.debug("persisted qaUploadedFile: " + file);
     }
     
     
     /**
-     * adds a new entry to the uploaded files table
+     * removes an entry from the uploaded files table
      */
     public void removeFile(Long submissionId) throws QaApplicationException {
         qaUploadedFileDAO.removeUploadFile(submissionId);
@@ -1724,4 +1748,16 @@
     {
         this.toolService = toolService;
     }
+	/**
+	 * @return Returns the qaToolContentHandler.
+	 */
+	public IToolContentHandler getQaToolContentHandler() {
+		return qaToolContentHandler;
+	}
+	/**
+	 * @param qaToolContentHandler The qaToolContentHandler to set.
+	 */
+	public void setQaToolContentHandler(IToolContentHandler qaToolContentHandler) {
+		this.qaToolContentHandler = qaToolContentHandler;
+	}
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaToolContentHandler.java
===================================================================
diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaToolContentHandler.java	(.../QaToolContentHandler.java)	(revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaToolContentHandler.java	(.../QaToolContentHandler.java)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -26,8 +26,6 @@
 
 /**
  * Simple client for accessing the content repository.
- * 
- *  @author <a href="mailto:anthony.xiao@lamsinternational.com">Anthony Xiao</a>
  */
 public class QaToolContentHandler extends ToolContentHandler {
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
diff -u -r792f3d848039cb49080fbaf49d9bc2b2d461943e -ra4b21fc560d5ed7df551c48f3afeab20e136b499
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision 792f3d848039cb49080fbaf49d9bc2b2d461943e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
@@ -158,7 +158,8 @@
         QaContent qaContent = authoringUtil.saveOrUpdateQaContent(mapQuestionContent, qaService, qaAuthoringForm);
         logger.debug("after saveOrUpdateQaContent.");
 
-        saveAttachments(qaContent, attachmentList, deletedAttachmentList, mapping, request);
+        List attacments=saveAttachments(qaContent, attachmentList, deletedAttachmentList, mapping, request);
+        logger.debug("attacments: " + attacments);
   
         errors.clear();
         errors.add(Globals.ERROR_KEY, new ActionMessage("submit.successful"));
@@ -559,7 +560,6 @@
         // if a file with the same name already exists then move the old one to deleted
         deletedAttachmentList = QaUtils.moveToDelete(uploadedFile.getFileName(), isOnlineFile, attachmentList, deletedAttachmentList );
 
-        
         try
         {
             // This is a new file and so is saved to the content repository. Add it to the 
@@ -624,21 +624,32 @@
             List attachmentList, List deletedAttachmentList,
             ActionMapping mapping, HttpServletRequest request) {
 
+    	logger.debug("start saveAttachments, attachmentList " + attachmentList);
+    	logger.debug("start deletedAttachmentList, deletedAttachmentList " + deletedAttachmentList);
+    	
         if(attachmentList==null || deletedAttachmentList==null)
             return null;
         
         IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+        logger.debug("qaService: " + qaService);
         
         if ( deletedAttachmentList != null ) {
+        	logger.debug("deletedAttachmentList is iterated...");
             Iterator iter = deletedAttachmentList.iterator();
             while (iter.hasNext()) {
                 QaUploadedFile attachment = (QaUploadedFile) iter.next();
+                logger.debug("attachment: " + attachment);
                 
                 // remove entry from content repository. deleting a non-existent entry 
                 // shouldn't cause any errors.
-                try {
+                try 
+				{
+                	
                     if(attachment.getUuid()!= null)
-                        getToolContentHandler().deleteFile(Long.getLong(attachment.getUuid()));
+                    {
+                    	getToolContentHandler().deleteFile(Long.getLong(attachment.getUuid()));
+                        logger.error("deleted file with uuid: " + attachment.getUuid());
+                    }
                 }
                 catch (RepositoryCheckedException e) {
                     logger.error("Unable to delete file",e);
@@ -654,16 +665,21 @@
                 }
             }
             deletedAttachmentList.clear();
+            logger.error("cleared attachment list.");
         }
         
-        if ( attachmentList != null ) {
+        if ( attachmentList != null ) 
+        {
+        	logger.debug("attachmentList is iterated...");
             Iterator iter = attachmentList.iterator();
             while (iter.hasNext()) {
                 QaUploadedFile attachment = (QaUploadedFile) iter.next();
+            	logger.debug("attachment: " + attachment);
+            	logger.debug("attachment submission id: " + attachment.getSubmissionId());
 
                 if ( attachment.getSubmissionId() == null ) {
                     // add entry to tool table - file already in content repository
-                    //FIXME: qaService.saveAttachment(nbContent, attachment);
+                	logger.debug("calling persistFile with  attachment: " + attachment);
                     qaService.persistFile(qaContent, attachment);
                 }
             }