Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivity.java
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -r4ed305ca5a1ce5c51ab76815077b59a6fa8987b4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivity.java	(.../ChooseActivity.java)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivity.java	(.../ChooseActivity.java)	(revision 4ed305ca5a1ce5c51ab76815077b59a6fa8987b4)
@@ -61,29 +61,29 @@
 		ActivityForm form = (ActivityForm) actionForm;
 		ActionMappings actionMappings = getActionMappings();
 		
-		SessionBean sessionBean = ActivityAction.getSessionBean(request);
+		SessionBean sessionBean = getSessionBean(request);
 		if (sessionBean == null) {
 			// forward to the no session error page
-			return mapping.findForward(actionMappings.NO_SESSION_ERROR);
+			return mapping.findForward(ActionMappings.NO_SESSION_ERROR);
 		}
 		
 		// check token
 		if (!this.isTokenValid(request, true)) {
 			// didn't come here from options page
 		    log.info(className+": No valid token in request");
-			return mapping.findForward(actionMappings.DOUBLE_SUBMIT_ERROR);
+			return mapping.findForward(ActionMappings.DOUBLE_SUBMIT_ERROR);
 		}
 		
 		// Get learner
-		User learner = sessionBean.getLeaner();
+		User learner = sessionBean.getLearner();
 		Lesson lesson = sessionBean.getLesson();
 		
 		LearnerProgress progress = getLearnerProgress(request, form);
 		Activity activity = getActivity(request, form, progress);
 		
 		if (activity == null) {
 		    log.error(className+": No activity in request or session");
-			return mapping.findForward(actionMappings.ERROR);
+			return mapping.findForward(ActionMappings.ERROR);
 		}
 
 		ILearnerService learnerService = getLearnerService(request);
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivity.java
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -r4ed305ca5a1ce5c51ab76815077b59a6fa8987b4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivity.java	(.../CompleteActivity.java)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivity.java	(.../CompleteActivity.java)	(revision 4ed305ca5a1ce5c51ab76815077b59a6fa8987b4)
@@ -64,29 +64,29 @@
 		ActivityForm form = (ActivityForm)actionForm;
 		ActionMappings actionMappings = getActionMappings();
 		
-		SessionBean sessionBean = ActivityAction.getSessionBean(request);
+		SessionBean sessionBean = getSessionBean(request);
 		if (sessionBean == null) {
 			// forward to the no session error page
-			return mapping.findForward(actionMappings.NO_SESSION_ERROR);
+			return mapping.findForward(ActionMappings.NO_SESSION_ERROR);
 		}
 		
 		// check token
 		if (!this.isTokenValid(request, true)) {
 			// didn't come here from options page
 		    log.info(className+": No valid token in request");
-			return mapping.findForward(actionMappings.DOUBLE_SUBMIT_ERROR);
+			return mapping.findForward(ActionMappings.DOUBLE_SUBMIT_ERROR);
 		}
 		
 		// Get learner
-		User learner = sessionBean.getLeaner();
+		User learner = sessionBean.getLearner();
 		Lesson lesson = sessionBean.getLesson();
 		
 		LearnerProgress progress = getLearnerProgress(request, form);
 		Activity activity = getActivity(request, form, progress);
 		
 		if (activity == null) {
 		    log.error(className+": No activity in request or session");
-			return mapping.findForward(actionMappings.ERROR);
+			return mapping.findForward(ActionMappings.ERROR);
 		}
 
 		ILearnerService learnerService = getLearnerService(request);
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -r4ed305ca5a1ce5c51ab76815077b59a6fa8987b4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java	(.../DisplayActivity.java)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java	(.../DisplayActivity.java)	(revision 4ed305ca5a1ce5c51ab76815077b59a6fa8987b4)
@@ -23,8 +23,6 @@
 
 import javax.servlet.http.*;
 
-import java.util.*;
-
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
@@ -62,14 +60,14 @@
 		ActivityForm form = (ActivityForm) actionForm;
 		ActionMappings actionMappings = getActionMappings();
 		
-		SessionBean sessionBean = ActivityAction.getSessionBean(request);
+		SessionBean sessionBean = getSessionBean(request);
 		if (sessionBean == null) {
 			// forward to the no session error page
-			return mapping.findForward(actionMappings.NO_SESSION_ERROR);
+			return mapping.findForward(ActionMappings.NO_SESSION_ERROR);
 		}
 		
 		// Get learner
