Index: lams_build/3rdParty.userlibraries
===================================================================
RCS file: /usr/local/cvsroot/lams_build/3rdParty.userlibraries,v
diff -u -r1.40.2.1.2.2 -r1.40.2.1.2.3
--- lams_build/3rdParty.userlibraries	18 May 2009 15:44:40 -0000	1.40.2.1.2.2
+++ lams_build/3rdParty.userlibraries	21 May 2009 15:25:26 -0000	1.40.2.1.2.3
@@ -83,7 +83,6 @@
         <archive javadoc="http://java.sun.com/products/jsp/jstl/1.1/docs/api/" path="/lams_build/lib/j2ee/jstl.jar"/>
         <archive path="/lams_build/lib/fckeditor/FCKeditor-2.4.1.jar"/>
         <archive path="/lams_build/lib/concurrent/concurrent-1.3.4.jar"/>
-        <archive path="/lams_build/lib/catalina/catalina.jar"/>
         <archive path="/lams_build/lib/xstream/xstream-1.1.jar"/>
         <archive path="/lams_build/lib/xstream/jmock-2004-03-19.jar"/>
         <archive path="/lams_build/lib/xstream/joda-time-0.98.jar"/>
@@ -105,5 +104,6 @@
         <archive javadoc="http://jexcelapi.sourceforge.net/resources/javadocs/2_6/docs/" path="/lams_build/lib/excel/jxl.jar" source="/lams_build/lib/excel/src/jexcelapi-2.6-src.zip"/>
         <archive javadoc="http://www.jboss.org/file-access/default/members/jbosscache/freezone/docs/3.1.0.CR1/apidocs" path="/lams_build/lib/jboss/jbosscache-core.jar" source="/lams_build/lib/jboss/src/jbosscache-core-3.1.0-src.zip"/>
         <archive javadoc="http://www.jgroups.org/javadoc/" path="/lams_build/lib/jboss/jgroups-all.jar" source="/lams_build/lib/jboss/src/jgroups-2.6.10-src.zip"/>
+        <archive javadoc="http://www.jboss.org/file-access/default/members/jbossweb/freezone/docs/latest/api/" path="/lams_build/lib/jbossweb/jbossweb.jar" source="/lams_build/lib/jbossweb/src/jbossweb-2.1.3.GA.zip"/>
     </library>
 </eclipse-userlibraries>
Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.79.2.1.2.1 -r1.79.2.1.2.2
--- lams_build/build.xml	13 May 2009 09:37:53 -0000	1.79.2.1.2.1
+++ lams_build/build.xml	21 May 2009 15:25:26 -0000	1.79.2.1.2.2
@@ -142,7 +142,7 @@
 				</patternset>
 			</fileset> 
 			<fileset dir="..">
-				<include name="${lams_common}/${sub.build.lib}/*.jar" />
+				<include name="${lams_common}/${sub.build.lib}/lams.jar" />
 				<include name="${lams_contentrepository}/${sub.build.lib}/*.jar" />
 				<include name="${lams_central}/${sub.build.lib}/*.jar" />
 				<include name="${lams_monitoring}/${sub.build.lib}/*.jar"/>
Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_build/conf/j2ee/application_1_3.dtd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/ejb-deployer.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/jboss-service.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/conf/unix/jboss/jboss-service.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/unix/jboss/jboss-service.xml,v
diff -u -r1.1.14.1 -r1.1.14.2
--- lams_build/conf/unix/jboss/jboss-service.xml	13 May 2009 09:37:56 -0000	1.1.14.1
+++ lams_build/conf/unix/jboss/jboss-service.xml	21 May 2009 15:25:28 -0000	1.1.14.2
@@ -253,7 +253,7 @@
       force authentication to occur every time. This has no affect if the
       AuthenticationCacheJndiName has been changed from the default value.
       -->
-       <attribute name="DefaultCacheTimeout">1800</attribute>
+       <attribute name="DefaultCacheTimeout">0</attribute>
       <!-- DefaultCacheResolution: Specifies the default timed cache policy
       resolution in seconds. This controls the interval at which the cache
       current timestamp is updated and should be less than the DefaultCacheTimeout
Fisheye: Tag 1.8.6.2.2.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/log4j.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/standardjboss.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/service/local-service.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.8.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/tomcat/context.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/tomcat/jboss-service.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.14.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/tomcat/server.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/tomcat/web.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/ejb-deployer.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/jboss-service.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/conf/windows/jboss/jboss-service.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/windows/jboss/jboss-service.xml,v
diff -u -r1.1.14.1 -r1.1.14.2
--- lams_build/conf/windows/jboss/jboss-service.xml	13 May 2009 09:37:53 -0000	1.1.14.1
+++ lams_build/conf/windows/jboss/jboss-service.xml	21 May 2009 15:25:28 -0000	1.1.14.2
@@ -253,7 +253,7 @@
       force authentication to occur every time. This has no affect if the
       AuthenticationCacheJndiName has been changed from the default value.
       -->
-       <attribute name="DefaultCacheTimeout">1800</attribute>
+       <attribute name="DefaultCacheTimeout">0</attribute>
       <!-- DefaultCacheResolution: Specifies the default timed cache policy
       resolution in seconds. This controls the interval at which the cache
       current timestamp is updated and should be less than the DefaultCacheTimeout
Fisheye: Tag 1.9.8.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/log4j.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/standardjboss.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/service/local-service.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.8.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/tomcat/context.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/tomcat/jboss-service.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.14.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/tomcat/server.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/tomcat/web.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/lib/jbossweb/jbossweb.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/jbossweb/Attic/jbossweb.jar,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_build/lib/jbossweb/src/jbossweb-2.1.3.GA.zip
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/jbossweb/src/Attic/jbossweb-2.1.3.GA.zip,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.96.4.3 -r1.96.4.3.2.1
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	1 May 2009 06:13:55 -0000	1.96.4.3
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	21 May 2009 15:25:44 -0000	1.96.4.3.2.1
@@ -77,7 +77,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
-import org.springframework.dao.DeadlockLoserDataAccessException;
+import org.springframework.dao.DataIntegrityViolationException;
 
 /**
  * This class is a facade over the Learning middle tier.
@@ -114,9 +114,8 @@
     }
 
     /**
-     * Creates a new instance of LearnerService. To be used by Spring, assuming
-     * the Spring will set up the progress engine via method injection. If you
-     * are creating the bean manually then use the other constructor.
+     * Creates a new instance of LearnerService. To be used by Spring, assuming the Spring will set up the progress
+     * engine via method injection. If you are creating the bean manually then use the other constructor.
      */
     public LearnerService() {
     }
