Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r5bc9a56ca54cbc94c0dcac3953f04f4de27152c9 -r3b4eb02bf3a66a72bfbcfeef863faa19f88776c7
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 5bc9a56ca54cbc94c0dcac3953f04f4de27152c9)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 3b4eb02bf3a66a72bfbcfeef863faa19f88776c7)
@@ -58,6 +58,7 @@
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ActivityOrderComparator;
 import org.lamsfoundation.lams.learningdesign.ChosenGrouping;
+import org.lamsfoundation.lams.learningdesign.ComplexActivity;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
@@ -76,6 +77,7 @@
 import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO;
 import org.lamsfoundation.lams.learningdesign.dao.ILicenseDAO;
 import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO;
 import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO;
 import org.lamsfoundation.lams.learningdesign.dto.GroupingDTO;
 import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO;
@@ -310,6 +312,7 @@
 			List<AuthoringActivityDTO> activities = ldDto.getActivities();
 			for(AuthoringActivityDTO activity : activities){
 				//skip non-tool activities
+
 				if(activity.getActivityTypeID().intValue() != Activity.TOOL_ACTIVITY_TYPE)
 					continue;
 				ToolContentManager contentManager = (ToolContentManager) findToolService(toolDAO.getToolByID(activity.getToolID()));
@@ -637,7 +640,7 @@
 		Set<Activity> actList = new TreeSet<Activity> (new ActivityOrderComparator());
 		Map<Long,Activity> activityMapper = new HashMap<Long,Activity>();
 		for(AuthoringActivityDTO actDto: actDtoList){
-			Activity act = getActivity(actDto,groupingMapper,toolMapper);
+			Activity act = getActivity(actDto,activityMapper, groupingMapper,toolMapper);
 			activityMapper.put(act.getActivityId(),act);
 			actList.add(act);
 			
@@ -809,11 +812,12 @@
 	/**
 	 * 
 	 * @param actDto
+	 * @param activityMapper 
 	 * @param groupingList
 	 * @param toolMapper
 	 * @return
 	 */
-	private Activity getActivity(AuthoringActivityDTO actDto, Map<Long, Grouping> groupingList, Map<Long,ToolContent> toolMapper) {
+	private Activity getActivity(AuthoringActivityDTO actDto, Map<Long, Activity> activityMapper, Map<Long, Grouping> groupingList, Map<Long,ToolContent> toolMapper) {
 		Activity act = null;
 		if(actDto == null)
 			return act;
@@ -883,22 +887,27 @@
 		act.setDescription(actDto.getDescription());
 		act.setHelpText(actDto.getHelpText());
 		act.setLanguageFile(actDto.getLanguageFile());
+		//do not need set so far
 //		act.setLearningDesign();
-		//TODO: be to decided by Fiona
+		
+//		the id will be decide in LearningObject 
 //		actDto.getLearningDesignID()
 //		act.setLearningLibrary();
+		
+		//be to decided by Fiona: 08/06/2006: It is ok to left it as null
 //		actDto.getLibraryActivityID()
 //		act.setLibraryActivity();
+		
 		act.setLibraryActivityUiImage(actDto.getLibraryActivityUIImage());
 		act.setOrderId(actDto.getOrderID());
 		
-//		actDto.getParentActivityID()
-//		act.setParentActivity();
+		act.setParentActivity(activityMapper.get(actDto.getParentActivityID()));
 		
 		act.setParentUIID(actDto.getParentUIID());
 		act.setRunOffline(actDto.getRunOffline());
 		act.setTitle(actDto.getTitle());
 		
+		//relation will be decide in Transition object.
 //		act.setTransitionFrom();
 //		act.setTransitionTo();
 		
@@ -966,6 +975,4 @@
 		this.workspaceFolderDAO = workspaceFolderDAO;
 	}
 
-
-
 }