-		User learner = sessionBean.getLeaner();
+		User learner = sessionBean.getLearner();
 		Lesson lesson = sessionBean.getLesson();
 		
 		LearnerProgress learnerProgress = getLearnerProgress(request, form);
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayLoadToolActivity.java
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -r4ed305ca5a1ce5c51ab76815077b59a6fa8987b4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayLoadToolActivity.java	(.../DisplayLoadToolActivity.java)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayLoadToolActivity.java	(.../DisplayLoadToolActivity.java)	(revision 4ed305ca5a1ce5c51ab76815077b59a6fa8987b4)
@@ -43,7 +43,7 @@
  * @struts:action path="/DisplayLoadToolActivity" name="activityForm"
  *                validate="false" scope="request"
  * 
- * @struts:action-forward name="displayTool" path=".toolActivity"
+ * @struts:action-forward name="displayTool" path=".loadToolActivity"
  * 
  */
 public class DisplayLoadToolActivity extends ActivityAction {
@@ -64,7 +64,7 @@
 		Activity activity = getActivity(request, form, learnerProgress);
 		if (!(activity instanceof ToolActivity)) {
 		    log.error(className+": activity not ToolActivity");
-			return mapping.findForward(actionMappings.ERROR);
+			return mapping.findForward(ActionMappings.ERROR);
 		}
 		
 		ToolActivity toolActivity = (ToolActivity)activity;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -r4ed305ca5a1ce5c51ab76815077b59a6fa8987b4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java	(.../DisplayOptionsActivity.java)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java	(.../DisplayOptionsActivity.java)	(revision 4ed305ca5a1ce5c51ab76815077b59a6fa8987b4)
@@ -72,7 +72,7 @@
 		Activity activity = getActivity(request, form, learnerProgress);
 		if (!(activity instanceof OptionsActivity)) {
 		    log.error(className+": activity not OptionsActivity "+activity.getActivityId());
-			return mapping.findForward(actionMappings.ERROR);
+			return mapping.findForward(ActionMappings.ERROR);
 		}
 
 		OptionsActivity optionsActivity = (OptionsActivity)activity;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -r4ed305ca5a1ce5c51ab76815077b59a6fa8987b4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java	(.../DisplayParallelActivity.java)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java	(.../DisplayParallelActivity.java)	(revision 4ed305ca5a1ce5c51ab76815077b59a6fa8987b4)
@@ -65,7 +65,7 @@
 		Activity activity = getActivity(request, form, learnerProgress);
 		if (!(activity instanceof ParallelActivity)) {
 		    log.error(className+": activity not ParallelActivity "+activity.getActivityId());
-			return mapping.findForward(actionMappings.ERROR);
+			return mapping.findForward(ActionMappings.ERROR);
 		}
 
 		ParallelActivity parallelActivity = (ParallelActivity)activity;
@@ -84,7 +84,7 @@
 		}
 		if (activityURLs.size() == 0) {
 		    log.error(className+": No sub-activity URLs for activity "+activity.getActivityId());
-			return mapping.findForward(actionMappings.ERROR);
+			return mapping.findForward(ActionMappings.ERROR);
 		}
 		form.setActivityURLs(activityURLs);
 		
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -r4ed305ca5a1ce5c51ab76815077b59a6fa8987b4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java	(.../DisplayToolActivity.java)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java	(.../DisplayToolActivity.java)	(revision 4ed305ca5a1ce5c51ab76815077b59a6fa8987b4)
@@ -23,12 +23,9 @@
 
 import javax.servlet.http.*;
 
-import java.util.*;
-
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.learning.web.bean.ActivityURL;
 import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 
 import org.lamsfoundation.lams.learningdesign.*;
@@ -38,6 +35,8 @@
 /** 
  * Action class to forward the user to a Tool.
  * 
+ * @author daveg
+ * 
  * XDoclet definition:
  * 
  * @struts:action path="/DisplayToolActivity" name="activityForm"
@@ -62,7 +61,7 @@
 		Activity activity = getActivity(request, form, learnerProgress);
 		if (!(activity instanceof ToolActivity)) {
 		    log.error(className+": activity not ToolActivity");
-			return mapping.findForward(actionMappings.ERROR);
+			return mapping.findForward(ActionMappings.ERROR);
 		}
 		
 		ToolActivity toolActivity = (ToolActivity)activity;
@@ -72,7 +71,7 @@
 		    response.sendRedirect(url);
 		}
 		catch (java.io.IOException e) {
-		    return mapping.findForward(actionMappings.ERROR);
+		    return mapping.findForward(ActionMappings.ERROR);
 		}
 		return null;
 	}