Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml,v
diff -u -r1.9 -r1.10
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	2 Feb 2006 05:53:51 -0000	1.9
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	6 Feb 2006 03:28:51 -0000	1.10
@@ -63,9 +63,13 @@
 		<property name="transactionAttributes">
 			<props>
 				<prop key="initializeLesson">PROPAGATION_REQUIRED</prop>
+				<prop key="createLessonClassForLessonWDDX">PROPAGATION_REQUIRED</prop>
 				<prop key="createLessonClassForLesson">PROPAGATION_REQUIRED</prop>
 				<prop key="startLesson">PROPAGATION_REQUIRED</prop>
 				<prop key="archiveLesson">PROPAGATION_REQUIRED</prop>
+				<prop key="finishLesson">PROPAGATION_REQUIRED</prop>
+				<prop key="suspendLesson">PROPAGATION_REQUIRED</prop>
+				<prop key="unsuspendLesson">PROPAGATION_REQUIRED</prop>
 				<prop key="removeLesson">PROPAGATION_REQUIRED</prop>
 				<prop key="openGate">PROPAGATION_REQUIRED</prop>
 				<prop key="closeGate">PROPAGATION_REQUIRED</prop>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v
diff -u -r1.34 -r1.35
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	2 Feb 2006 05:53:51 -0000	1.34
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	6 Feb 2006 03:28:51 -0000	1.35
@@ -75,7 +75,7 @@
      * @param lessionPackage
      * @return
      */
-    public String createLesson(Integer creatorUserId,String lessionPackage);
+    public String createLessonClassForLessonWDDX(Integer creatorUserId,String lessionPackage);
     
     /**
      * Setup the lesson class and organization for a lesson according to the 
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v
diff -u -r1.44 -r1.45
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	2 Feb 2006 05:53:51 -0000	1.44
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	6 Feb 2006 03:28:51 -0000	1.45
@@ -21,6 +21,7 @@
 package org.lamsfoundation.lams.monitoring.service;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
@@ -309,9 +310,9 @@
 
     }
     /**
-     *  @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#createLesson(Integer, String)
+     *  @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#createLessonClassForLessonWDDX(Integer, String)
      */
-    public String createLesson(Integer creatorUserId, String lessonPacket){
+    public String createLessonClassForLessonWDDX(Integer creatorUserId, String lessonPacket){
     	FlashMessage flashMessage = null;
     	try{
 	    	Hashtable table = (Hashtable)WDDXProcessor.deserialize(lessonPacket);
@@ -1065,7 +1066,7 @@
         if(!grouping.isChosenGrouping()){
         	log.error("GroupingActivity ["+groupingActivity.getActivityId() +"] does not have chosen grouping.");
         	throw new MonitoringServiceException("GroupingActivity ["+groupingActivity.getActivityId()
-        			+"] does not have chosen grouping.");
+        			+"] is not chosen grouping.");
         }
         try {
         	//try to sorted group list by orderID.
@@ -1083,15 +1084,26 @@
 	        }
 	        iter = sortedMap.values().iterator();
 	        //grouping all group in list
-	        while(iter.hasNext()){
+	        for(int orderId=0;iter.hasNext();orderId++){
 	        	Hashtable group = (Hashtable) iter.next();
-	        	List learners = (List) group.get(MonitoringConstants.KEY_GROUP_LEARNERS);
+	        	List learnerIdList = (List) group.get(MonitoringConstants.KEY_GROUP_LEARNERS);
 	        	String groupName = WDDXProcessor.convertToString(group,MonitoringConstants.KEY_GROUP_NAME);
+	        	List learners = new ArrayList();
+	        	//? Seem too low efficient, is there a easy way?
+	        	for(int idx=0;idx<learnerIdList.size();idx++){
+	        		User user = userDAO.getUserById(new Integer(((Double)learnerIdList.get(idx)).intValue()));
+	        		learners.add(user);
+	        	
+	        	}
 	        	log.debug("Performing grouping for " + groupName + "...");
 	        	grouping.doGrouping(groupName,learners);
-	        	groupingDAO.update(grouping);
 	        	log.debug("Finish grouping for " + groupName);
 	        }
+	        
+	        log.debug("Persist grouping for [" + grouping.getGroupingId()  + "]...");
+        	groupingDAO.update(grouping);
+        	log.debug("Persist grouping for [" + grouping.getGroupingId()  + "] success.");
+        	
         } catch (WDDXProcessorConversionException e) {
         	throw new MonitoringServiceException("Perform chosen grouping occurs error when parsing WDDX package:"
         			+ e.getMessage());
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/CreateLessionServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/Attic/CreateLessionServlet.java,v
diff -u -r1.1 -r1.2
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/CreateLessionServlet.java	23 Jan 2006 06:02:21 -0000	1.1
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/CreateLessionServlet.java	6 Feb 2006 03:28:51 -0000	1.2
@@ -66,7 +66,7 @@
     		return flashMessage.serializeMessage();
     	}
 		IMonitoringService monitoringService = getMonitoringService();
-		return monitoringService.createLesson(user.getUserID(),lessionPackage);
+		return monitoringService.createLessonClassForLessonWDDX(user.getUserID(),lessionPackage);
 	}
 
 	protected String getMessageKey(String packet, HttpServletRequest request) {
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java,v
diff -u -r1.1 -r1.2
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java	2 Feb 2006 05:53:51 -0000	1.1
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java	6 Feb 2006 03:28:51 -0000	1.2
@@ -22,23 +22,19 @@
 
 import java.io.IOException;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.monitoring.MonitoringConstants;
 import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.wddx.FlashMessage;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.web.servlet.AbstractStoreWDDXPacketServlet;
-import org.lamsfoundation.lams.web.session.SessionManager;
-import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -63,7 +59,8 @@
 	}
 	
 	protected String process(String chosenGroupingPacket, HttpServletRequest request) throws Exception {
-		FlashMessage flashMessage = null;
+		FlashMessage flashMessage;
+		String message;
 		try {
 			Hashtable table = (Hashtable)WDDXProcessor.deserialize(chosenGroupingPacket);
 			//get back value from WDDX package
@@ -73,18 +70,27 @@
 			
 			IMonitoringService monitoringService = getMonitoringService();
 			//get the activity according to the given activity ID
-			GroupingActivity activity = (GroupingActivity) monitoringService.getActivityById(activityId);
+			Activity act = monitoringService.getActivityById(activityId);
+			if(!act.isGroupingActivity()){
+				 throw new Exception("The given activity ["+activityId+"] is not grouping type.");
+			}
+			GroupingActivity activity = (GroupingActivity) act;
 			//perform grouping
 			monitoringService.performChosenGrouping(activity,groups);
+			
+			//construct return WDDX message
+			Grouping grouping = activity.getCreateGrouping();
+			flashMessage = new FlashMessage("performChosenGrouping",grouping.getGroupingDTO());
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e);
+			flashMessage = new FlashMessage("performChosenGrouping","Perfrom chosen grouping occurs error:" 
+					+ e.getMessage(),FlashMessage.ERROR);
 		}
 		
-		String message = "Failed on creating flash message:" + flashMessage;
-		try {
+		try{
 			message = flashMessage.serializeMessage();
-		} catch (IOException e) {
-			log.error(message);
+		}catch(IOException e){
+			 message = "Failed on creating flash message:" + flashMessage;
 		}
 		
         return message;