Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r2e8644b7159adf3a842b1c622ccbb8a51136e18a -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 2e8644b7159adf3a842b1c622ccbb8a51136e18a)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
@@ -64,6 +64,7 @@
 	private var _duration:Number;
 	private var _readOnly:Boolean;
 	private var _autoSaved:Boolean
+	private var _saveMode:Number;
 	private var _validDesign:Boolean;
 	private var _modified:Boolean;
 	private var _maxID:Number;
@@ -402,9 +403,9 @@
 	 * @usage   
 	 * @return  
 	 */
-	public function getDesignForSaving(isCopy:Boolean):Object{
+	public function getDesignForSaving():Object{
 		prepareDesignForSaving();
-		return toData(isCopy);
+		return toData();
 	}
 	
 	public function getDesignForAutoSave():Object{
@@ -434,7 +435,7 @@
 	 * @usage   
 	 * @return  
 	 */
-	public function toData(isCopy:Boolean):Object{
+	public function toData():Object{
 		var design:Object = new Object();
 		//if null, use default
 		
@@ -493,6 +494,9 @@
 		//valid design must be in the DTO, so if its null, then give a false
 		design.validDesign = (_validDesign==null) ? false : _validDesign;
 		
+		design.saveMode =  (_saveMode!=null) ? _saveMode : Config.NUMERIC_NULL_VALUE;
+		
+		
 		if(_maxID){				design.maxID			= _maxID;				}
 		if(_firstActivityID){	design.firstActivityID	= _firstActivityID;		}
 		if(_firstActivityUIID){	design.firstActivityUIID= _firstActivityID;		}
@@ -512,7 +516,7 @@
 		if(classActs.length > 0){
 			
 			for(var i=0; i<classActs.length; i++){
-				design.activities[i] = classActs[i].toData(isCopy);
+				design.activities[i] = classActs[i].toData();
 			}
 		}
 		
@@ -972,7 +976,7 @@
 	/**
 	 * 
 	 * @usage   
-	 * @param   newparentLearningDesignID 
+	 * @param  
 	 * @return  
 	 */
 	public function set contentFolderID (newcontentFolderID:String):Void {
@@ -986,6 +990,24 @@
 	public function get contentFolderID ():String {
 		return _contentFolderID;
 	}
+	
+		/**
+	 * 
+	 * @usage   
+	 * @param 
+	 * @return  
+	 */
+	public function set saveMode (newSaveMode:Number):Void {
+		_saveMode = newSaveMode;
+	}
+	/**
+	 * 
+	 * @usage   
+	 * @return  
+	 */
+	public function get saveMode ():Number {
+		return _saveMode;
+	}
 
 	
 }
\ No newline at end of file
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 735adeb5d2ea7849b86d4991480630c4613fadec)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
@@ -162,12 +162,13 @@
 	
 	//to data for serialising:
 	
-	public function toData(isCopy:Boolean):Object{
+	public function toData():Object{
 		var dto = super.toData();
 		dto.authoringURL = (_authoringURL) ?  _authoringURL : Config.STRING_NULL_VALUE;	
 		dto.toolDisplayName = (_toolDisplayName) ?  _toolDisplayName: Config.STRING_NULL_VALUE;	
-		if(isCopy) { Application.getInstance().getCanvas().getCanvasModel().setDefaultToolContentID(this); }
 		
+		//if(isCopy) { Application.getInstance().getCanvas().getCanvasModel().setDefaultToolContentID(this); }
+		
 		dto.toolContentID = (_toolContentID) ?  _toolContentID: Config.NUMERIC_NULL_VALUE;	
 		
 		dto.toolID = (_toolID) ?  _toolID: Config.NUMERIC_NULL_VALUE;	
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r2e8644b7159adf3a842b1c622ccbb8a51136e18a -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 2e8644b7159adf3a842b1c622ccbb8a51136e18a)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
@@ -325,9 +325,13 @@
 	 * E.g. Title, Desc, Folder etc... also license if required?
 	 * @usage   
 	 * @param	tabToShow	The tab to be selected when the dialogue opens.
+	 * @param 	mode		save mode
 	 * @return  
 	 */
 	public function saveDesignToServerAs(mode:String){
+		// if design as not been previously saved then we should use SAVE mode
+		if(_ddm.learningDesignID == null) { mode = Workspace.MODE_SAVE }
+		
 		//clear the learningDesignID so it will not overwrite the existing one
 		_ddm.learningDesignID = null;
 		
@@ -353,7 +357,7 @@
 	 */
 	public function saveDesignToServer(workspaceResultDTO:Object):Boolean{
 		_global.breakpoint();
-		var isCopy:Boolean = false;
+		
 		//TODO: Set the results from wsp into design.
 		if(workspaceResultDTO != null){
 			if(workspaceResultDTO.selectedResourceID != null){
@@ -368,9 +372,13 @@
 		}
 		var mode:String = Application.getInstance().getWorkspace().getWorkspaceModel().currentMode;
 		
-		if(_ddm.learningDesignID == null && mode == Workspace.MODE_SAVEAS) { isCopy = true; }
-		var dto:Object = _ddm.getDesignForSaving(isCopy);
+		_ddm.saveMode = (mode == Workspace.MODE_SAVEAS) ? 1 : 0;
 		
+		Debugger.log('SAVE MODE:'+_ddm.saveMode,Debugger.CRITICAL,'saveDesignToServer','Canvas');
+		
+		
+		var dto:Object = _ddm.getDesignForSaving();
+		
 		var callback:Function = Proxy.create(this,onStoreDesignResponse);
 		
 		Application.getInstance().getComms().sendAndReceive(dto,"authoring/storeLearningDesignDetails",callback,false);
@@ -399,8 +407,21 @@
 
 			_ddm.learningDesignID = r.learningDesignID;
 			_ddm.validDesign = r.valid;
+			
+			if(_ddm.saveMode == 1){
+				Debugger.log('save mode: ' +_ddm.saveMode,Debugger.GEN,'onStoreDesignResponse','Canvas');		
+				Debugger.log('updating activities.... ',Debugger.GEN,'onStoreDesignResponse','Canvas');		
+			
+				updateToolActivities(r.activities);
+			} else {
+				Debugger.log('save mode: ' +_ddm.saveMode,Debugger.GEN,'onStoreDesignResponse','Canvas');		
+			
+			}
+			
+			// ??
 			_ddm.readOnly = r.readOnly;
 			_ddm.copyTypeID = r.copyTypeID;
+			
 			_ddm.modified = false;
 			LFMenuBar.getInstance().enableExport(true);
 			Debugger.log('_ddm.learningDesignID:'+_ddm.learningDesignID,Debugger.GEN,'onStoreDesignResponse','Canvas');		
@@ -441,6 +462,26 @@
 		var validationIssuesDialog = PopUpManager.createPopUp(Application.root, LFWindow, false,{title:Dictionary.getValue('ld_val_title'),closeButton:true,scrollContentPath:"ValidationIssuesDialog",validationIssues:dp, canvasModel:canvasModel,canvasController:cc});
 	}
 	
+	/**
+	 * 
+	 * 
+	 * @usage   
+	 * @param   acts 
+	 * @return  
+	 */
+	
+	public function updateToolActivities(acts:Array){
+		Debugger.log(acts.length+' activities to be updated...',Debugger.GEN,'updateToolActivities','Canvas');
+		for(var i=0; i<acts.length; i++){
+			var ta:ToolActivity = ToolActivity(_ddm.getActivityByUIID(acts[i].activityUIID));
+			ta.toolContentID = acts[i].toolContentID;
+			Debugger.log('setting new tool content ID for activity ' + ta.activityID + ' (toolContentID:' + ta.toolContentID + ')',Debugger.GEN,'updateToolActivities','Canvas');
+		
+		}
+		
+		canvasModel.setDirty();
+	}
+	
 	public function checkValidDesign(){
 		if(_ddm.validDesign){
 			Application.getInstance().getToolbar().setButtonState('preview',true);
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/IObjectExtractor.java
===================================================================
diff -u -rde1940e60766f8901436c6ab567c692685d5b35c -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c
--- lams_central/src/java/org/lamsfoundation/lams/authoring/IObjectExtractor.java	(.../IObjectExtractor.java)	(revision de1940e60766f8901436c6ab567c692685d5b35c)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/IObjectExtractor.java	(.../IObjectExtractor.java)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
@@ -36,4 +36,7 @@
 	public abstract LearningDesign extractSaveLearningDesign(Hashtable table)
 			throws WDDXProcessorConversionException, ObjectExtractorException;
 
+	public void setMode(Integer mode);
+	
+	public Integer getMode();
 }
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r0988ce4dfd3a003db77de92d7c158bdf548093ab -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
@@ -102,6 +102,8 @@
 	protected SystemToolDAO systemToolDAO = null;
 	protected GroupDAO groupDAO = null;
 
+	private Integer mode = null;
+	
 	/** The newActivityMap is a local copy of all the current activities. This will include
 	 * the "top level" activities and subactivities. It is used to "crossreference" activities
 	 * as we go, without having to repull them from the database. The keys are the UIIDs
@@ -296,6 +298,9 @@
 		if (keyExists(table, WDDXTAGS.CONTENT_FOLDER_ID))
 			learningDesign.setContentFolderID(WDDXProcessor.convertToString(table, WDDXTAGS.CONTENT_FOLDER_ID));
 		
+		if (keyExists(table, WDDXTAGS.SAVE_MODE))
+			mode = WDDXProcessor.convertToInteger(table, WDDXTAGS.SAVE_MODE);
+		
 		if (keyExists(table, WDDXTAGS.USER_ID))
 		{
 		    Integer userId = WDDXProcessor.convertToInteger(table,WDDXTAGS.USER_ID);
@@ -982,6 +987,14 @@
 		//which may be run from the admin screen or via a cron job
 		learningDesign.getTransitions().remove(transition);
 	}
+	
+	public void setMode(Integer mode) {
+		this.mode = mode;
+	}
+	
+	public Integer getMode() {
+		return mode;
+	}
 }
 	
 
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/dto/StoreLearningDesignResultsDTO.java
===================================================================
diff -u -rde1940e60766f8901436c6ab567c692685d5b35c -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c
--- lams_central/src/java/org/lamsfoundation/lams/authoring/dto/StoreLearningDesignResultsDTO.java	(.../StoreLearningDesignResultsDTO.java)	(revision de1940e60766f8901436c6ab567c692685d5b35c)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/dto/StoreLearningDesignResultsDTO.java	(.../StoreLearningDesignResultsDTO.java)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
@@ -44,13 +44,23 @@
 	 */
 	private Vector messages; 
 	
+	private Vector activities;
+	
 	public StoreLearningDesignResultsDTO()
 	{}
 	
-	public StoreLearningDesignResultsDTO(boolean valid, Vector messages, Long learningDesignID)
+	public StoreLearningDesignResultsDTO(boolean valid, Vector activities, Long learningDesignID)
 	{
 		this.valid = valid;
+		this.activities = activities;
+		this.learningDesignID = learningDesignID;
+	}
+	
+	public StoreLearningDesignResultsDTO(boolean valid, Vector messages, Vector activities, Long learningDesignID)
+	{
+		this.valid = valid;
 		this.messages = messages;
+		this.activities = activities;
 		this.learningDesignID = learningDesignID;
 	}
 
@@ -73,4 +83,8 @@
 	public Vector getMessages() {
 		return messages;
 	}
+	
+	public Vector getActivities() {
+		return activities;
+	}
 }
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -r0988ce4dfd3a003db77de92d7c158bdf548093ab -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
@@ -63,11 +63,14 @@
 import org.lamsfoundation.lams.learningdesign.dto.LearningLibraryDTO;
 import org.lamsfoundation.lams.learningdesign.dto.LibraryActivityDTO;
 import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO;
+import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO;
 import org.lamsfoundation.lams.learningdesign.exception.LearningDesignException;
 import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
+import org.lamsfoundation.lams.monitoring.service.MonitoringServiceException;
 import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolContentIDGenerator;
 import org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO;
+import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -306,6 +309,7 @@
      * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#copyLearningDesign(org.lamsfoundation.lams.learningdesign.LearningDesign, java.lang.Integer, org.lamsfoundation.lams.usermanagement.User, org.lamsfoundation.lams.usermanagement.WorkspaceFolder)
      */
     public LearningDesign copyLearningDesign(LearningDesign originalLearningDesign,Integer copyType,User user, WorkspaceFolder workspaceFolder, boolean setOriginalDesign)
+    	throws LearningDesignException
     {
     	LearningDesign newLearningDesign  = LearningDesign.createLearningDesignCopy(originalLearningDesign,copyType, setOriginalDesign);
     	newLearningDesign.setUser(user);    	
@@ -316,10 +320,55 @@
     	// set first activity assumes that the transitions are all set up correctly.
     	newLearningDesign.setFirstActivity(newLearningDesign.calculateFirstActivity());
     	newLearningDesign.setLearningDesignUIID(originalLearningDesign.getLearningDesignUIID());
+    	
+    	copyLearningDesignToolContent(newLearningDesign, originalLearningDesign, copyType);
+    	
         return newLearningDesign;
     }
     
     /**
+     * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#copyLearningDesignToolContent(org.lamsfoundation.lams.learningdesign.LearningDesign, org.lamsfoundation.lams.learningdesign.LearningDesign, java.lang.Integer)
+     */
+    public LearningDesign copyLearningDesignToolContent(LearningDesign design, LearningDesign originalLearningDesign, Integer copyType ) throws LearningDesignException {
+    	
+    	// copy the tool content
+        // unfortuanately, we have to reaccess the activities to make sure we get the
+        // subclass, not a hibernate proxy.
+        for (Iterator i = design.getActivities().iterator(); i.hasNext();)
+        {
+            Activity currentActivity = (Activity) i.next();
+            if (currentActivity.isToolActivity())
+            {
+                try {
+                	ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(currentActivity.getActivityId());
+                	// copy the content, but don't set the define later flags if it is preview
+                    Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity, copyType.intValue() != LearningDesign.COPY_TYPE_PREVIEW);
+                    toolActivity.setToolContentId(newContentId);
+                    
+                } catch (DataMissingException e) {
+                    String error = "Unable to initialise the lesson. Data is missing for activity "+currentActivity.getActivityUIID()
+                            +" in learning design "+originalLearningDesign.getLearningDesignId()
+                            +" default content may be missing for the tool. Error was "
+                            +e.getMessage();
+                    log.error(error,e);
+                    throw new LearningDesignException(error,e);
+                } catch (ToolException e) {
+                    String error = "Unable to initialise the lesson. Tool encountered an error copying the data is missing for activity "
+                            +currentActivity.getActivityUIID()
+                            +" in learning design "+originalLearningDesign.getLearningDesignId()
+                            +" default content may be missing for the tool. Error was "
+                            +e.getMessage();
+                    log.error(error,e);
+                    throw new LearningDesignException(error,e);
+                }
+
+            }
+        }
+        
+        return design;
+    }
+    
+    /**
      * Updates the Activity information in the newLearningDesign based 
      * on the originalLearningDesign
      * 
@@ -478,6 +527,10 @@
 		Hashtable table = (Hashtable)WDDXProcessor.deserialize(wddxPacket);
 		IObjectExtractor extractor = (IObjectExtractor) beanFactory.getBean(IObjectExtractor.OBJECT_EXTRACTOR_SPRING_BEANNAME);
 		LearningDesign design = extractor.extractSaveLearningDesign(table);	
+		
+		if(extractor.getMode().intValue() == 1)
+			copyLearningDesignToolContent(design, design, design.getCopyTypeID());
+		
 		return design.getLearningDesignId();
 	}
 
@@ -501,6 +554,31 @@
 		return listOfValidationErrorDTOs;
 	}
 	
+	public Vector<AuthoringActivityDTO> getToolActivities(Long learningDesignId) {
+		LearningDesign learningDesign = learningDesignDAO.getLearningDesignById(learningDesignId);
+		Vector<AuthoringActivityDTO> listOfAuthoringActivityDTOs = new Vector<AuthoringActivityDTO>();
+		
+		for (Iterator i = learningDesign.getActivities().iterator(); i.hasNext();)
+        {
+            Activity currentActivity = (Activity) i.next();
+            if (currentActivity.isToolActivity())
+            {
+            	try {
+            		ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(currentActivity.getActivityId());
+            		AuthoringActivityDTO activityDTO = new AuthoringActivityDTO(toolActivity);
+            		listOfAuthoringActivityDTOs.add(activityDTO);
+            	} catch (ToolException e) {
+                        String error = ""
+                                +e.getMessage();
+                        log.error(error,e);
+                        throw new LearningDesignException(error,e);
+                }
+            }
+        }
+		
+		return listOfAuthoringActivityDTOs;
+	}
+	
 	/**
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getAllLearningDesignDetails()
@@ -678,16 +756,8 @@
 		// lowercase to resolve OS issues
 		newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase();
 		
-		// directory pathname
-		//String dirPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + AuthoringConstants.LAMS_WWW_DIR + File.separator + AuthoringConstants.LAMS_WWW_SECURE_DIR +  File.separator + newUniqueContentFolderID;
+		flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID);
 		
-		// create new directory
-		//if(FileUtil.createDirectory(dirPath)){
-			flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID);
-		//} else {
-		//	throw new FileUtilException();
-		//}
-		
 		return flashMessage.serializeMessage();
 	}
 
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
===================================================================
diff -u -re21e46d35a751657ff3b63704419ad212747425e -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java	(.../IAuthoringService.java)	(revision e21e46d35a751657ff3b63704419ad212747425e)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java	(.../IAuthoringService.java)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
@@ -28,6 +28,7 @@
 import java.util.Vector;
 
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO;
 import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO;
 import org.lamsfoundation.lams.learningdesign.exception.LearningDesignException;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -92,7 +93,19 @@
 	public LearningDesign copyLearningDesign(Long originalLearningDesignID,Integer copyType,
 											 Integer userID, Integer workspaceFolder, boolean setOriginalDesign)throws UserException, LearningDesignException,
 											 										 WorkspaceFolderException, IOException;
+	
 	/**
+	 * 
+	 * @param design
+	 * @param originalLearningDesign
+	 * @param copyType
+	 * @return
+	 * @throws LearningDesignException
+	 */
+	public LearningDesign copyLearningDesignToolContent(LearningDesign design, LearningDesign originalLearningDesign, Integer copyType ) throws LearningDesignException;
+	    
+	
+	/**
 	 * @return List Returns the list of all the available LearningDesign's   
 	 * */
 	public List getAllLearningDesigns();
@@ -138,6 +151,13 @@
 	public Vector<ValidationErrorDTO> validateLearningDesign(Long learningDesignId);
 	
 	/**
+	 * 
+	 * @param learningDesignId
+	 * @return
+	 */
+	public Vector<AuthoringActivityDTO> getToolActivities(Long learningDesignId);
+	
+	/**
 	 * This method returns a list of all available Learning Designs
 	 * in WDDX format.
 	 * 
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java
===================================================================
diff -u -r016db2a9e2faacd0b9d20dd874571756eea79a14 -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java	(.../StoreLDServlet.java)	(revision 016db2a9e2faacd0b9d20dd874571756eea79a14)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java	(.../StoreLDServlet.java)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
@@ -31,6 +31,8 @@
 import org.lamsfoundation.lams.authoring.dto.StoreLearningDesignResultsDTO;
 import org.lamsfoundation.lams.authoring.service.IAuthoringService;
 import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO;
+import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO;
+
 import org.lamsfoundation.lams.util.wddx.FlashMessage;
 import org.lamsfoundation.lams.web.servlet.AbstractStoreWDDXPacketServlet;
 import org.springframework.web.context.WebApplicationContext;
@@ -63,14 +65,15 @@
 			try {
 				
 				Long learningDesignID = authoringService.storeLearningDesignDetails(designDetails);
+				Vector<AuthoringActivityDTO> activityDTOS = authoringService.getToolActivities(learningDesignID);
 				Vector<ValidationErrorDTO> validationDTOS = authoringService.validateLearningDesign(learningDesignID);
 				FlashMessage flashMessage = null;
 				if ( validationDTOS != null &&validationDTOS.size()>0) {
 					flashMessage = new FlashMessage(getMessageKey(designDetails, request), 
-							new StoreLearningDesignResultsDTO(Boolean.FALSE,validationDTOS, learningDesignID), FlashMessage.OBJECT_MESSAGE);
+							new StoreLearningDesignResultsDTO(Boolean.FALSE,validationDTOS, activityDTOS, learningDesignID), FlashMessage.OBJECT_MESSAGE);
 				} else {
 					flashMessage = new FlashMessage(getMessageKey(designDetails, request), 
-							new StoreLearningDesignResultsDTO(Boolean.TRUE, learningDesignID));			
+							new StoreLearningDesignResultsDTO(Boolean.TRUE, activityDTOS, learningDesignID));			
 				}
 				returnPacket = flashMessage.serializeMessage();