@@ -225,8 +224,7 @@
     }
 
     /**
-     * Get the lesson data for a particular lesson. In a DTO format suitable for
-     * sending to the client.
+     * Get the lesson data for a particular lesson. In a DTO format suitable for sending to the client.
      */
     public LessonDTO getLessonData(Long lessonId) {
 	Lesson lesson = getLesson(lessonId);
@@ -235,21 +233,18 @@
 
     /**
      * <p>
-     * Joins a User to a lesson as a learner. It could either be a new lesson or
-     * a lesson that has been started.
+     * Joins a User to a lesson as a learner. It could either be a new lesson or a lesson that has been started.
      * </p>
      * 
      * <p>
-     * In terms of new lesson, a new learner progress would be initialized. Tool
-     * session for the next activity will be initialized if necessary.
+     * In terms of new lesson, a new learner progress would be initialized. Tool session for the next activity will be
+     * initialized if necessary.
      * </p>
      * 
      * <p>
-     * In terms of an started lesson, the learner progress will be returned
-     * without calculation. Tool session will be initialized if necessary. Note
-     * that we won't initialize tool session for current activity because we
-     * assume tool session will always initialize before it becomes a current
-     * activity.</p
+     * In terms of an started lesson, the learner progress will be returned without calculation. Tool session will be
+     * initialized if necessary. Note that we won't initialize tool session for current activity because we assume tool
+     * session will always initialize before it becomes a current activity.</p
      * 
      * 
      * @param learnerId
@@ -260,7 +255,7 @@
      * @throws LearnerServiceException
      *                 in case of problems.
      */
-    public LearnerProgress joinLesson(Integer learnerId, Long lessonID) {
+    public synchronized LearnerProgress joinLesson(Integer learnerId, Long lessonID) {
 	User learner = (User) userManagementService.findById(User.class, learnerId);
 
 	Lesson lesson = getLesson(lessonID);
@@ -285,17 +280,8 @@
 	    }
 	    // Use TimeStamp rather than Date directly to keep consistent with Hibnerate persiste object.
 	    learnerProgress.setStartDate(new Timestamp(new Date().getTime()));
-	    try {
-		learnerProgressDAO.saveLearnerProgress(learnerProgress);
-	    } catch (DeadlockLoserDataAccessException e) {
-		LearnerService.log.error("Deadlock occurred when attempting to joing the lesson. Retrying...", e);
-		try {
-		    Thread.sleep(1000);
-		} catch (InterruptedException e1) {
-		    LearnerService.log.warn("While retrying to join lesson, thread was interrupted.", e);
-		}
-		learnerProgressDAO.saveLearnerProgress(learnerProgress);
-	    }
+	    learnerProgressDAO.saveLearnerProgress(learnerProgress);
+
 	} else {
 
 	    Activity currentActivity = learnerProgress.getCurrentActivity();
@@ -322,17 +308,14 @@
     }
 
     /**
-     * This method creates the tool session (if needed) for a tool activity. It
-     * won't try it for the child activities, as any Sequence activities inside
-     * this activity may have a grouping WITHIN the sequence, and then the
-     * grouped activities get the won't be grouped properly (See LDEV-1774). We
-     * could get the child tool activities for a parallel activity but that
-     * could create a bug in the future - if we ever put sequences inside
-     * parallel activities then we are stuck again!
+     * This method creates the tool session (if needed) for a tool activity. It won't try it for the child activities,
+     * as any Sequence activities inside this activity may have a grouping WITHIN the sequence, and then the grouped
+     * activities get the won't be grouped properly (See LDEV-1774). We could get the child tool activities for a
+     * parallel activity but that could create a bug in the future - if we ever put sequences inside parallel activities
+     * then we are stuck again!
      * 
-     * We look up the database to check up the existence of correspondent tool
-     * session. If the tool session doesn't exist, we create a new tool session
-     * instance.
+     * We look up the database to check up the existence of correspondent tool session. If the tool session doesn't
+     * exist, we create a new tool session instance.
      * 
      * @param learnerProgress
      *                the learner progress we are processing.
@@ -397,7 +380,7 @@
 
 	Object[] retValue = new Object[2];
 	retValue[0] = builder.getActivityList();
-	;
+
 	retValue[1] = progress.getCurrentActivity() != null ? progress.getCurrentActivity().getActivityId() : null;
 
 	return retValue;
@@ -499,8 +482,7 @@
     }
 
     /**
-     * Calculates learner progress and returns the data required to be displayed
-     * to the learner.
+     * Calculates learner progress and returns the data required to be displayed to the learner.
      * 
      * @param completedActivity
      *                the activity just completed
@@ -527,8 +509,7 @@
     }
 
     /**
-     * @see org.lamsfoundation.lams.learning.service.ILearnerService#completeToolSession(java.lang.Long,
-     *      java.lang.Long)
+     * @see org.lamsfoundation.lams.learning.service.ILearnerService#completeToolSession(java.lang.Long, java.lang.Long)
      */
     public String completeToolSession(Long toolSessionId, Long learnerId) {
 	// this method is called by tools, so it mustn't do anything that relies on all the tools' Spring beans
@@ -567,11 +548,9 @@
     }
 
     /**
-     * Complete the activity in the progress engine and delegate to the progress
-     * engine to calculate the next activity in the learning design. It is
-     * currently triggered by various progress engine related action classes,
-     * which then calculate the url to go to next, based on the ActivityMapping
-     * class.
+     * Complete the activity in the progress engine and delegate to the progress engine to calculate the next activity
+     * in the learning design. It is currently triggered by various progress engine related action classes, which then
+     * calculate the url to go to next, based on the ActivityMapping class.
      * 
      * @param learnerId
      *                the learner who are running this activity in the design.
@@ -645,16 +624,17 @@
 
 			    GradebookUserActivity gradebookUserActivity = gradebookService.getGradebookUserActivity(
 				    toolActivity.getActivityId(), learner.getUserId());
-			    
+
 			    // Only set the mark if it hasnt previously been set by a teacher
 			    if (gradebookUserActivity == null || !gradebookUserActivity.getMarkedInGradebook()) {
-				gradebookService.updateUserActivityGradebookMark(lesson, learner, toolActivity, outputDouble, false);
+				gradebookService.updateUserActivityGradebookMark(lesson, learner, toolActivity,
+					outputDouble, false);
 			    }
 			}
 		    }
 
 		} catch (ToolException e) {
-		    log.debug("Runtime exception when attempted to get outputs for activity: "
+		    LearnerService.log.debug("Runtime exception when attempted to get outputs for activity: "
 			    + toolActivity.getActivityId(), e);
 		}
 	    }
@@ -692,8 +672,8 @@
 
     /**
      * @throws LearnerServiceException
-     * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#performGrouping(java.lang.Long,
-     *      java.lang.Long, java.lang.Integer)
+     * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#performGrouping(java.lang.Long, java.lang.Long,
+     *      java.lang.Integer)
      */
     public boolean performGrouping(Long lessonId, Long groupingActivityId, Integer learnerId, boolean forceGrouping)
 	    throws LearnerServiceException {
@@ -863,10 +843,9 @@
     }
 
     /**
-     * Get all the learners who may come through this gate. For a Group Based
-     * branch and the Teacher Grouped branch, it is the group of users in the
-     * Branch's group, but only the learners who have started the lesson.
-     * Otherwise we just get all learners who have started the lesson.
+     * Get all the learners who may come through this gate. For a Group Based branch and the Teacher Grouped branch, it
+     * is the group of users in the Branch's group, but only the learners who have started the lesson. Otherwise we just
+     * get all learners who have started the lesson.
      * 
      * @param gate
      * @param lesson
@@ -941,8 +920,8 @@
     }
 
     /**
-     * Get the lesson for this activity. If the activity is not part of a lesson
-     * (ie is from an authoring design then it will return null.
+     * Get the lesson for this activity. If the activity is not part of a lesson (ie is from an authoring design then it
+     * will return null.
      */
     public Lesson getLessonByActivity(Activity activity) {
 	Lesson lesson = lessonDAO.getLessonForActivity(activity.getActivityId());
@@ -960,16 +939,13 @@
 
     /**
      * <p>
-     * Create a lams tool session for learner against a tool activity. This will
-     * have concurrency issues interms of grouped tool session because it might
-     * be inserting some tool session that has already been inserted by other
-     * member in the group. If the unique_check is broken, we need to query the
-     * database to get the instance instead of inserting it. It should be done
-     * in the Spring rollback strategy.
+     * Create a lams tool session for learner against a tool activity. This will have concurrency issues interms of
+     * grouped tool session because it might be inserting some tool session that has already been inserted by other
+     * member in the group. If the unique_check is broken, we need to query the database to get the instance instead of
+     * inserting it. It should be done in the Spring rollback strategy.
      * </p>
      * 
-     * Once lams tool session is inserted, we need to notify the tool to its own
-     * session.
+     * Once lams tool session is inserted, we need to notify the tool to its own session.
      * 
      * @param toolActivity
      * @param learner
@@ -978,7 +954,27 @@
     private void createToolSessionFor(ToolActivity toolActivity, User learner, Lesson lesson)
 	    throws LamsToolServiceException, ToolException {
 	// if the tool session already exists, createToolSession() will return null
-	ToolSession toolSession = lamsCoreToolService.createToolSession(learner, toolActivity, lesson);
+	ToolSession toolSession = null;
+	try {
+	    toolSession = lamsCoreToolService.createToolSession(learner, toolActivity, lesson);
+	} catch (DataIntegrityViolationException e) {
+	    LearnerService.log.warn("There was an attempt to create two tool sessions with the same name. Retrying...",
+		    e);
+	    /*
+	     * LDEV-1533: Two users tried to create a tool session with the same name. One of them was successful, the
+	     * other got an error. The second one will now retry. This might create a loop; on the other hand the second
+	     * attempt should be successful, since either the existing session will be retrieved or a session with a new
+	     * name will be created.
+	     * 
+	     * This workaround can not be in LamsCoreToolService (initially it was). If the exception occurs, the
+	     * transaction is unusable anymore and any further DB actions will throw an error. We need to restart the
+	     * transaction on the higher level - here.
+	     * 
+	     * This exception should never occur, as lamsCoreToolService.createToolSession is now synchronized.
+	     * Nevertheless, it sometimes occurs, so additional security measures stay.
+	     */
+	    toolSession = lamsCoreToolService.createToolSession(learner, toolActivity, lesson);
+	}
 	if (toolSession != null) {
 	    toolActivity.getToolSessions().add(toolSession);
 	    lamsCoreToolService.notifyToolsToCreateSession(toolSession, toolActivity);
@@ -1004,8 +1000,7 @@
     /**
      * @throws LearnerServiceException
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#determineBranch(org.lamsfoundation.lams.lesson.Lesson,
-     *      org.lamsfoundation.lams.learningdesign.BranchingActivity,
-     *      java.lang.Integer)
+     *      org.lamsfoundation.lams.learningdesign.BranchingActivity, java.lang.Integer)
      */
     public SequenceActivity determineBranch(Lesson lesson, BranchingActivity branchingActivity, Integer learnerId)
 	    throws LearnerServiceException {
@@ -1034,10 +1029,9 @@
     }
 
     /**
-     * Get all the conditions for this branching activity, ordered by order id.
-     * Go through each condition until we find one that passes and that is the
-     * required branch. If no conditions match, use the branch that is the
-     * "default" branch for this branching activity.
+     * Get all the conditions for this branching activity, ordered by order id. Go through each condition until we find
+     * one that passes and that is the required branch. If no conditions match, use the branch that is the "default"
+     * branch for this branching activity.
      */
     private SequenceActivity determineToolBasedBranch(Lesson lesson, ToolBranchingActivity branchingActivity,
 	    User learner) {
@@ -1169,8 +1163,7 @@
      *                gate to check
      * @param learner
      *                learner who is knocking to the gate
-     * @return <code>true</code> if learner satisfied any of the conditions
-     *         and is allowed to pass
+     * @return <code>true</code> if learner satisfied any of the conditions and is allowed to pass
      */
     private boolean determineConditionGateStatus(GateActivity gate, User learner) {
 	boolean shouldOpenGate = false;
@@ -1230,13 +1223,11 @@
     }
 
     /**
-     * Select a particular branch - we are in preview mode and the author has
-     * selected a particular activity.
+     * Select a particular branch - we are in preview mode and the author has selected a particular activity.
      * 
      * @throws LearnerServiceException
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#determineBranch(org.lamsfoundation.lams.lesson.Lesson,
-     *      org.lamsfoundation.lams.learningdesign.BranchingActivity,
-     *      java.lang.Integer)
+     *      org.lamsfoundation.lams.learningdesign.BranchingActivity, java.lang.Integer)
      */
     public SequenceActivity selectBranch(Lesson lesson, BranchingActivity branchingActivity, Integer learnerId,
 	    Long branchId) throws LearnerServiceException {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v
diff -u -r1.43 -r1.43.6.1
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	15 Jan 2009 07:54:29 -0000	1.43
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	21 May 2009 15:25:44 -0000	1.43.6.1
@@ -21,12 +21,11 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.learning.web.action;
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.List;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -38,7 +37,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
-import org.lamsfoundation.lams.learning.web.bean.ActivityURL;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -57,624 +55,646 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-
-/** 
+/**
  * 
- * <p>The action servlet that interacts with learner to start a lams learner
- * module, join a user to the lesson and allows a user to exit a lesson.</p>
+ * <p>
+ * The action servlet that interacts with learner to start a lams learner module, join a user to the lesson and allows a
+ * user to exit a lesson.
+ * </p>
  * 
- * <p>It is also responsible for the interaction between lams server and 
- * flash. Flash will call method implemented in this class to get progress
- * data or trigger a lams server calculation here</p>
+ * <p>
+ * It is also responsible for the interaction between lams server and flash. Flash will call method implemented in this
+ * class to get progress data or trigger a lams server calculation here
+ * </p>
  * 
- * <b>Note:</b>It needs to extend the <code>LamsDispatchAction</code> which has
- * been customized to accomodate struts features to solve duplicate 
- * submission problem.
+ * <b>Note:</b>It needs to extend the <code>LamsDispatchAction</code> which has been customized to accomodate struts
+ * features to solve duplicate submission problem.
  * 
  * @author Jacky Fang
  * @since 3/03/2005
  * @version 1.1
  * 
  * ----------------XDoclet Tags--------------------
  * 
- * @struts:action path="/learner" 
- *                parameter="method" 
- *                validate="false"
- * @struts:action-forward name="displayActivity" path="/DisplayActivity.do" 
- * @struts:action-forward name="displayProgress" path="/progress.jsp" 
- * ----------------XDoclet Tags--------------------
+ * @struts:action path="/learner" parameter="method" validate="false"
+ * @struts:action-forward name="displayActivity" path="/DisplayActivity.do"
+ * @struts:action-forward name="displayProgress" path="/progress.jsp" ----------------XDoclet Tags--------------------
  * 
  */
-public class LearnerAction extends LamsDispatchAction 
-{
-    //---------------------------------------------------------------------
+public class LearnerAction extends LamsDispatchAction {
+    // ---------------------------------------------------------------------
     // Instance variables
-    //---------------------------------------------------------------------
-	private static Logger log = Logger.getLogger(LearnerAction.class);
-	
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
+    private static Logger log = Logger.getLogger(LearnerAction.class);
+
+    // ---------------------------------------------------------------------
     // Class level constants - Struts forward
-    //---------------------------------------------------------------------
- 	
-	private static IAuditService auditService;
-	
-	private ActionForward redirectToURL(ActionMapping mapping, HttpServletResponse response, String url) throws IOException, ServletException {
-		if ( url != null ) {
-			  String fullURL = WebUtil.convertToFullURL(url);
-			  response.sendRedirect(response.encodeRedirectURL(fullURL));
-		} else {
-			  throw new ServletException("Tried to redirect to url but url is null");
-		}
-		return null;
-	 }
+    // ---------------------------------------------------------------------
 
-	  /** Handle an exception - either thrown by the service or by the web layer. Allows the exception
-	 * to be logged properly and ensure that an actual message goes back to Flash.
-	 * 
-	 * @param e
-	 * @param methodKey
-	 * @param learnerService
-	 * @return
-	 */
-	protected FlashMessage handleException(Exception e, String methodKey, ICoreLearnerService learnerService) {
-		log.error("Exception thrown "+methodKey,e);
-		String[] msg = new String[1];
-		msg[0] = e.getMessage();
-		
-		getAuditService().log(LearnerAction.class.getName()+":"+methodKey, e.toString());		
-		
-		return new FlashMessage(methodKey,
-				learnerService.getMessageService().getMessage("error.system.learner", msg),
-				FlashMessage.CRITICAL_ERROR);
+    private static IAuditService auditService;
+
+    private ActionForward redirectToURL(ActionMapping mapping, HttpServletResponse response, String url)
+	    throws IOException, ServletException {
+	if (url != null) {
+	    String fullURL = WebUtil.convertToFullURL(url);
+	    response.sendRedirect(response.encodeRedirectURL(fullURL));
+	} else {
+	    throw new ServletException("Tried to redirect to url but url is null");
 	}
+	return null;
+    }
 
     /**
-     * <p>The structs dispatch action that joins a learner into a lesson. This 
-     * call is used for a user to start a lesson.</p>
+     * Handle an exception - either thrown by the service or by the web layer. Allows the exception to be logged
+     * properly and ensure that an actual message goes back to Flash.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param e
+     * @param methodKey
+     * @param learnerService
+     * @return
+     */
+    protected FlashMessage handleException(Exception e, String methodKey, ICoreLearnerService learnerService) {
+	LearnerAction.log.error("Exception thrown " + methodKey, e);
+	String[] msg = new String[1];
+	msg[0] = e.getMessage();
+
+	getAuditService().log(LearnerAction.class.getName() + ":" + methodKey, e.toString());
+
+	return new FlashMessage(methodKey, learnerService.getMessageService().getMessage("error.system.learner", msg),
+		FlashMessage.CRITICAL_ERROR);
+    }
+
+    /**
+     * <p>
+     * The structs dispatch action that joins a learner into a lesson. This call is used for a user to start a lesson.
+     * </p>
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
+     * 
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward joinLesson(ActionMapping mapping,
-                                    ActionForm form,
-                                    HttpServletRequest request,
-                                    HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
-        //initialize service object
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-        Integer learner = null;
-    	try {
-	
-	        //get user and lesson based on request.
-	        learner = LearningWebUtil.getUserId();
-	        long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-	
-	        
-	        if(log.isDebugEnabled())
-	            log.debug("The learner ["+learner+"] is joining the lesson ["+lessonID+"]");
-	
-	        //join user to the lesson on the server
-	        LearnerProgress learnerProgress = learnerService.joinLesson(learner,lessonID);
-	        
-	        if(log.isDebugEnabled())
-	            log.debug("The learner ["+learner+"] joined lesson. The"
-	                      +"progress data is:"+learnerProgress.toString());
-	        
-			LearningWebUtil.putLearnerProgressInRequest(request,learnerProgress);
-			
-			ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-			String url = "learning/" +  activityMapping.getDisplayActivityAction(lessonID);
-			
-			redirectToURL(mapping, response, url);
-	
-    	} catch (Exception e ) {
-           log.error("An error occurred while learner "+learner+" attempting to join the lesson.",e);
-    		return mapping.findForward(ActivityMapping.ERROR);
-    	}
-    	
-        return null;
+    public ActionForward joinLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	// initialize service object
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	Integer learner = null;
+	try {
+
+	    // get user and lesson based on request.
+	    learner = LearningWebUtil.getUserId();
+	    long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("The learner [" + learner + "] is joining the lesson [" + lessonID + "]");
+	    }
+
+	    // join user to the lesson on the server
+	    LearnerProgress learnerProgress = learnerService.joinLesson(learner, lessonID);
+
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("The learner [" + learner + "] joined lesson. The" + "progress data is:"
+			+ learnerProgress.toString());
+	    }
+
+	    LearningWebUtil.putLearnerProgressInRequest(request, learnerProgress);
+
+	    ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet()
+		    .getServletContext());
+	    String url = "learning/" + activityMapping.getDisplayActivityAction(lessonID);
+
+	    redirectToURL(mapping, response, url);
+
+	} catch (Exception e) {
+	    LearnerAction.log
+		    .error("An error occurred while learner " + learner + " attempting to join the lesson.", e);
+	    return mapping.findForward(ActivityMapping.ERROR);
+	}
+
+	return null;
     }
-    
+
     /**
-     * <p>The structs dispatch action that joins a learner into a lesson. This
-     * call is used for a user to resume a lesson. </p>
+     * <p>
+     * The structs dispatch action that joins a learner into a lesson. This call is used for a user to resume a lesson.
+     * </p>
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * 
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward resumeLesson(ActionMapping mapping,
-                                    ActionForm form,
-                                    HttpServletRequest request,
-                                    HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
-        //initialize service object
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+    public ActionForward resumeLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	// initialize service object
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
-        FlashMessage message = null;
-    	try {
-	
-	        //get user and lesson based on request.
-	        Integer learner = LearningWebUtil.getUserId();
-	        long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-	
-	        
-	        if(log.isDebugEnabled())
-	            log.debug("The learner ["+learner+"] is joining the lesson ["+lessonID+"]");
-	
-	        //join user to the lesson on the server
-	        LearnerProgress learnerProgress = learnerService.joinLesson(learner,lessonID);
-	        
-	        if(log.isDebugEnabled())
-	            log.debug("The learner ["+learner+"] joined lesson. The"
-	                      +"porgress data is:"+learnerProgress.toString());
-	        
-			LearningWebUtil.putLearnerProgressInRequest(request,learnerProgress);
-	
-	        //serialize a acknowledgement flash message with the path of display next
-	        //activity
-	        
-			ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-			message = new FlashMessage("joinLesson", activityMapping.getDisplayActivityAction(null));
-	
-    	} catch (Exception e ) {
-    		message = handleException(e, "joinLesson", learnerService);
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending Lesson joined acknowledge message to flash:"+wddxPacket);
-        
-        //we hand over the control to flash. 
-        response.getWriter().print(wddxPacket);
-        return null;
+	FlashMessage message = null;
+	try {
+
+	    // get user and lesson based on request.
+	    Integer learner = LearningWebUtil.getUserId();
+	    long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("The learner [" + learner + "] is joining the lesson [" + lessonID + "]");
+	    }
+
+	    // join user to the lesson on the server
+	    LearnerProgress learnerProgress = learnerService.joinLesson(learner, lessonID);
+
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("The learner [" + learner + "] joined lesson. The" + "porgress data is:"
+			+ learnerProgress.toString());
+	    }
+
+	    LearningWebUtil.putLearnerProgressInRequest(request, learnerProgress);
+
+	    // serialize a acknowledgement flash message with the path of display next
+	    // activity
+
+	    ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet()
+		    .getServletContext());
+	    message = new FlashMessage("joinLesson", activityMapping.getDisplayActivityAction(null));
+
+	} catch (Exception e) {
+	    message = handleException(e, "joinLesson", learnerService);
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending Lesson joined acknowledge message to flash:" + wddxPacket);
+	}
+
+	// we hand over the control to flash.
+	response.getWriter().print(wddxPacket);
+	return null;
     }
 
     /**
-     * <p>Exit the current lesson that is running in the leaner window. It 
-     * expects lesson id passed as parameter from flash component.
+     * <p>
+     * Exit the current lesson that is running in the leaner window. It expects lesson id passed as parameter from flash
+     * component.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * 
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward exitLesson(ActionMapping mapping,
-                                    ActionForm form,
-                                    HttpServletRequest request,
-                                    HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
-        //initialize service object
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+    public ActionForward exitLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	// initialize service object
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
-        FlashMessage message = null;
-    	try {
-    		// get user and lesson based on request.
-	        Integer learner = LearningWebUtil.getUserId();
-    		Long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    		
-	        if(log.isDebugEnabled())
-	            log.debug("Exiting lesson, lesson id is: "+lessonID);
-	        
-	        learnerService.exitLesson(learner, lessonID);
-	        
-	        //send acknowledgment to flash as it is triggered by flash
-	        message = new FlashMessage("exitLesson", true);
+	FlashMessage message = null;
+	try {
+	    // get user and lesson based on request.
+	    Integer learner = LearningWebUtil.getUserId();
+	    Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 
-    	} catch (Exception e ) {
-    		message = handleException(e, "exitLesson", learnerService);
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending Exit Lesson acknowledge message to flash:"+wddxPacket);
-        response.getWriter().print(wddxPacket);
-        return null;
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("Exiting lesson, lesson id is: " + lessonID);
+	    }
+
+	    learnerService.exitLesson(learner, lessonID);
+
+	    // send acknowledgment to flash as it is triggered by flash
+	    message = new FlashMessage("exitLesson", true);
+
+	} catch (Exception e) {
+	    message = handleException(e, "exitLesson", learnerService);
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending Exit Lesson acknowledge message to flash:" + wddxPacket);
+	}
+	response.getWriter().print(wddxPacket);
+	return null;
     }
-    
+
     /**
-     * Gets the basic lesson details (name, descripton, etc) for a lesson. Contains a LessonDTO.
-     * Takes a single parameter lessonID
+     * Gets the basic lesson details (name, descripton, etc) for a lesson. Contains a LessonDTO. Takes a single
+     * parameter lessonID
      */
-    public ActionForward getLesson(ActionMapping mapping,
-                                    ActionForm form,
-                                    HttpServletRequest request,
-                                    HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
+    public ActionForward getLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
 
-        //initialize service object
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	// initialize service object
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
-        FlashMessage message = null;
-    	try {
+	FlashMessage message = null;
+	try {
 
-    		Long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
+	    Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 
-            if(log.isDebugEnabled())
-                log.debug("get lesson..."+lessonID);
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("get lesson..." + lessonID);
+	    }
 
-            LessonDTO dto = learnerService.getLessonData(lessonID);
-	        
-	        //send acknowledgment to flash as it is triggerred by flash
-	        message = new FlashMessage("getLesson",dto);
+	    LessonDTO dto = learnerService.getLessonData(lessonID);
 
-    	} catch (Exception e ) {
-    		message = handleException(e, "getLesson", learnerService);
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending getLesson data message to flash:"+wddxPacket);
-        response.getWriter().print(wddxPacket);
-        return null;
+	    // send acknowledgment to flash as it is triggerred by flash
+	    message = new FlashMessage("getLesson", dto);
+
+	} catch (Exception e) {
+	    message = handleException(e, "getLesson", learnerService);
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending getLesson data message to flash:" + wddxPacket);
+	}
+	response.getWriter().print(wddxPacket);
+	return null;
     }
-    
+
     /**
-     * <p>The struts dispatch action to retrieve the progress data from the 
-     * server and tailor it into the object struture that expected by flash.
-     * A wddx packet with object data struture is sent back in the end of this 
-     * call. It is used to construct or restore the flash learner progress
-     * bar</p>
+     * <p>
+     * The struts dispatch action to retrieve the progress data from the server and tailor it into the object struture
+     * that expected by flash. A wddx packet with object data struture is sent back in the end of this call. It is used
+     * to construct or restore the flash learner progress bar
+     * </p>
      * 
-     * <p>Gets the most recent copy from the database - not the cached version.
-     * That way if the cached version has problems, at least we start off right!
+     * <p>
+     * Gets the most recent copy from the database - not the cached version. That way if the cached version has
+     * problems, at least we start off right!
      * </p>
      * 
-     * <p>As this process is expensive, the server is only expecting this call
-     * whenever is necessary. For example, starting, resuming and restoring
-     * a new lesson. And it should not happen every time that learner is
-     * progressing to next activity.</p>
+     * <p>
+     * As this process is expensive, the server is only expecting this call whenever is necessary. For example,
+     * starting, resuming and restoring a new lesson. And it should not happen every time that learner is progressing to
+     * next activity.
+     * </p>
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward getFlashProgressData(ActionMapping mapping,
-                                              ActionForm form,
-                                              HttpServletRequest request,
-                                              HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
-        if(log.isDebugEnabled())
-            log.debug("Getting Flash progress data...");
-        
-        FlashMessage message = null;
-    	try {
-	
-	        //SessionBean sessionBean = LearningWebUtil.getSessionBean(request,getServlet().getServletContext());
-    		
-	        Integer learnerId = LearningWebUtil.getUserId();
-	        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-	        
-		    Long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID );
-		    LearnerProgressDTO learnerProgress = learnerService.getProgressDTOByLessonId(lessonId, learnerId);
-	        
-	        message = new FlashMessage("getFlashProgressData",learnerProgress);
+    public ActionForward getFlashProgressData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Getting Flash progress data...");
+	}
 
-    	} catch (Exception e ) {
-    		message = handleException(e, "getFlashProgressData", LearnerServiceProxy.getLearnerService(getServlet().getServletContext()));
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending learner progress data to flash:"+wddxPacket);
-        response.getWriter().print(wddxPacket);
+	FlashMessage message = null;
+	try {
 
-        //don't need to return a action forward because it sent the wddx packet
-        //back already.
-        return null;
+	    // SessionBean sessionBean = LearningWebUtil.getSessionBean(request,getServlet().getServletContext());
+
+	    Integer learnerId = LearningWebUtil.getUserId();
+	    ICoreLearnerService learnerService = LearnerServiceProxy
+		    .getLearnerService(getServlet().getServletContext());
+
+	    Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+	    LearnerProgressDTO learnerProgress = learnerService.getProgressDTOByLessonId(lessonId, learnerId);
+
+	    message = new FlashMessage("getFlashProgressData", learnerProgress);
+
+	} catch (Exception e) {
+	    message = handleException(e, "getFlashProgressData", LearnerServiceProxy.getLearnerService(getServlet()
+		    .getServletContext()));
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending learner progress data to flash:" + wddxPacket);
+	}
+	response.getWriter().print(wddxPacket);
+
+	// don't need to return a action forward because it sent the wddx packet
+	// back already.
+	return null;
     }
-   
+
     /**
-     * <p>The struts dispatch action to view the activity. This will be called 
-     * by flash progress bar to check up the activity component. The lams side 
-     * will calculate the url and send a flash message back to the 
-     * flash component.</p>
+     * <p>
+     * The struts dispatch action to view the activity. This will be called by flash progress bar to check up the
+     * activity component. The lams side will calculate the url and send a flash message back to the flash component.
+     * </p>
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward getLearnerActivityURL(ActionMapping mapping,
-                                               ActionForm form,
-                                               HttpServletRequest request,
-                                               HttpServletResponse response) throws IOException,
-                                                                          	ServletException
-    {
-        if(log.isDebugEnabled())
-            log.debug("Getting url for learner activity...");
+    public ActionForward getLearnerActivityURL(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Getting url for learner activity...");
+	}
 
-        FlashMessage message = null;
-    	try {
+	FlashMessage message = null;
+	try {
 
-    		// get the activity id and calculate the url for this activity.
-	        long activityId = WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID);
-	        String url = getLearnerActivityURL(request, activityId); 
-	        
-	        //send data back to flash.
-	        ProgressActivityDTO activityDTO = new ProgressActivityDTO(new Long(activityId),url);
-	        message = new FlashMessage("getLearnerActivityURL",activityDTO);
+	    // get the activity id and calculate the url for this activity.
+	    long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+	    String url = getLearnerActivityURL(request, activityId);
 
-    	} catch (Exception e ) {
-    		message = handleException(e, "getLearnerActivityURL", LearnerServiceProxy.getLearnerService(getServlet().getServletContext()));
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending learner activity url data to flash:"+wddxPacket);
-        
-        response.getWriter().print(wddxPacket);
-        return null;
+	    // send data back to flash.
+	    ProgressActivityDTO activityDTO = new ProgressActivityDTO(new Long(activityId), url);
+	    message = new FlashMessage("getLearnerActivityURL", activityDTO);
+
+	} catch (Exception e) {
+	    message = handleException(e, "getLearnerActivityURL", LearnerServiceProxy.getLearnerService(getServlet()
+		    .getServletContext()));
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending learner activity url data to flash:" + wddxPacket);
+	}
+
+	response.getWriter().print(wddxPacket);
+	return null;
     }
 
-	/**
-	 * @param request
-	 * @param activityId
-	 * @return
-	 */
-	private String getLearnerActivityURL(HttpServletRequest request, long activityId) {
-		//initialize service object
-		ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-		ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+    /**
+     * @param request
+     * @param activityId
+     * @return
+     */
+    private String getLearnerActivityURL(HttpServletRequest request, long activityId) {
+	// initialize service object
+	ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
-		//getting requested object according to coming parameters
-		Integer learnerId = LearningWebUtil.getUserId();
-		User learner = (User)LearnerServiceProxy.getUserManagementService(getServlet().getServletContext()).findById(User.class,learnerId);
+	// getting requested object according to coming parameters
+	Integer learnerId = LearningWebUtil.getUserId();
+	User learner = (User) LearnerServiceProxy.getUserManagementService(getServlet().getServletContext()).findById(
+		User.class, learnerId);
 
-		Activity requestedActivity = learnerService.getActivity(new Long(activityId));
-		Lesson lesson = learnerService.getLessonByActivity(requestedActivity);
-		String url = activityMapping.calculateActivityURLForProgressView(lesson,learner,requestedActivity);
-		return url;
-	}
-    
+	Activity requestedActivity = learnerService.getActivity(new Long(activityId));
+	Lesson lesson = learnerService.getLessonByActivity(requestedActivity);
+	String url = activityMapping.calculateActivityURLForProgressView(lesson, learner, requestedActivity);
+	return url;
+    }
+
     /**
-     * Gets the same url as getLearnerActivityURL() but forwards directly to the url, rather than 
-     * returning the url in a Flash packet.
+     * Gets the same url as getLearnerActivityURL() but forwards directly to the url, rather than returning the url in a
+     * Flash packet.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward displayProgress(ActionMapping mapping,
-                                               ActionForm form,
-                                               HttpServletRequest request,
-                                               HttpServletResponse response) throws IOException,
-                                                                          	ServletException
-    {
-		Integer learnerId = LearningWebUtil.getUserId();
-	    Long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID );
-	    
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-        Object[] ret = learnerService.getStructuredActivityURLs(learnerId, lessonId);;
-        request.setAttribute("progressList", (List<ActivityURL>)ret[0]);
-        request.setAttribute("currentActivityID", ret[1]);
-        
-        return mapping.findForward("displayProgress");
+    public ActionForward displayProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	Integer learnerId = LearningWebUtil.getUserId();
+	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	Object[] ret = learnerService.getStructuredActivityURLs(learnerId, lessonId);
+	;
+	request.setAttribute("progressList", ret[0]);
+	request.setAttribute("currentActivityID", ret[1]);
+
+	return mapping.findForward("displayProgress");
     }
-	
+
     /**
      * Forces a move to a destination Activity in the learning sequence, returning a WDDX packet
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward forceMove(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                                 ServletException {
-    	FlashMessage flashMessage = null;
-		ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-		ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-    	Long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    	
-    	try {
-    		String url;
-    		Activity targetActivity = forceMoveShared(request, learnerService, lessonId);
-    		
-    		if(!targetActivity.isFloating()) url = activityMapping.getDisplayActivityAction(null);
-    		else url = activityMapping.getActivityURL(targetActivity);
-    		
-    		//TODO: update for moving to Floating Activity in Flash Learner
-    		flashMessage = new FlashMessage("forceMove", activityMapping.getDisplayActivityAction(null));
-        } catch (Exception e) {
-        	flashMessage = handleException(e, "forceMove", learnerService);
-        }
+    public ActionForward forceMove(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	FlashMessage flashMessage = null;
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
+	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 
-        PrintWriter writer = response.getWriter();
-        writer.println(flashMessage.serializeMessage());
-        return null;
-    	
+	try {
+	    String url;
+	    Activity targetActivity = forceMoveShared(request, learnerService, lessonId);
+
+	    if (!targetActivity.isFloating()) {
+		url = activityMapping.getDisplayActivityAction(null);
+	    } else {
+		url = activityMapping.getActivityURL(targetActivity);
+	    }
+
+	    // TODO: update for moving to Floating Activity in Flash Learner
+	    flashMessage = new FlashMessage("forceMove", activityMapping.getDisplayActivityAction(null));
+	} catch (Exception e) {
+	    flashMessage = handleException(e, "forceMove", learnerService);
+	}
+
+	PrintWriter writer = response.getWriter();
+	writer.println(flashMessage.serializeMessage());
+	return null;
+
     }
 
     /**
-     * Forces a move to a destination Activity in the learning sequence, redirecting to the new
-     * page rather than returning a WDDX packet.
+     * Forces a move to a destination Activity in the learning sequence, redirecting to the new page rather than
+     * returning a WDDX packet.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward forceMoveRedirect(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                                 ServletException {
-		ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-		ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-    	Long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    	
-    	try {
-    		String url;
-    		Activity targetActivity = forceMoveShared(request, learnerService,lessonId); 
-    		
-    		if(!targetActivity.isFloating()) url = "/learning" + activityMapping.getDisplayActivityAction(lessonId);
-    		else url = activityMapping.getActivityURL(targetActivity);
-    		
-    		return redirectToURL(mapping, response, url);
-        } catch (Exception e) {
-        	log.error("Exception throw doing force move",e);
-        	throw new ServletException(e);
-        }
+    public ActionForward forceMoveRedirect(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
+	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+
+	try {
+	    String url;
+	    Activity targetActivity = forceMoveShared(request, learnerService, lessonId);
+
+	    if (!targetActivity.isFloating()) {
+		url = "/learning" + activityMapping.getDisplayActivityAction(lessonId);
+	    } else {
+		url = activityMapping.getActivityURL(targetActivity);
+	    }
+
+	    return redirectToURL(mapping, response, url);
+	} catch (Exception e) {
+	    LearnerAction.log.error("Exception throw doing force move", e);
+	    throw new ServletException(e);
+	}
     }
 
     /**
-	 * @param request
-	 * @return targetActivity 	The activity we are moving to. 
-	 */
-	private Activity forceMoveShared(HttpServletRequest request, ICoreLearnerService learnerService, Long lessonId) {
+     * @param request
+     * @return targetActivity The activity we are moving to.
+     */
+    private Activity forceMoveShared(HttpServletRequest request, ICoreLearnerService learnerService, Long lessonId) {
 
-		//getting requested object according to coming parameters
-		Integer learnerId = LearningWebUtil.getUserId();
+	// getting requested object according to coming parameters
+	Integer learnerId = LearningWebUtil.getUserId();
 
-		//get parameters
-    	Long fromActivityId = null;
-    	Long toActivityId = null;
-    	
-    	String fromActId = request.getParameter(AttributeNames.PARAM_CURRENT_ACTIVITY_ID);
-    	String toActId = request.getParameter(AttributeNames.PARAM_DEST_ACTIVITY_ID);
-    	if(fromActId != null)
-    		try{
-    			fromActivityId = new Long(Long.parseLong(fromActId));
-    		}catch(Exception e){
-    			fromActivityId = null;
-    		}
-    	
-    	if(toActId != null)
-        	try{
-        		toActivityId = new Long(Long.parseLong(toActId));
-        	}catch(Exception e){
-        		toActivityId = null;
-        	}
-    		
-        
-    	Activity fromActivity = null;
-    	Activity toActivity = null;
-    	
-    	if(fromActivityId != null)
-    		fromActivity = learnerService.getActivity(fromActivityId);
-    	
-    	if(toActivityId != null)
-    		toActivity = learnerService.getActivity(toActivityId);
-    	
-    	learnerService.moveToActivity(learnerId, lessonId, fromActivity, toActivity);
-    	
-		if ( log.isDebugEnabled() ) {
-			log.debug("Force move for learner "+learnerId+" lesson "+lessonId+". ");
-		}
-		
-		return toActivity;
+	// get parameters
+	Long fromActivityId = null;
+	Long toActivityId = null;
+
+	String fromActId = request.getParameter(AttributeNames.PARAM_CURRENT_ACTIVITY_ID);
+	String toActId = request.getParameter(AttributeNames.PARAM_DEST_ACTIVITY_ID);
+	if (fromActId != null) {
+	    try {
+		fromActivityId = new Long(Long.parseLong(fromActId));
+	    } catch (Exception e) {
+		fromActivityId = null;
+	    }
 	}
-    
-	/**
-	 * Get AuditService bean.
-	 * @return
-	 */
-	private IAuditService getAuditService(){
-		if(auditService==null){
-			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-			auditService = (IAuditService) ctx.getBean("auditService");
-		}
-		return auditService;
+
+	if (toActId != null) {
+	    try {
+		toActivityId = new Long(Long.parseLong(toActId));
+	    } catch (Exception e) {
+		toActivityId = null;
+	    }
 	}
-	
+
+	Activity fromActivity = null;
+	Activity toActivity = null;
+
+	if (fromActivityId != null) {
+	    fromActivity = learnerService.getActivity(fromActivityId);
+	}
+
+	if (toActivityId != null) {
+	    toActivity = learnerService.getActivity(toActivityId);
+	}
+
+	learnerService.moveToActivity(learnerId, lessonId, fromActivity, toActivity);
+
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Force move for learner " + learnerId + " lesson " + lessonId + ". ");
+	}
+
+	return toActivity;
+    }
+
     /**
-     * Gets the same url as getLearnerActivityURL() but forwards directly to the url, rather than 
-     * returning the url in a Flash packet.
+     * Get AuditService bean.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @return
+     */
+    private IAuditService getAuditService() {
+	if (LearnerAction.auditService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		    .getServletContext());
+	    LearnerAction.auditService = (IAuditService) ctx.getBean("auditService");
+	}
+	return LearnerAction.auditService;
+    }
+
+    /**
+     * Gets the same url as getLearnerActivityURL() but forwards directly to the url, rather than returning the url in a
+     * Flash packet.
+     * 
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward forwardToLearnerActivityURL(ActionMapping mapping,
-                                               ActionForm form,
-                                               HttpServletRequest request,
-                                               HttpServletResponse response) throws IOException,
-                                                                          	ServletException
-    {
-        long activityId = WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID);
-        if(log.isDebugEnabled())
-            log.debug("Forwarding to the url for learner activity..."+activityId);
-        
-        String url = getLearnerActivityURL(request, activityId);
-       	return redirectToURL(mapping, response, url);
+    public ActionForward forwardToLearnerActivityURL(ActionMapping mapping, ActionForm form,
+	    HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+	long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Forwarding to the url for learner activity..." + activityId);
+	}
+
+	String url = getLearnerActivityURL(request, activityId);
+	return redirectToURL(mapping, response, url);
     }
 
-    
 }
\ No newline at end of file