Index: TestHarness4LAMS2/.cvsignore
===================================================================
diff -u -r159c15ed2f6cc7c8f273367d199b196effd5f340 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/.cvsignore	(.../.cvsignore)	(revision 159c15ed2f6cc7c8f273367d199b196effd5f340)
+++ TestHarness4LAMS2/.cvsignore	(.../.cvsignore)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -1,2 +1,4 @@
 build
 *.users
+report_*.html
+test.log*
\ No newline at end of file
Index: TestHarness4LAMS2/10forums.zip
===================================================================
diff -u -re550f02589b19921c3319e6b1504593f673d6307 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: TestHarness4LAMS2/123.zip
===================================================================
diff -u -r7f004df92bf884af26247547f7a05978a6504041 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: TestHarness4LAMS2/20nbs.zip
===================================================================
diff -u -r5164df393c31ceaa51d13aca6c909397414fb89f -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: TestHarness4LAMS2/2nbs.zip
===================================================================
diff -u -r5164df393c31ceaa51d13aca6c909397414fb89f -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: TestHarness4LAMS2/5tools.zip
===================================================================
diff -u -r37d07da894922569d79ce4f517c45f8cbed4c452 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: TestHarness4LAMS2/TestHarness4LAMS2.mdr
===================================================================
diff -u -r44e9a6103e0071502738c3676085429d82da9d9e -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: TestHarness4LAMS2/TestHarness4LAMS2.mdzip
===================================================================
diff -u -r44e9a6103e0071502738c3676085429d82da9d9e -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: TestHarness4LAMS2/adminTest1.properties
===================================================================
diff -u -r159c15ed2f6cc7c8f273367d199b196effd5f340 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/adminTest1.properties	(.../adminTest1.properties)	(revision 159c15ed2f6cc7c8f273367d199b196effd5f340)
+++ TestHarness4LAMS2/adminTest1.properties	(.../adminTest1.properties)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -4,6 +4,7 @@
 #-----------------------------------------------------------------
 CreateCourseURL = /admin/organisation.do?method=edit&typeId=2&parentId=1&parentName=Root
 CreateUserURL = /admin/user.do?method=edit&orgId=%orgId%
+AddRolesURL = /admin/userrolessave.do
 
 #---------------------------------------------------------------
 # Set course name for this test.
Index: TestHarness4LAMS2/authorTest1.properties
===================================================================
diff -u -r159c15ed2f6cc7c8f273367d199b196effd5f340 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/authorTest1.properties	(.../authorTest1.properties)	(revision 159c15ed2f6cc7c8f273367d199b196effd5f340)
+++ TestHarness4LAMS2/authorTest1.properties	(.../authorTest1.properties)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -7,7 +7,7 @@
 # This LearningDesignFile is uploaded to import a Learning Design
 # It could be relative path or absolute path or any valid URL
 #-----------------------------------------------------------------
-LearningDesignFile = 2nbs.zip
+LearningDesignFile = 30forums.zip
 
 #-----------------------------------------------------------------
 # If LearningDesignId is set, 
Index: TestHarness4LAMS2/learnerTest1.properties
===================================================================
diff -u -r044d2c0977e88053366db9cecba68192a6cebe5a -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/learnerTest1.properties	(.../learnerTest1.properties)	(revision 044d2c0977e88053366db9cecba68192a6cebe5a)
+++ TestHarness4LAMS2/learnerTest1.properties	(.../learnerTest1.properties)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -1,7 +1,6 @@
 #-------------------------------------------------------------------
 # A bunch of URLs to be used have to be defined
 #-------------------------------------------------------------------
-GetLessonURL =  /monitoring/monitoring.do?method=getLessonDetailsJSON&lessonID=%lsId%
 JoinLessonURL = /learning/learner.do?method=joinLesson&lessonID=%lsId%
 LessonEntryURL = /learning/DisplayActivity.do?lessonID=%lsId%
 
Index: TestHarness4LAMS2/monitorTest1.properties
===================================================================
diff -u -r159c15ed2f6cc7c8f273367d199b196effd5f340 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/monitorTest1.properties	(.../monitorTest1.properties)	(revision 159c15ed2f6cc7c8f273367d199b196effd5f340)
+++ TestHarness4LAMS2/monitorTest1.properties	(.../monitorTest1.properties)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -9,13 +9,9 @@
 InitLessonURL = /monitoring/monitoring.do?method=initializeLesson&learningDesignID=%ldId%&organisationID=%orgId%&userID=%uid%&lessonName=%name%
 CreateLessonClassURL = /monitoring/monitoring.do?method=createLessonClass&userID=%uid%
 StartLessonURL = /monitoring/monitoring.do?method=startLesson&lessonID=%lsId%&userID=%uid%
+GetAllLearnersProgressURL = /monitoring/monitoring.do?method=getLessonProgress&lessonID=%lsId%
 
-GetLessonDetailsURL = /monitoring/monitoring.do?method=getLessonDetailsJSON&lessonID=%lsId%
-GetContributeActivitiesURL = /monitoring/monitoring.do?method=getAllContributeActivities&lessonID=%lsId%
-GetLearningDesignDetailsURL = /authoring/author.do?method=getLearningDesignDetails&learningDesignID=%ldId%
-GetAllLearnersProgressURL = /monitoring/monitoring.do?method=getAllLearnersProgress&lessonID=%lsId%
 
-
 #-----------------------------------------------------------------
 # If LessonId is set,
 # All the settings above and AuthorTest will be ignored
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java
===================================================================
diff -u -r41955af92f3e17f2f11c07d94ae1a5f92b0d998f -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java	(.../Main.java)	(revision 41955af92f3e17f2f11c07d94ae1a5f92b0d998f)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java	(.../Main.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -40,8 +40,8 @@
 	// configure log4j
 	PropertyConfigurator.configure("log.properties");
 	// configure HttpUnit
-	// stops the unsupported javascript stuff from throwing an exception
-	HttpUnitOptions.setExceptionsThrownOnScriptError(false);
+	// stops Javascript parsing, it's not needed
+	HttpUnitOptions.setScriptingEnabled(false);
 	// WebClient.getResponse does not throw an exception when it receives an error status.
 	HttpUnitOptions.setExceptionsThrownOnErrorStatus(false);
     }
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java
===================================================================
diff -u -r159c15ed2f6cc7c8f273367d199b196effd5f340 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java	(.../MockUser.java)	(revision 159c15ed2f6cc7c8f273367d199b196effd5f340)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java	(.../MockUser.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -107,7 +107,7 @@
 	    Map<String, Object> params = new HashMap<String, Object>();
 	    params.put(MockUser.USERNAME, username);
 	    params.put(MockUser.PASSWORD, MockUser.sha1(password));
-	    resp = (WebResponse) new Call(wc, test, "User login", fillForm(resp, 0, params)).execute();
+	    resp = (WebResponse) new Call(wc, test, username + " login", fillForm(resp, 0, params)).execute();
 	    if (!MockUser.checkPageContains(resp, MockUser.INDEX_PAGE_FLAG)) {
 		MockUser.log.debug(resp.getText());
 		throw new TestHarnessException(username + " failed to login with password " + password);
@@ -173,16 +173,16 @@
 	}
 	return form;
     }
-    
-    public boolean equals(Object o){
+
+    public boolean equals(Object o) {
 	return username.equals(((MockUser) o).username);
     }
-    
-    public int hashCode(){
+
+    public int hashCode() {
 	return username.hashCode();
     }
 
     public String getRole() {
-        return role;
+	return role;
     }
 }
\ No newline at end of file
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestManager.java
===================================================================
diff -u -r044d2c0977e88053366db9cecba68192a6cebe5a -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestManager.java	(.../TestManager.java)	(revision 044d2c0977e88053366db9cecba68192a6cebe5a)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestManager.java	(.../TestManager.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -80,6 +80,7 @@
     // property keys of admin test
     private static final String CREATE_COURSE_URL = "CreateCourseURL";
     private static final String CREATE_USER_URL = "CreateUserURL";
+    private static final String ADD_ROLES_URL = "AddRolesURL";
     private static final String COURSE_NAME = "CourseName";
     private static final String COURSE_ID = "CourseId";
     private static final String SYSADMIN_USERNAME = "SysadminUsername";
@@ -107,7 +108,6 @@
     private static final String NUMBER_LEARNERS = "NumberOfLearners";
     private static final String LEARNER_OFFSET = "LearnerOffset";
     private static final String BASE_LEARNER_NAME = "BaseLearnerName";
-    private static final String GET_LESSON_URL = "GetLessonURL";
     private static final String JOIN_LESSON_URL = "JoinLessonURL";
     private static final String LESSON_ENTRY_URL = "LessonEntryURL";
     private static final String FILES_TO_UPLOAD = "FilesToUpload";
@@ -228,14 +228,16 @@
 		TestManager.CREATE_COURSE_URL, courseId != null);
 	String createUserURL = TestManager.getStringProperty(adminTestPropertyFileName, adminTestProperties,
 		TestManager.CREATE_USER_URL, false);
+	String addRolesURL = TestManager.getStringProperty(adminTestPropertyFileName, adminTestProperties,
+		TestManager.ADD_ROLES_URL, false);
 	String courseName = TestManager.getStringProperty(adminTestPropertyFileName, adminTestProperties,
 		TestManager.COURSE_NAME, true);
 	String sysadminUsername = TestManager.getStringProperty(adminTestPropertyFileName, adminTestProperties,
 		TestManager.SYSADMIN_USERNAME, false);
 	String sysadminPassword = TestManager.getStringProperty(adminTestPropertyFileName, adminTestProperties,
 		TestManager.SYSADMIN_PASSWORD, false);
 
-	AdminTest test = new AdminTest(testName, minDelay, maxDelay, createCourseURL, createUserURL,
+	AdminTest test = new AdminTest(testName, minDelay, maxDelay, createCourseURL, createUserURL, addRolesURL,
 		courseId == null ? null : courseId.toString(), courseName, storedUsersFileName);
 
 	test.setUsers(new MockAdmin[] { new MockAdmin(test, sysadminUsername, sysadminPassword) });
@@ -291,16 +293,14 @@
 	learnerOffset = learnerOffset == null ? 1 : learnerOffset;
 	String baseLearnerName = TestManager.getStringProperty(learnerTestPropertyFileName, learnerTestProperties,
 		TestManager.BASE_LEARNER_NAME, true);
-	String getLessonURL = TestManager.getStringProperty(learnerTestPropertyFileName, learnerTestProperties,
-		TestManager.GET_LESSON_URL, false);
 	String joinLessonURL = TestManager.getStringProperty(learnerTestPropertyFileName, learnerTestProperties,
 		TestManager.JOIN_LESSON_URL, false);
 	String lessonEntryURL = TestManager.getStringProperty(learnerTestPropertyFileName, learnerTestProperties,
 		TestManager.LESSON_ENTRY_URL, false);
 	String filesToUpload = TestManager.getStringProperty(learnerTestPropertyFileName, learnerTestProperties,
 		TestManager.FILES_TO_UPLOAD, false);
 
-	LearnerTest test = new LearnerTest(testName, minDelay, maxDelay, getLessonURL, joinLessonURL, lessonEntryURL,
+	LearnerTest test = new LearnerTest(testName, minDelay, maxDelay, joinLessonURL, lessonEntryURL,
 		filesToUpload == null ? null : filesToUpload.split(";"));
 
 	MockLearner[] learners = new MockLearner[numberOfLearners];
@@ -335,12 +335,6 @@
 		TestManager.CREATE_LESSON_CLASS_URL, lsId != null);
 	String startLessonURL = TestManager.getStringProperty(monitorTestPropertyFileName, monitorTestProperties,
 		TestManager.START_LESSON_URL, lsId != null);
-	String getLessonDetailsURL = TestManager.getStringProperty(monitorTestPropertyFileName, monitorTestProperties,
-		TestManager.GET_LESSON_DETAILS_URL, lsId != null);
-	String getContributeActivitiesURL = TestManager.getStringProperty(monitorTestPropertyFileName,
-		monitorTestProperties, TestManager.GET_CA_URL, lsId != null);
-	String getLearningDesignDetailsURL = TestManager.getStringProperty(monitorTestPropertyFileName,
-		monitorTestProperties, TestManager.GET_LD_DETAILS_URL, lsId != null);
 	String getAllLearnersProgressURL = TestManager.getStringProperty(monitorTestPropertyFileName,
 		monitorTestProperties, TestManager.GET_ALL_PROGRESS_URL, lsId != null);
 	String lsName = TestManager.getStringProperty(monitorTestPropertyFileName, monitorTestProperties,
@@ -349,8 +343,7 @@
 		TestManager.BASE_MONITOR_NAME, true);
 
 	MonitorTest test = new MonitorTest(testName, minDelay, maxDelay, initLessonURL, createLessonClassURL,
-		startLessonURL, getLessonDetailsURL, getContributeActivitiesURL, getLearningDesignDetailsURL,
-		getAllLearnersProgressURL, lsName, lsId == null ? null : lsId.toString());
+		startLessonURL, getAllLearnersProgressURL, lsName, lsId == null ? null : lsId.toString());
 
 	baseMonitorName = baseMonitorName == null ? MockMonitor.DEFAULT_NAME : baseMonitorName;
 	String username = TestUtil.buildName(testName, baseMonitorName, TestManager.MAX_USERNAME_LENGTH);
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestUtil.java
===================================================================
diff -u -r044d2c0977e88053366db9cecba68192a6cebe5a -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestUtil.java	(.../TestUtil.java)	(revision 044d2c0977e88053366db9cecba68192a6cebe5a)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestUtil.java	(.../TestUtil.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -45,22 +45,6 @@
 	return TestUtil.truncate(TestUtil.buildName(TestUtil.truncate(testName, 1, true), simpleName), maxLength, true);
     }
 
-    public static String extractString(String text, String startFlag, char endFlag) {
-	String target = null;
-	try {
-	    int index = text.indexOf(startFlag);
-	    if (index != -1) {
-		int startIndex = index + startFlag.length();
-		int endIndex = text.indexOf(endFlag, startIndex);
-		target = text.substring(startIndex, endIndex);
-	    }
-	} catch (IndexOutOfBoundsException e) {
-	    TestUtil.log.error("Index out of bounds. StartFlag: " + startFlag + ", endFlag: " + endFlag + ", text: "
-		    + text);
-	}
-	return target;
-    }
-
     public static int generateRandomNumber(int length) {
 	return new Random().nextInt(length);
     }
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/AdminTest.java
===================================================================
diff -u -r159c15ed2f6cc7c8f273367d199b196effd5f340 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/AdminTest.java	(.../AdminTest.java)	(revision 159c15ed2f6cc7c8f273367d199b196effd5f340)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/AdminTest.java	(.../AdminTest.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -40,15 +40,17 @@
 
     private String createCourseURL;
     private String createUserURL;
+    private String addRolesURL;
     private String courseName;
     private String courseId;
     private String storedUsersFileName;
 
     public AdminTest(String testName, Integer minDelay, Integer maxDelay, String createCourseURL, String createUserURL,
-	    String courseId, String courseName, String storedUsersFileName) {
+	    String addRolesURL, String courseId, String courseName, String storedUsersFileName) {
 	super(testName, minDelay, maxDelay);
 	this.createCourseURL = createCourseURL;
 	this.createUserURL = createUserURL;
+	this.addRolesURL = addRolesURL;
 	this.courseName = courseName == null ? TestUtil.buildName(testName, AdminTest.DEFAULT_COURSE_NAME) : TestUtil
 		.buildName(testName, courseName);
 	this.courseId = courseId;
@@ -63,14 +65,6 @@
 	return courseName;
     }
 
-    public final String getCreateCourseURL() {
-	return createCourseURL;
-    }
-
-    public final String getCreateUserURL() {
-	return createUserURL;
-    }
-
     public final void setCourseId(String courseId) {
 	this.courseId = courseId;
     }
@@ -92,6 +86,6 @@
 	if (courseId == null) {
 	    setCourseId(admin.createCourse(createCourseURL, courseName));
 	}
-	admin.createUsers(createUserURL, courseId, storedUsersFileName);
+	admin.createUsers(createUserURL, addRolesURL, courseId, storedUsersFileName);
     }
 }
\ No newline at end of file
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/MockAdmin.java
===================================================================
diff -u -r159c15ed2f6cc7c8f273367d199b196effd5f340 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/MockAdmin.java	(.../MockAdmin.java)	(revision 159c15ed2f6cc7c8f273367d199b196effd5f340)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/MockAdmin.java	(.../MockAdmin.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -22,7 +22,9 @@
  */
 package org.lamsfoundation.testharness.admin;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -78,6 +80,7 @@
     private static final char USER_ID_END_FLAG = '&';
 
     private static final String LOGIN_TAKEN_ERROR = "Login is already taken.";
+    private static final Pattern NEW_USER_ID_PATTERN = Pattern.compile("name=\"userId\" value=\"(\\d+)\"");
     private static final Pattern EXISTING_USER_ID_PATTERN = Pattern.compile(", ID: (\\d+)");
 
     public MockAdmin(AbstractTest test, String username, String password) {
@@ -87,8 +90,8 @@
     public String createCourse(String createCourseURL, String courseName) {
 	try {
 	    delay();
-	    WebResponse resp = (WebResponse) new Call(wc, test, "Creating Course:" + courseName, createCourseURL)
-		    .execute();
+	    WebResponse resp = (WebResponse) new Call(wc, test, username + " creating course  " + courseName,
+		    createCourseURL).execute();
 	    if (!MockUser.checkPageContains(resp, MockAdmin.COURSE_FORM_FLAG)) {
 		MockAdmin.log.debug(resp.getText());
 		throw new TestHarnessException(username + " did not get course creation page with the url:"
@@ -97,7 +100,8 @@
 	    Map<String, Object> params = new HashMap<String, Object>();
 	    params.put(MockAdmin.COURSE_NAME, courseName);
 	    // fill the form and submit it and return the course id
-	    resp = (WebResponse) new Call(wc, test, "Submit Course Creation Form", fillForm(resp, 0, params)).execute();
+	    resp = (WebResponse) new Call(wc, test, username + " submit course creation form",
+		    fillForm(resp, 0, params)).execute();
 	    WebTable[] tables = resp.getTables();
 	    if ((tables == null) || (tables.length == 0)) {
 		MockAdmin.log.debug(resp.getText());
@@ -125,7 +129,7 @@
 	}
     }
 
-    public void createUsers(String createUserURL, String courseId, String storedUsersFileName) {
+    public void createUsers(String createUserURL, String addRolesURL, String courseId, String storedUsersFileName) {
 	try {
 	    String url = createUserURL.replace(MockAdmin.COURSE_ID_PATTERN, courseId.toString());
 	    List<MockUser> mockUsers = new ArrayList<MockUser>();
@@ -137,50 +141,63 @@
 	    Collections.addAll(mockUsers, learnerTest.getUsers());
 
 	    for (MockUser mockUser : mockUsers) {
-		String name = mockUser.getUsername();
-		if (mockUser.getUserId() != null) {
-		    log.debug("User " + name + " already exists, skipping creation");
-		    continue;
-		}
-
 		delay();
-		// create the user
-		MockAdmin.log.info(username + " creating user " + name);
-		WebResponse resp = (WebResponse) new Call(wc, test, username + " creating user " + name, url).execute();
-		if (!MockUser.checkPageContains(resp, MockAdmin.USER_FORM_FLAG)) {
-		    MockAdmin.log.debug(resp.getText());
-		    throw new TestHarnessException(username + " did not get user creation page with the url " + url);
-		}
-		Map<String, Object> params = new HashMap<String, Object>();
-		params.put(MockAdmin.LOGIN, name);
-		params.put(MockAdmin.PASSWORD, name);
-		params.put(MockAdmin.PASSWORD2, name);
-		params.put(MockAdmin.FIRST_NAME, name);
-		params.put(MockAdmin.LAST_NAME, MockAdmin.COMMON_LAST_NAME);
-		params.put(MockAdmin.EMAIL,
-			name + "@" + MockAdmin.COMMON_LAST_NAME + "." + MockAdmin.COMMON_LAST_NAME.toLowerCase());
-		resp = (WebResponse) new Call(wc, test, username + " submit user creation form", fillForm(resp, 0,
-			params)).execute();
 
-		// add the roles
-		String respText = resp.getText();
-		if (respText.indexOf(MockAdmin.LOGIN_TAKEN_ERROR) != -1) {
-		    Matcher m = MockAdmin.EXISTING_USER_ID_PATTERN.matcher(respText);
-		    if (m.find()) {
-			String userId = m.group(1);
-			mockUser.setUserId(userId);
-			MockAdmin.log.debug("User " + name + " already exists with ID: " + userId);
+		String name = mockUser.getUsername();
+		WebResponse resp = null;
+		if (mockUser.getUserId() == null) {
+		    // create the user
+		    MockAdmin.log.info(username + " creating user " + name);
+		    resp = (WebResponse) new Call(wc, test, username + " creating user " + name, url).execute();
+		    if (!MockUser.checkPageContains(resp, MockAdmin.USER_FORM_FLAG)) {
+			MockAdmin.log.debug(resp.getText());
+			throw new TestHarnessException(username + " did not get user creation page with the url " + url);
+		    }
+		    Map<String, Object> params = new HashMap<String, Object>();
+		    params.put(MockAdmin.LOGIN, name);
+		    params.put(MockAdmin.PASSWORD, name);
+		    params.put(MockAdmin.PASSWORD2, name);
+		    params.put(MockAdmin.FIRST_NAME, name);
+		    params.put(MockAdmin.LAST_NAME, MockAdmin.COMMON_LAST_NAME);
+		    params.put(MockAdmin.EMAIL, name + "@" + MockAdmin.COMMON_LAST_NAME + "."
+			    + MockAdmin.COMMON_LAST_NAME.toLowerCase());
+		    resp = (WebResponse) new Call(wc, test, username + " submit user creation form", fillForm(resp, 0,
+			    params)).execute();
+		    // add the roles
+		    String respText = resp.getText();
+
+		    if (respText.contains(MockAdmin.LOGIN_TAKEN_ERROR)) {
+			Matcher m = MockAdmin.EXISTING_USER_ID_PATTERN.matcher(respText);
+			if (m.find()) {
+			    String userId = m.group(1);
+			    mockUser.setUserId(userId);
+			    MockAdmin.log.debug("User " + name + " already exists with ID " + userId);
+			} else {
+			    throw new TestHarnessException("User " + name
+				    + " already exists, but could not retrieve his ID");
+			}
 		    } else {
-			throw new TestHarnessException("User " + name
-				+ " already exists, but could not retrieve his ID");
+			Matcher m = MockAdmin.NEW_USER_ID_PATTERN.matcher(respText);
+			if (m.find()) {
+			    String userId = m.group(1);
+			    mockUser.setUserId(userId);
+			    MockAdmin.log.debug("User " + name + " created with ID " + userId);
+			} else {
+			    throw new TestHarnessException("User " + name
+				    + " was just created, but could not retrieve his ID");
+			}
 		    }
-		    continue;
+		} else {
+		    MockAdmin.log.debug("User " + name + " already exists, skipping creation");
 		}
 
+		StringBuilder bodyBuilder = new StringBuilder();
+		bodyBuilder.append("orgId=").append(courseId).append("&userId=").append(mockUser.getUserId())
+			.append("&roles=").append(mockUser.getRole());
+		InputStream is = new ByteArrayInputStream(bodyBuilder.toString().getBytes("UTF-8"));
+
 		MockAdmin.log.info(username + " adding roles to user " + name);
-		params = new HashMap<String, Object>();
-		params.put(MockAdmin.ROLES, new String[] { mockUser.getRole() });
-		resp = (WebResponse) new Call(wc, test, username + " submit user rolesform", fillForm(resp, 0, params))
+		resp = (WebResponse) new Call(wc, test, username + " submit user roles form", addRolesURL, is)
 			.execute();
 		WebTable[] tables = resp.getTables();
 		if ((tables == null) || (tables.length < 2)) {
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java
===================================================================
diff -u -r159c15ed2f6cc7c8f273367d199b196effd5f340 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java	(.../MockAuthor.java)	(revision 159c15ed2f6cc7c8f273367d199b196effd5f340)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java	(.../MockAuthor.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -69,7 +69,7 @@
     public String importLearningDesign(String learningDesignUploadURL, File file) {
 	try {
 	    delay();
-	    WebResponse resp = (WebResponse) new Call(wc, test, "Import Learning Design", learningDesignUploadURL)
+	    WebResponse resp = (WebResponse) new Call(wc, test, username + " import Learning Design", learningDesignUploadURL)
 		    .execute();
 	    if (!MockUser.checkPageContains(resp, MockAuthor.IMPORT_FORM_FLAG)) {
 		MockAuthor.log.debug(resp.getText());
@@ -78,7 +78,7 @@
 	    }
 	    Map<String, Object> params = new HashMap<String, Object>();
 	    params.put(MockAuthor.UPLOAD_FILE_PARAM, file);
-	    resp = (WebResponse) new Call(wc, test, "Submit Learning Design Import Form", fillForm(resp, 0, params))
+	    resp = (WebResponse) new Call(wc, test, username + " submits Learning Design import form", fillForm(resp, 0, params))
 		    .execute();
 	    if (!MockUser.checkPageContains(resp, MockAuthor.IMPORT_SUCCESS_FLAG)) {
 		MockAuthor.log.debug(resp.getText());
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/LearnerTest.java
===================================================================
diff -u -r044d2c0977e88053366db9cecba68192a6cebe5a -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/LearnerTest.java	(.../LearnerTest.java)	(revision 044d2c0977e88053366db9cecba68192a6cebe5a)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/LearnerTest.java	(.../LearnerTest.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -40,7 +40,6 @@
 
     private static final Logger log = Logger.getLogger(LearnerTest.class);
 
-    protected String getLessonURL;
     protected String joinLessonURL;
     protected String lessonEntryURL;
     protected String[] filesToUpload;
@@ -50,10 +49,9 @@
      * LearnerTest Constructor
      * 
      */
-    public LearnerTest(String testName, Integer minDelay, Integer maxDelay, String getLessonURL, String joinLessonURL,
+    public LearnerTest(String testName, Integer minDelay, Integer maxDelay, String joinLessonURL,
 	    String lessonEntryURL, String[] filesToUpload) {
 	super(testName, minDelay, maxDelay);
-	this.getLessonURL = getLessonURL;
 	this.joinLessonURL = joinLessonURL;
 	this.lessonEntryURL = lessonEntryURL;
 	this.filesToUpload = filesToUpload;
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
===================================================================
diff -u -r044d2c0977e88053366db9cecba68192a6cebe5a -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java	(.../MockLearner.java)	(revision 044d2c0977e88053366db9cecba68192a6cebe5a)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java	(.../MockLearner.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -24,7 +24,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,8 +36,6 @@
 import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.testharness.Call;
 import org.lamsfoundation.testharness.MockUser;
 import org.lamsfoundation.testharness.TestHarnessException;
@@ -50,38 +50,24 @@
 import com.meterware.httpunit.WebResponse;
 
 /**
- * @version
- * 
- *          <p>
- *          <a href="MockLearner.java.html"><i>View Source</i></a>
- *          </p>
- * 
- * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
+ * @author Fei Yang, Marcin Cieslak
  */
 public class MockLearner extends MockUser implements Runnable {
 
     private static final Logger log = Logger.getLogger(MockLearner.class);
 
     public static final String DEFAULT_NAME = "Learner";
-
     private static final String ARBITRARY_TEXT_ALPHABET = "`1234567890-=qwertyuiop[]\\asdfghjkl;'\tzxcvbnm,./ ~!@#$%^&*()_+}{POIUYTREWQASDFGHJKL:\"?><MNBVCXZ";
-
     private static final String LESSON_ID_PATTERN = "%lsId%";
 
-    private static final String LD_ID_PATTERN = "%ldId%";
-
-    private static final String MESSAGE_VALUE_KEY = "messageValue";
-
-    private static final String LD_ID_KEY = "learningDesignID";
-
-    private static final String NEXT_URL_START_FLAG = "var url = \"";
-
-    private static final char NEXT_URL_END_FLAG = '"';
-
+    private static final Pattern NEXT_URL_PATTERN = Pattern.compile("var url = \"(.*)\"");
     private static final String OPTIONAL_ACTIVITY_FLAG = "selectActivity";
-
     private static final String ACTIVITY_FINISHED_FLAG = "The next task is loading.";
     private static final String LESSON_FINISHED_FLAG = "LessonComplete.do";
+    private static final String LOAD_TOOL_ACTIVITY_FLAG = "Load Tool Activity";
+    private static final Pattern SESSION_MAP_ID_PATTERN = Pattern.compile("sessionMapID=(.+)\\&");
+    private static final Pattern TOOL_SESSION_ID_PATTERN = Pattern.compile("var TOOL_SESSION_ID = '(\\d+)'");
+    private static final String FINISH_SUBSTRING = "finish.do";
 
     private static final String FORUM_FINISH_SUBSTRING = "lafrum11/learning/finish.do";
     private static final String FORUM_VIEW_TOPIC_SUBSTRING = "lafrum11/learning/viewTopic.do";
@@ -99,43 +85,147 @@
     private static final String SCRATCHIE_REFLECTION_AVAILABLE = "return continueReflect()";
     private static final String SCRATCHIE_IS_LEADER_SUBSTRING = "isUserLeader=true";
 
+    private static final String CHAT_FINISH_SUBSTRING = "/lams/tool/lachat11/learning.do";
+    private static final int CHAT_REPLIES = 3;
+
     private static final String KNOCK_GATE_SUBSTRING = "/lams/learning/gate.do?method=knockGate";
 
     private static final Pattern ASSESSMENT_FINISH_PATTERN = Pattern
 	    .compile("'(/lams/tool/laasse10/learning/finish\\.do\\?.*)'");
 
-    private static final Pattern SESSION_MAP_ID_PATTERN = Pattern.compile("sessionMapID=(.+)\\&");
+    private static final Pattern IMAGE_GALLERY_FINISH_PATTERN = Pattern
+	    .compile("'(/lams/tool/laimag10/learning/finish\\.do\\?.*)'");
 
-    private static final String LOAD_TOOL_ACTIVITY_SUBSTRING = "Load Tool Activity";
+    private static final String QA_TOOL_SUBSTRING = "laqa11";
 
-    private static int joinLessonUserCount = 0;
+    private static final String VIDEORECORDER_TOOL_STRING = "lavidr10";
 
-    private static int topJoinLessonUserCount = 0;
+    private static final String TASK_FINISH_SUBSTRING = "/lams/tool/latask10/learning/finish.do";
 
+    private static final String VOTE_VIEW_ALL_RESULTS_BUTTON_STRING = "submitMethod('viewAllResults')";
+    private static final String VOTE_LEARNER_FINISHED_BUTTON_STRING = "submitMethod('learnerFinished')";
+
+    private static final String WIKI_EDIT_BUTTON_STRING = "doEditOrAdd('editPage')";
+
+    private static final Pattern SHARE_RESOURCES_REDIRECT_PATTERN = Pattern
+	    .compile("\"(/lams/tool/larsrc11/pages/learning/learning\\.jsp.*)\"");
+    private static final Pattern SHARE_RESOURCES_VIEW_ITEM_URL_PATTERH = Pattern
+	    .compile("\"(/lams/tool/larsrc11/reviewItem\\.do.*)\"");
+    private static final Pattern SHARE_RESOURCES_VIEW_ITEM_PATTERN = Pattern.compile("viewItem\\((\\d+)\\)");
+
+    private static final Pattern SUBMIT_FILES_FINISH_PATTERN = Pattern
+	    .compile("/lams/tool/lasbmt11/learner\\.do\\?method=finish\\&sessionMapID=sessionMapID-\\d+");
+
+    private static int joinLessonUserCount = 0;
+    private static int topJoinLessonUserCount = 0;
     private boolean finished = false;
 
     /**
      * MockLearner Constructor
      */
     public MockLearner(LearnerTest test, String username, String password, String userId) {
 	super(test, username, password, MockAdmin.LEARNER_ROLE, userId);
+    }
 
+    private static String[] chooseArbitraryValues(String[] values) {
+	int length = 1 + TestUtil.generateRandomNumber(values.length);
+	String[] answers = new String[length];
+	for (int i = 0; i < length; i++) {
+	    answers[i] = values[TestUtil.generateRandomNumber(values.length)];
+	}
+	return answers;
     }
 
+    private static String composeArbitraryText() {
+	int length = 1 + TestUtil.generateRandomNumber(MockLearner.ARBITRARY_TEXT_ALPHABET.length());
+	StringBuilder text = new StringBuilder(length);
+	for (int i = 0; i < length; i++) {
+	    text.append(MockLearner.ARBITRARY_TEXT_ALPHABET.charAt(TestUtil
+		    .generateRandomNumber(MockLearner.ARBITRARY_TEXT_ALPHABET.length())));
+	}
+	return text.toString();
+    }
+
+    private static String findURLInAHREF(WebResponse resp, String linkSubstring) throws SAXException {
+	WebLink[] links = resp.getLinks();
+	if (links != null) {
+	    for (WebLink link : links) {
+		MockLearner.log.debug("Checking link " + link.getURLString());
+		if (link.getURLString().indexOf(linkSubstring) != -1) {
+		    return link.getURLString();
+		}
+	    }
+	}
+	return null;
+    }
+
+    private static String findURLInLocationHref(WebResponse resp, String linkSubstring) throws IOException {
+	// an example of matched string:
+	// location.href ='http://localhost/lams/mylinksubstring/learner.do'
+	Pattern linkPattern = Pattern.compile("location\\.href\\s*=\\s*['\"](.*" + Pattern.quote(linkSubstring)
+		+ ".*)['\"]");
+	Matcher m = linkPattern.matcher(resp.getText());
+	if (m.find()) {
+	    String url = m.group(1);
+	    MockLearner.log.debug("Found location.href = " + url);
+	    return url;
+	}
+	return null;
+    }
+
+    private static Map<String, List<Button>> groupButtonsByName(Button[] btns, String buttonType) {
+	Map<String, List<Button>> buttonGroups = new HashMap<String, List<Button>>();
+	if (btns != null) {
+	    for (Button btn : btns) {
+		if (buttonType.equals(btn.getType())) {
+		    String name = btn.getName();
+		    MockLearner.log.debug("Got " + buttonType + " " + name + " and its value is " + btn.getValue());
+		    if (!buttonGroups.containsKey(name)) {
+			buttonGroups.get(name).add(btn);
+		    } else {
+			List<Button> buttons = new ArrayList<Button>();
+			buttons.add(btn);
+			buttonGroups.put(name, buttons);
+		    }
+		}
+	    }
+	}
+	return buttonGroups;
+    }
+
+    private static String parseOutNextURL(WebResponse resp) throws SAXException, IOException {
+	String text = resp.getText();
+	String toolURL = null;
+	Matcher m = MockLearner.NEXT_URL_PATTERN.matcher(text);
+	if (m.find()) {
+	    toolURL = m.group(1);
+	}
+
+	if ((toolURL != null) && !toolURL.startsWith("/")) {
+	    toolURL = '/' + toolURL;
+	}
+
+	MockLearner.log.debug("Tool URL: " + toolURL);
+	return toolURL;
+    }
+
+    private static File selectArbitraryFile(String[] filesToUpload) {
+	return new File(filesToUpload[TestUtil.generateRandomNumber(filesToUpload.length)]);
+    }
+
     public final boolean isFinished() {
 	return finished;
     }
 
     @Override
     public void run() {
-	MockLearner.log.info(username + " is studying the lesson...");
+	MockLearner.log.info(username + " is studying the lesson");
 	try {
 	    login();
 	    LearnerTest learnerTest = (LearnerTest) test;
-	    String lsId = test.getTestSuite().getMonitorTest().getLsId();
-	    String ldId = getLesson(learnerTest.getLessonURL, lsId);
-	    joinLesson(learnerTest.joinLessonURL, lsId);
-	    progressThroughActivities(learnerTest.lessonEntryURL, lsId);
+	    String lessonId = test.getTestSuite().getMonitorTest().getLsId();
+	    joinLesson(learnerTest.joinLessonURL, lessonId);
+	    progressThroughActivities(learnerTest.lessonEntryURL, lessonId);
 	    finished = true;
 	    MockLearner.log.info(username + " finished the lesson");
 	} catch (TestHarnessException e) {
@@ -149,71 +239,53 @@
 	    throw new RuntimeException(e);
 	} catch (SAXException e) {
 	    throw new RuntimeException(e);
-	} catch (JSONException e) {
-	    throw new RuntimeException(e);
 	} finally {
 	    ((LearnerTest) test).allDoneSignal.countDown();
 	}
     }
 
-    private String[] chooseArbitraryValues(String[] values) {
-	int length = 1; // + TestUtil.generateRandomIndex(values.length);
-	String[] answers = new String[length];
-	for (int i = 0; i < length; i++) {
-	    answers[i] = values[TestUtil.generateRandomNumber(values.length)];
-	}
-	return answers;
-    }
-
-    private String composeArbitraryText() {
-	int length = 1 + TestUtil.generateRandomNumber(MockLearner.ARBITRARY_TEXT_ALPHABET.length());
-	StringBuilder text = new StringBuilder(length);
-	for (int i = 0; i < length; i++) {
-	    text.append(MockLearner.ARBITRARY_TEXT_ALPHABET.charAt(TestUtil
-		    .generateRandomNumber(MockLearner.ARBITRARY_TEXT_ALPHABET.length())));
-	}
-	return text.toString();
-    }
-
     private WebForm fillFormArbitrarily(WebForm form) throws IOException, SAXException {
 	String[] params = form.getParameterNames();
-	if ((params != null) && (params.length > 0)) {
+	if (params != null) {
 	    for (String param : params) {
 		if (!form.isDisabledParameter(param) && !form.isHiddenParameter(param)
 			&& !form.isReadOnlyParameter(param)) {
 		    if (form.isTextParameter(param)) {
-			String text = composeArbitraryText();
+			String text = MockLearner.composeArbitraryText();
 			form.setParameter(param, text);
 			MockLearner.log.debug(username + " input " + text + " for form field " + param);
+
 		    } else if (form.isFileParameter(param)) {
-			File file = selectArbitraryFile(((LearnerTest) test).getFilesToUpload());
+			File file = MockLearner.selectArbitraryFile(((LearnerTest) test).getFilesToUpload());
 			form.setParameter(param, file);
 			MockLearner.log.debug(username + " uploaded file " + file.getName() + " for form field "
 				+ param);
 		    } else if (form.isMultiValuedParameter(param)) {
-			String[] values = chooseArbitraryValues(form.getOptionValues(param));
+			String[] values = MockLearner.chooseArbitraryValues(form.getOptionValues(param));
 			form.setParameter(param, values);
-			MockLearner.log.debug(username + " set " + values.length + " value(s) for form field " + param);
-			MockLearner.log.debug(values);
+			MockLearner.log.debug(username + " set " + values.length + " values for form field " + param);
+			Arrays.toString(values);
 		    } else {
 			MockLearner.log.debug(param + " may be a radio button. Current value is "
 				+ form.getParameterValue(param));
 			if (form.getParameterValue(param) == null) {
 			    String[] candidateValues = form.getOptionValues(param);
 			    if ((candidateValues != null) && (candidateValues.length > 0)) {
 				String value = candidateValues[TestUtil.generateRandomNumber(candidateValues.length)];
-				MockLearner.log.debug("Setting param to " + value);
+				MockLearner.log.debug(username + " set " + value + " for form field " + param);
 				form.setParameter(param, value);
 			    }
 			}
 		    }
 		} else {
-		    MockLearner.log.debug("disabled or hidden or readonly parameter " + param);
+		    MockLearner.log.debug("Disabled or hidden or readonly parameter " + param + " with value "
+			    + form.getParameterValue(param));
 		}
 	    }
 	}
 
-	Map<String, List<Button>> buttonGroups = groupButtonsByName(form.getButtons(), FormControl.RADIO_BUTTON_TYPE);
+	Map<String, List<Button>> buttonGroups = MockLearner.groupButtonsByName(form.getButtons(),
+		FormControl.RADIO_BUTTON_TYPE);
 	for (Map.Entry<String, List<Button>> entry : buttonGroups.entrySet()) {
 	    entry.getValue().get(TestUtil.generateRandomNumber(entry.getValue().size())).click();
 	    MockLearner.log.debug(username + " clicked a radio button " + entry.getKey());
@@ -224,6 +296,7 @@
     private WebResponse findAnAbsoluteURLOnPage(String respAsText) throws SAXException, IOException {
 	// Probably safest to get the last http address on the page, make sure we don't accidently
 	// go to http://www.w3c.org/
+
 	int index = respAsText.lastIndexOf("\"http");
 	while (index != -1) {
 	    int indexEnd = respAsText.indexOf("\"", index + 1);
@@ -232,256 +305,244 @@
 		if ((httpString.indexOf("www.w3.org") == -1) && !httpString.endsWith(".js")
 			&& !httpString.endsWith(".css")) {
 		    MockLearner.log.debug("Forwarding user " + username + " to discovered link " + httpString);
-		    return (WebResponse) new Call(wc, test, "", httpString).execute();
+		    return (WebResponse) new Call(wc, test, username + " forwarded to absolute URL", httpString)
+			    .execute();
 		}
 	    }
 	    index = index > 0 ? respAsText.lastIndexOf("\"http", index - 1) : -1;
 	}
-	throw new TestHarnessException("Unable to find a link to go to on page" + respAsText);
+	return null;
     }
 
-    private String findURLInAHREF(WebResponse resp, String linkSubstring) throws SAXException {
-	WebLink[] links = resp.getLinks();
-	if (links != null) {
-	    for (WebLink link : links) {
-		MockLearner.log.debug("Checking link " + link.getURLString());
-		if (link.getURLString().indexOf(linkSubstring) != -1) {
-		    return link.getURLString();
-		}
-	    }
+    private WebResponse handleActivity(WebResponse resp) throws SAXException, IOException {
+	// MockLearner.log.debug(resp.getText());
+
+	WebResponse nextResp = null;
+	WebForm[] forms = resp.getForms();
+	if ((forms != null) && (forms.length > 0)) {
+	    MockLearner.log.debug("There " + (forms.length == 1 ? "is " : "are ") + forms.length
+		    + (forms.length == 1 ? " form in the page " : " forms in the page"));
+	    nextResp = handlePageWithForms(resp);
+	} else {
+	    nextResp = handlePageWithoutForms(resp);
 	}
+
+	boolean isActivityFinished = (resp != null)
+		&& ((resp.getText().indexOf(MockLearner.ACTIVITY_FINISHED_FLAG) != -1) || (resp.getText().indexOf(
+			MockLearner.LESSON_FINISHED_FLAG) != -1));
+	return isActivityFinished ? nextResp : handleActivity(nextResp);
+    }
+
+    private WebResponse handleLoadToolActivity(String asText) throws SAXException, IOException {
+	Matcher m = MockLearner.NEXT_URL_PATTERN.matcher(asText);
+	if (m.find()) {
+	    String toolURL = m.group(1);
+	    return (WebResponse) new Call(wc, test, username + " forwarded to tool content page", toolURL).execute();
+	}
 	return null;
     }
 
-    private String findURLInLocationHref(WebResponse resp, String linkSubstring) throws SAXException, IOException {
-	String respAsText = resp.getText();
-	String lowercaseRespAsText = respAsText.toLowerCase();
-	int stringLength = lowercaseRespAsText.length();
-
-	int index = lowercaseRespAsText.indexOf("location.href");
-	while (index != -1) {
+    private WebResponse handlePageWithForms(WebResponse resp) throws IOException, SAXException {
+	int index = -1;
+	WebForm[] forms = resp.getForms();
+	WebForm form = null;
+	String action = null;
+	String asText = resp.getText();
+	do {
 	    index++;
-	    while ((index < stringLength)
-		    && !((lowercaseRespAsText.charAt(index) == '\'') || (lowercaseRespAsText.charAt(index) == '\"'))) {
-		index++;
+	    if (index >= forms.length) {
+		throw new TestHarnessException(username
+			+ " checked all forms on the page and does not know how to finish the activity");
 	    }
-	    if (index < (stringLength - 1)) {
-		char quote = lowercaseRespAsText.charAt(index);
-		int indexEnd = lowercaseRespAsText.indexOf(quote, index + 1);
-		String httpString = respAsText.substring(index + 1, indexEnd);
-		MockLearner.log.debug("Discovered link " + httpString);
-		if (httpString.indexOf(linkSubstring) != -1) {
-		    MockLearner.log.debug("Matched to " + linkSubstring);
-		    return httpString;
-		}
+	    form = forms[index];
+	    action = form.getAction();
+	} while ((action == null) || (action.trim().length() == 0));
+
+	// special behaviour for different flavours of activities
+	WebResponse nextResp = null;
+	while (action.startsWith(MockLearner.KNOCK_GATE_SUBSTRING)) {
+	    delay();
+	    MockLearner.log.debug(username + " knocking gate");
+	    nextResp = (WebResponse) new Call(wc, test, username + " knocks gate", form).execute();
+	    if (nextResp.getText().indexOf(MockLearner.KNOCK_GATE_SUBSTRING) == -1) {
+		return nextResp;
 	    }
-	    MockLearner.log.debug("Index was " + index);
-	    index = (index < stringLength) && (index > 0) ? lowercaseRespAsText.indexOf("location.href", index + 1)
-		    : -1;
-	    MockLearner.log.debug("New index is " + index);
 	}
-	return null;
-    }
+	if (asText.contains(MockLearner.TASK_FINISH_SUBSTRING)) {
+	    return handleToolTaskList(resp);
+	}
+	if (action.startsWith(MockLearner.CHAT_FINISH_SUBSTRING)) {
+	    handleToolChat(resp);
+	} else if (action.contains(MockLearner.QA_TOOL_SUBSTRING)) {
+	    // make QA look at "answerX__textarea" form fields rather than "answerX"
+	    form.setAttribute("action", action + "&testHarness=true");
+	} else if (action.contains(MockLearner.VIDEORECORDER_TOOL_STRING)) {
+	    // the second form should be taken into consideration
+	    form = forms[1];
+	} else if (asText.contains(MockLearner.VOTE_LEARNER_FINISHED_BUTTON_STRING)) {
+	    // this is normally done by Javascript in browser
+	    form.setAttribute("action", action + "&dispatch=learnerFinished");
+	} else if (asText.contains(MockLearner.VOTE_VIEW_ALL_RESULTS_BUTTON_STRING)) {
+	    form.setAttribute("action", action + "&dispatch=viewAllResults");
+	} else if (asText.contains(MockLearner.WIKI_EDIT_BUTTON_STRING)) {
+	    form = handleToolWiki(form, action);
+	}
 
-    private String getLesson(String getLessonURL, String lsId) throws IOException, JSONException {
-	delay();
-	String url = getLessonURL.replace(MockLearner.LESSON_ID_PATTERN, lsId);
-	WebResponse resp = (WebResponse) new Call(wc, test, username + " get lesson", url).execute();
-	JSONObject responseJson = new JSONObject(resp.getText());
+	nextResp = (WebResponse) new Call(wc, test, username + " submits tool form", fillFormArbitrarily(form))
+		.execute();
 
-	return responseJson.getString(MockLearner.LD_ID_KEY);
-    }
-
-    private Map<String, List<Button>> groupButtonsByName(Button[] btns, String buttonType) {
-	MockLearner.log.debug(btns.length);
-	Map<String, List<Button>> buttonGroups = new HashMap<String, List<Button>>();
-	if (btns != null) {
-	    for (Button btn : btns) {
-		if (buttonType.equals(btn.getType())) {
-		    String name = btn.getName();
-		    MockLearner.log.debug("Got " + buttonType + " " + name + " and its value is " + btn.getValue());
-		    if (!buttonGroups.containsKey(name)) {
-			buttonGroups.get(name).add(btn);
-		    } else {
-			List<Button> buttons = new ArrayList<Button>();
-			buttons.add(btn);
-			buttonGroups.put(name, buttons);
-		    }
-		}
+	// check if it is assessment activity
+	asText = nextResp.getText();
+	Matcher m = MockLearner.ASSESSMENT_FINISH_PATTERN.matcher(asText);
+	if (m.find()) {
+	    nextResp = (WebResponse) new Call(wc, test, username + " finishes Assessment", m.group(1)).execute();
+	} else {
+	    m = MockLearner.SUBMIT_FILES_FINISH_PATTERN.matcher(asText);
+	    if (m.find()) {
+		nextResp = (WebResponse) new Call(wc, test, username + " finishes Submit Files", m.group()).execute();
 	    }
 	}
-	return buttonGroups;
+
+	return nextResp;
     }
 
-    private WebResponse handleActivity(WebResponse resp) throws SAXException, IOException {
-	if (resp.getFrameNames().length == 2) {
-	    return handleParallelActivity(resp);
+    private WebResponse handlePageWithoutForms(WebResponse resp) throws SAXException, IOException {
+	String asText = resp.getText();
+
+	if (asText.contains(MockLearner.LOAD_TOOL_ACTIVITY_FLAG)) {
+	    return handleLoadToolActivity(asText);
 	}
 
-	if (resp.getText().indexOf("/lams/tool/laqa11/learning.do") != -1) {
-	    MockLearner.log.debug(resp.getText());
+	// special behaviour for different flavours of activities
+	if (asText.contains(MockLearner.FORUM_FINISH_SUBSTRING)) {
+	    return handleToolForum(resp);
 	}
+	if (asText.contains(MockLearner.LEADER_FINISH_SUBSTRING)) {
+	    return handleToolLeader(resp);
+	}
+	if (asText.contains(MockLearner.SCRATCHIE_FINISH_SUBSTRING)
+		|| asText.contains(MockLearner.SCRATCHIE_RESULTS_SUBSTRING)) {
+	    return handleToolScratchie(resp);
+	}
 
-	WebResponse nextResp;
-	WebForm[] forms = resp.getForms();
-	if ((forms != null) && (forms.length > 0)) {
-	    MockLearner.log.debug("There " + (forms.length == 1 ? "is " : "are ") + forms.length
-		    + (forms.length == 1 ? " form in the page " : " forms in the page"));
-	    nextResp = handlePageWithForms(forms);
-	} else {
-	    nextResp = handlePageWithoutForms(resp);
+	Matcher m = MockLearner.SHARE_RESOURCES_REDIRECT_PATTERN.matcher(asText);
+	if (m.find()) {
+	    return handleToolShareResources(resp, m.group(1));
 	}
-	boolean isActivityFinished = (resp != null)
-		&& ((resp.getText().indexOf(MockLearner.ACTIVITY_FINISHED_FLAG) != -1) || (resp.getText().indexOf(
-			MockLearner.LESSON_FINISHED_FLAG) != -1));
-	if (isActivityFinished) {
-	    return nextResp;
-	} else {
-	    return handleActivity(nextResp);
+	m = MockLearner.IMAGE_GALLERY_FINISH_PATTERN.matcher(asText);
+	if (m.find()) {
+	    return (WebResponse) new Call(wc, test, username + " finishes Image Gallery", m.group(1)).execute();
 	}
+
+	// fallback to some URL in page
+	WebResponse nextResp = findAnAbsoluteURLOnPage(asText);
+	if (nextResp == null) {
+	    String url = MockLearner.findURLInLocationHref(resp, MockLearner.FINISH_SUBSTRING);
+	    if (url == null) {
+		throw new TestHarnessException("Unable to find a link to go to on page" + asText);
+	    }
+	    nextResp = (WebResponse) new Call(wc, test, username + " forwarded to tool finish URL", url).execute();
+	}
+	return nextResp;
     }
 
-    private WebResponse handleForum(WebResponse resp) throws SAXException, IOException {
+    private void handleToolChat(WebResponse resp) throws IOException {
+	String asText = resp.getText();
+	Matcher m = MockLearner.TOOL_SESSION_ID_PATTERN.matcher(asText);
+	if (!m.find()) {
+	    MockLearner.log.debug("No TOOL_SESSION_ID found in Chat page, it's probably reflection page, carry on");
+	    return;
+	}
 
+	String url = MockLearner.CHAT_FINISH_SUBSTRING + "?dispatch=sendMessage&toolSessionID=" + m.group(1)
+		+ "&message=";
+	// send few messages
+	for (int replyIndex = 0; replyIndex < MockLearner.CHAT_REPLIES; replyIndex++) {
+	    String message = MockLearner.composeArbitraryText();
+	    message = URLEncoder.encode(message, "UTF-8");
+	    new Call(wc, test, username + " sends Chat message", url + message).execute();
+	    delay();
+	}
+    }
+
+    private WebResponse handleToolForum(WebResponse resp) throws SAXException, IOException {
 	WebResponse replyResponse = null;
 
-	String replyURL = findURLInAHREF(resp, MockLearner.FORUM_VIEW_TOPIC_SUBSTRING);
+	String replyURL = MockLearner.findURLInAHREF(resp, MockLearner.FORUM_VIEW_TOPIC_SUBSTRING);
 	if (replyURL != null) {
 	    MockLearner.log.debug("Accessing the forum view topic screen using " + replyURL);
-	    replyResponse = handleForumReply(replyURL);
+	    replyResponse = handleToolForumReply(replyURL);
 	}
 
 	if (replyResponse == null) {
-	    throw new TestHarnessException("No links found on the main forum page, or unable to do reply. "
-		    + resp.getText());
+	    MockLearner.log.debug(resp.getText());
+	    throw new TestHarnessException("No links found on the main forum page, or unable to do reply");
 	}
 
-	String finishURL = findURLInLocationHref(replyResponse, MockLearner.FORUM_FINISH_SUBSTRING);
-	if (finishURL != null) {
-	    MockLearner.log.debug("Ending forum using url " + finishURL);
-	    return (WebResponse) new Call(wc, test, "Finish Forum", finishURL).execute();
+	String finishURL = MockLearner.findURLInLocationHref(replyResponse, MockLearner.FORUM_FINISH_SUBSTRING);
+	if (finishURL == null) {
+	    MockLearner.log.debug(replyResponse.getText());
+	    throw new TestHarnessException("Unable to finish the forum. No finish link found");
 	}
 
-	throw new TestHarnessException("Unable to finish the forum. No finish link found. " + replyResponse.getText());
+	MockLearner.log.debug("Ending forum using url " + finishURL);
+	return (WebResponse) new Call(wc, test, "Finish Forum", finishURL).execute();
     }
 
-    /**
-     * @param link
-     * @return
-     * @throws SAXException
-     * @throws IOException
-     */
-    private WebResponse handleForumReply(String url) throws SAXException, IOException {
-	WebResponse resp = (WebResponse) new Call(wc, test, "View Topic Forum", url).execute();
-	String replyURL = findURLInAHREF(resp, MockLearner.FORUM_REPLY_SUBSTRING);
-	if (replyURL != null) {
-	    resp = (WebResponse) new Call(wc, test, "Reply Topic Forum", replyURL).execute();
-	    WebForm[] forms = resp.getForms();
-	    if ((forms != null) && (forms.length > 0)) {
-		resp = handlePageWithForms(forms);
-	    } else {
-		throw new TestHarnessException("No form found on the reply topic page - unable to do reply. "
-			+ resp.getText());
-	    }
-	} else {
-	    throw new TestHarnessException("No reply URL found - unable to do reply. " + resp.getText());
-	    // log.info("No reply URL found - unable to do reply. "+resp.getText());
+    private WebResponse handleToolForumReply(String url) throws SAXException, IOException {
+	WebResponse resp = (WebResponse) new Call(wc, test, username + " views Forum topic", url).execute();
+	String replyURL = MockLearner.findURLInAHREF(resp, MockLearner.FORUM_REPLY_SUBSTRING);
+	if (replyURL == null) {
+	    MockLearner.log.debug(resp.getText());
+	    throw new TestHarnessException("No reply URL found - unable to do reply. ");
 	}
 
+	resp = (WebResponse) new Call(wc, test, username + " replies to Forum topic", replyURL).execute();
+	WebForm[] forms = resp.getForms();
+	if ((forms == null) || (forms.length == 0)) {
+	    MockLearner.log.debug(resp.getText());
+	    throw new TestHarnessException("No form found on the reply topic page - unable to do reply");
+	}
+	// skip validation and make Forum read "message.body__textarea" instead of Javascript controlled "message.bod"
+	WebForm form = resp.getForms()[0];
+	String action = form.getAction() + "?testHarness=true";
+	form.setAttribute("action", action);
+
+	resp = handlePageWithForms(resp);
+
 	// now we are back on the topic page, so go back to the main forum page.
-	String returnToForumURL = findURLInAHREF(resp, MockLearner.FORUM_VIEW_FORUM_SUBSTRING);
-	if (returnToForumURL != null) {
-	    MockLearner.log.debug("Returning to forum page " + returnToForumURL);
-	    return (WebResponse) new Call(wc, test, "Return to Forum", returnToForumURL).execute();
+	String returnToForumURL = MockLearner.findURLInAHREF(resp, MockLearner.FORUM_VIEW_FORUM_SUBSTRING);
+	if (returnToForumURL == null) {
+	    MockLearner.log.debug(resp.getText());
+	    throw new TestHarnessException("No button back to forum page found - stuck while doing reply");
 	}
-	throw new TestHarnessException("No button back to forum page found - stuck while doing reply. "
-		+ resp.getText());
+
+	MockLearner.log.debug("Returning to forum page " + returnToForumURL);
+	return (WebResponse) new Call(wc, test, username + " returns to Forum", returnToForumURL).execute();
     }
 
-    private WebResponse handleLeader(WebResponse resp) throws SAXException, IOException {
+    private WebResponse handleToolLeader(WebResponse resp) throws SAXException, IOException {
 	String asText = resp.getText();
 	Matcher m = MockLearner.LEADER_BECOME_PATTERN.matcher(asText);
 	if (m.find()) {
 	    String becomeLeaderQueryOptions = m.group();
 	    String url = "/lams/tool/lalead11/learning.do?" + becomeLeaderQueryOptions;
 	    MockLearner.log.debug("Becoming a leader using link: " + url);
-	    new Call(wc, test, "Become Leader", url).execute();
+	    new Call(wc, test, username + " becomes Leader", url).execute();
 	}
 
-	String finishURL = findURLInLocationHref(resp, MockLearner.LEADER_FINISH_SUBSTRING);
-	if (finishURL != null) {
-	    MockLearner.log.debug("Ending leader using url " + finishURL);
-	    return (WebResponse) new Call(wc, test, "Finish Leader", finishURL).execute();
+	String finishURL = MockLearner.findURLInLocationHref(resp, MockLearner.LEADER_FINISH_SUBSTRING);
+	if (finishURL == null) {
+	    throw new TestHarnessException("Unable to finish the leader, no finish link found. " + asText);
 	}
 
-	throw new TestHarnessException("Unable to finish the leader, no finish link found. " + asText);
+	MockLearner.log.debug("Ending leader using url " + finishURL);
+	return (WebResponse) new Call(wc, test, username + " finishes Leader", finishURL).execute();
     }
 
-    private WebResponse handleLoadToolActivity(String asText) throws SAXException, IOException {
-
-	String toolURL = TestUtil.extractString(asText, MockLearner.NEXT_URL_START_FLAG, MockLearner.NEXT_URL_END_FLAG);
-	return (WebResponse) new Call(wc, test, "Redirect to tool page", toolURL).execute();
-    }
-
-    private WebResponse handlePageWithForms(WebForm[] forms) throws IOException, SAXException {
-	int index = 0;
-	WebForm form = forms[index];
-	while ((form.getAction() == null) || (form.getAction().trim().length() == 0)) {
-	    index++;
-	    if (index >= forms.length) {
-		throw new TestHarnessException(username + " don't know how to finish the activity now");
-	    }
-	    form = forms[index];
-	}
-
-	WebResponse resp = null;
-	while (form.getAction().startsWith(MockLearner.KNOCK_GATE_SUBSTRING)) {
-	    delay();
-	    MockLearner.log.debug("Knocking gate");
-	    resp = (WebResponse) new Call(wc, test, "Knock Gate", form).execute();
-	    if (resp.getText().indexOf(MockLearner.KNOCK_GATE_SUBSTRING) == -1) {
-		return resp;
-	    }
-	}
-
-	resp = (WebResponse) new Call(wc, test, "", fillFormArbitrarily(form)).execute();
-
-	// check if it is assessment activity
+    private WebResponse handleToolScratchie(WebResponse resp) throws SAXException, IOException {
 	String asText = resp.getText();
-	Matcher m = MockLearner.ASSESSMENT_FINISH_PATTERN.matcher(asText);
-	if (m.find()) {
-	    resp = (WebResponse) new Call(wc, test, "", m.group(1)).execute();
-	}
-
-	return resp;
-    }
-
-    private WebResponse handlePageWithoutForms(WebResponse resp) throws SAXException, IOException {
-
-	String asText = resp.getText();
-
-	// Is this a Forum activity?
-	if (asText.indexOf(MockLearner.FORUM_FINISH_SUBSTRING) != -1) {
-	    return handleForum(resp);
-	} else if (asText.indexOf(MockLearner.LEADER_FINISH_SUBSTRING) != -1) {
-	    return handleLeader(resp);
-	} else if (asText.contains(MockLearner.SCRATCHIE_FINISH_SUBSTRING)
-		|| asText.contains(MockLearner.SCRATCHIE_RESULTS_SUBSTRING)) {
-	    return handleScratchie(resp);
-	} else if (asText.indexOf(MockLearner.LOAD_TOOL_ACTIVITY_SUBSTRING) != -1) {
-	    return handleLoadToolActivity(asText);
-	} else {
-	    return findAnAbsoluteURLOnPage(asText);
-	}
-    }
-
-    private WebResponse handleParallelActivity(WebResponse resp) {
-	// TODO implement me
-	throw new TestHarnessException("Unable to handle parallel activities.");
-    }
-
-    private WebResponse handleScratchie(WebResponse resp) throws SAXException, IOException {
-	String asText = resp.getText();
+	// check if current user is the leader
 	boolean isLeader = asText.contains(MockLearner.SCRATCHIE_IS_LEADER_SUBSTRING);
 	String sessionMapID = null;
 	String recordScratchedURL = null;
@@ -497,6 +558,7 @@
 	}
 
 	if (isLeader) {
+	    // find all answers on the page
 	    m = MockLearner.SCRATCHIE_SCRATCH_PATTERN.matcher(asText);
 	    Map<Long, List<Long>> uids = new TreeMap<Long, List<Long>>();
 	    while (m.find()) {
@@ -512,6 +574,7 @@
 	    String scratchURL = "/lams/tool/lascrt11/learning/isAnswerCorrect.do?answerUid=";
 	    Random generator = new Random();
 
+	    // start scratching random answers
 	    while (!uids.isEmpty()) {
 		Long questionID = uids.keySet().iterator().next();
 		List<Long> answerUids = uids.get(questionID);
@@ -520,15 +583,16 @@
 		Long answerUid = answerUids.get(index);
 		answerUids.remove(index);
 		MockLearner.log.debug("Scratching answer UID " + answerUid + " for question " + questionID);
-		WebResponse scratchResponse = (WebResponse) new Call(wc, test, "Scratch response", scratchURL
-			+ answerUid).execute();
+		WebResponse scratchResponse = (WebResponse) new Call(wc, test,
+			username + " checks answer in Scratchie", scratchURL + answerUid).execute();
 		boolean answerCorrect = scratchResponse.getText().indexOf("true") != -1;
 		MockLearner.log.debug("Scratched answer UID " + answerUid + " for question " + questionID
 			+ " and it was " + (answerCorrect ? "correct" : "incorrect"));
 
 		if (recordScratchedURL != null) {
 		    MockLearner.log.debug("Recording scratched answer UID " + answerUid);
-		    new Call(wc, test, "Record answer scratched", recordScratchedURL + answerUid).execute();
+		    new Call(wc, test, username + " records answer in Scratchie", recordScratchedURL + answerUid)
+			    .execute();
 		}
 
 		if (answerCorrect) {
@@ -549,34 +613,79 @@
 		    MockLearner.log.error("Interrupted waiting between question list refresh in scratchie");
 		}
 		String url = resp.getURL().toString() + "&reqId=" + System.currentTimeMillis();
-		WebResponse questionRefreshResp = (WebResponse) new Call(wc, test, "Scratchie refresh question list",
-			refreshQuestionsURL).execute();
+		WebResponse questionRefreshResp = (WebResponse) new Call(wc, test, username
+			+ " refreshes Scratchie question list", refreshQuestionsURL).execute();
 		asText = questionRefreshResp.getText();
 	    }
 	}
 
-	String reflectionURL = findURLInLocationHref(resp, MockLearner.SCRATCHIE_REFLECTION_SUBSTRING);
+	String reflectionURL = MockLearner.findURLInLocationHref(resp, MockLearner.SCRATCHIE_REFLECTION_SUBSTRING);
 	if (reflectionURL != null) {
 	    MockLearner.log.debug("Showing reflection of scratchie using url " + reflectionURL);
-	    resp = (WebResponse) new Call(wc, test, "Scratchie show reflection", reflectionURL).execute();
-	    resp = handlePageWithForms(resp.getForms());
+	    resp = (WebResponse) new Call(wc, test, username + " gets Scratchie reflection", reflectionURL).execute();
+	    resp = handlePageWithForms(resp);
 	}
 
-	String resultsURL = findURLInLocationHref(resp, MockLearner.SCRATCHIE_RESULTS_SUBSTRING);
+	String resultsURL = MockLearner.findURLInLocationHref(resp, MockLearner.SCRATCHIE_RESULTS_SUBSTRING);
 	if (resultsURL != null) {
 	    MockLearner.log.debug("Showing results of scratchie using url " + resultsURL);
-	    resp = (WebResponse) new Call(wc, test, "Scratchie show results", resultsURL).execute();
+	    resp = (WebResponse) new Call(wc, test, username + " gets Scratchie results", resultsURL).execute();
 	}
 
-	String finishURL = findURLInLocationHref(resp, MockLearner.SCRATCHIE_FINISH_SUBSTRING);
+	String finishURL = MockLearner.findURLInLocationHref(resp, MockLearner.SCRATCHIE_FINISH_SUBSTRING);
 	if (finishURL != null) {
 	    MockLearner.log.debug("Ending scratchie using url " + finishURL);
-	    return (WebResponse) new Call(wc, test, "Finish scratchie", finishURL).execute();
+	    return (WebResponse) new Call(wc, test, username + " finishes Scratchie", finishURL).execute();
 	}
 
 	throw new TestHarnessException("Unable to finish the scratchie, no finish link found. " + asText);
     }
 
+    private WebResponse handleToolShareResources(WebResponse resp, String initialRedirectLink) throws IOException,
+	    SAXException {
+	WebResponse nextResponse = (WebResponse) new Call(wc, test, username + " forwarded to Share Resources",
+		initialRedirectLink).execute();
+	String asText = nextResponse.getText();
+	Matcher m = MockLearner.SHARE_RESOURCES_VIEW_ITEM_URL_PATTERH.matcher(asText);
+	if (!m.find()) {
+	    throw new TestHarnessException("View Item URL in Share Resources tool not found");
+	}
+	String viewItemURL = m.group(1);
+	m = MockLearner.SHARE_RESOURCES_VIEW_ITEM_PATTERN.matcher(asText);
+	while (m.find()) {
+	    new Call(wc, test, username + " views Share Resources item", viewItemURL + m.group(1)).execute();
+	    delay();
+	}
+
+	String finishURL = MockLearner.findURLInLocationHref(nextResponse, MockLearner.FINISH_SUBSTRING);
+	return (WebResponse) new Call(wc, test, username + " finishes Share Resources", finishURL).execute();
+    }
+
+    private WebResponse handleToolTaskList(WebResponse resp) throws IOException, SAXException {
+	String finishURL = MockLearner.findURLInLocationHref(resp, MockLearner.TASK_FINISH_SUBSTRING);
+	WebForm[] forms = resp.getForms();
+	// send a comment or a file, if available
+	if (forms.length > 0) {
+	    WebForm form = forms[TestUtil.generateRandomNumber(forms.length)];
+	    resp = (WebResponse) new Call(wc, test, username + " adds a comment or file in Task List",
+		    fillFormArbitrarily(form)).execute();
+	    delay();
+	}
+
+	return (WebResponse) new Call(wc, test, username + " finishes Task List", finishURL).execute();
+    }
+
+    private WebForm handleToolWiki(WebForm form, String action) throws IOException, SAXException {
+	// add one random page...
+	form.setAttribute("action", action + "?dispatch=addPage");
+	WebResponse nextResp = (WebResponse) new Call(wc, test, username + " adds Wiki page", fillFormArbitrarily(form))
+		.execute();
+	form = nextResp.getForms()[1];
+	// ...and mark the activity to be finished
+	form.setAttribute("action", action + "?dispatch=finishActivity");
+	return form;
+    }
+
     private void joinLesson(String joinLessonURL, String lsId) {
 	delay();
 	String url = joinLessonURL.replace(MockLearner.LESSON_ID_PATTERN, lsId);
@@ -586,36 +695,14 @@
 	}
 	MockLearner.log.info("Users joining lesson: " + MockLearner.joinLessonUserCount + ". Top: "
 		+ MockLearner.topJoinLessonUserCount);
-	new Call(wc, test, username + " join lesson", url).execute();
+	new Call(wc, test, username + " joins lesson", url).execute();
 	MockLearner.joinLessonUserCount--;
     }
 
-    private String parseOutNextURL(WebResponse resp) throws SAXException, IOException {
-	String text = resp.getText();
-	String toolURL = TestUtil.extractString(text, MockLearner.NEXT_URL_START_FLAG, MockLearner.NEXT_URL_END_FLAG);
-
-	if ((toolURL != null) && !toolURL.startsWith("/")) {
-	    toolURL = '/' + toolURL;
-	}
-
-	MockLearner.log.debug("toolURL:" + toolURL);
-	return toolURL;
-    }
-
-    private String processButtons(Button[] buttons) {
-	StringBuffer buf = new StringBuffer(100);
-	for (Button button : buttons) {
-	    buf.append(button.toString());
-	    buf.append("; ");
-	}
-	return buf.toString();
-    }
-
     /**
      * Steps:
      * <ol>
      * <li>fetch entry url</li>
-     * <li>get passon.swf url and the next activity url</li>
      * <li>fetch the next activity url and get activity page with form</li>
      * <li>fill the form and submit it
      * <li>
@@ -635,41 +722,28 @@
 	delay();
 	WebResponse resp = (WebResponse) new Call(wc, test, username + " enters lesson", lessonEntryURL.replace(
 		MockLearner.LESSON_ID_PATTERN, lsId)).execute();
-	String nextURL = parseOutNextURL(resp);
+	String nextURL = MockLearner.parseOutNextURL(resp);
 	boolean lessonFinished = false;
 	while (!lessonFinished) {
-	    if (nextURL != null) {
-		resp = takeActivity(nextURL);
-		nextURL = parseOutNextURL(resp);
-	    } else {
-		boolean isOptionalActivity = resp.getText().indexOf(MockLearner.OPTIONAL_ACTIVITY_FLAG) != -1;
+	    if (nextURL == null) {
+		boolean isOptionalActivity = resp.getText().contains(MockLearner.OPTIONAL_ACTIVITY_FLAG);
 		if (isOptionalActivity) {
 		    resp = handleActivity(resp);
-		    nextURL = parseOutNextURL(resp);
+		    nextURL = MockLearner.parseOutNextURL(resp);
 		} else {
 		    lessonFinished = true;
 		}
+	    } else {
+		try {
+		    resp = (WebResponse) new Call(wc, test, username + " forwarded to next activity", nextURL)
+			    .execute();
+		    delay();
+		    resp = handleActivity(resp);
+		} catch (Exception e) {
+		    throw new TestHarnessException(e);
+		}
+		nextURL = MockLearner.parseOutNextURL(resp);
 	    }
 	}
     }
-
-    private File selectArbitraryFile(String[] filesToUpload) {
-	return new File(filesToUpload[TestUtil.generateRandomNumber(filesToUpload.length)]);
-    }
-
-    /**
-     * Retrieve the toolURL and play with it
-     * 
-     * @param toolURL
-     * @return WebResponse
-     */
-    private WebResponse takeActivity(String toolURL) {
-	try {
-	    WebResponse resp = (WebResponse) new Call(wc, test, "", toolURL).execute();
-	    delay();
-	    return handleActivity(resp);
-	} catch (Exception e) {
-	    throw new TestHarnessException(e);
-	}
-    }
 }
\ No newline at end of file
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MockMonitor.java
===================================================================
diff -u -r044d2c0977e88053366db9cecba68192a6cebe5a -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MockMonitor.java	(.../MockMonitor.java)	(revision 044d2c0977e88053366db9cecba68192a6cebe5a)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MockMonitor.java	(.../MockMonitor.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -25,7 +25,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URLEncoder;
 import java.util.concurrent.CountDownLatch;
 
 import org.apache.log4j.Logger;
@@ -61,14 +60,8 @@
 
     private static final String ORGANISATION_ID_PATTERN = "%orgId%";
 
-    private static final String LESSON_ID_KEY = "messageValue";
-
     private static final String LESSON_CREATED_FLAG = "true";
 
-    private static final String MESSAGE_VALUE_KEY = "messageValue";
-
-    private static final String LD_ID_KEY = "learningDesignID";
-
     private CountDownLatch stopSignal = null;
 
     /**
@@ -95,16 +88,14 @@
 	    }
 	    bodyBuilder.append("&monitors=").append(test.getTestSuite().getMonitorTest().getUsers()[0].getUserId());
 
-	    String body = URLEncoder.encode(bodyBuilder.toString(), "UTF-8");
-	    InputStream is = new ByteArrayInputStream(body.getBytes("UTF-8"));
-	    new Call(wc, test, "Create Lesson Class", url, is).execute();
+	    InputStream is = new ByteArrayInputStream(bodyBuilder.toString().getBytes("UTF-8"));
+	    new Call(wc, test, username + " creates lesson class", url, is).execute();
 	    MockMonitor.log.info(username + " set the lesson class");
 	} catch (IOException e) {
 	    throw new RuntimeException(e);
 	}
     }
 
-    @SuppressWarnings("rawtypes")
     public String initLesson(String initLessonURL, String ldId, String organisationID, String userId, String name) {
 	try {
 	    if (userId == null) {
@@ -116,7 +107,7 @@
 	    String url = initLessonURL.replace(MockMonitor.LDID_PATTERN, ldId)
 		    .replace(MockMonitor.ORGANISATION_ID_PATTERN, organisationID)
 		    .replace(MockMonitor.USER_ID_PATTERN, userId).replace(MockMonitor.LESSON_NAME_PATTERN, name);
-	    WebResponse resp = (WebResponse) new Call(wc, test, "Init Lesson", url).execute();
+	    WebResponse resp = (WebResponse) new Call(wc, test, username + " inits lesson", url).execute();
 
 	    String idAsString = resp.getText().trim();
 	    MockMonitor.log.info(username + " initialized the lesson " + name + " and the id is " + idAsString);
@@ -129,14 +120,13 @@
     @Override
     public void run() {
 	try {
-	    MockMonitor.log.info(username + " is monitoring...");
+	    MockMonitor.log.info(username + " is monitoring");
 	    MonitorTest monitorTest = (MonitorTest) test;
 
 	    while (stopSignal == null) {
 		delay();
-		MockMonitor.log.info(username + " is refreshing all learners progress");
+		MockMonitor.log.debug(username + " is refreshing all learners progress");
 		getAllLearnersProgress(monitorTest.getGetAllLearnersProgressURL(), monitorTest.getLsId());
-		MockMonitor.log.info(username + " got the latest learners progress");
 	    }
 	    MockMonitor.log.info(username + " stopped monitoring");
 	    stopSignal.countDown();
@@ -153,7 +143,7 @@
 	try {
 	    String url = startLessonURL.replace(MockMonitor.LESSON_ID_PATTERN, lsId).replace(
 		    MockMonitor.USER_ID_PATTERN, userId);
-	    WebResponse resp = (WebResponse) new Call(wc, test, "Start Lesson", url).execute();
+	    WebResponse resp = (WebResponse) new Call(wc, test, username + " starts Lesson", url).execute();
 	    if (!MockUser.checkPageContains(resp, MockMonitor.LESSON_CREATED_FLAG)) {
 		MockMonitor.log.debug(resp.getText());
 		throw new TestHarnessException(username + " failed to create lesson with the url " + url);
@@ -165,6 +155,7 @@
     }
 
     private void getAllLearnersProgress(String getAllLearnersProgressURL, String lsId) throws IOException {
+	// it gets some redundant information, but reflects what Monitor would be doing in his interface
 	String url = getAllLearnersProgressURL.replace(MockMonitor.LESSON_ID_PATTERN, lsId);
 	WebResponse resp = (WebResponse) new Call(wc, test, username + " get all learners progress", url).execute();
 	MockMonitor.log.debug("Learner progress: " + resp.getText());
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java
===================================================================
diff -u -r41955af92f3e17f2f11c07d94ae1a5f92b0d998f -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java	(.../MonitorTest.java)	(revision 41955af92f3e17f2f11c07d94ae1a5f92b0d998f)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java	(.../MonitorTest.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -43,9 +43,6 @@
     private String initLessonURL;
     private String createLessonClassURL;
     private String startLessonURL;
-    private String getLessonDetailsURL;
-    private String getContributeActivitiesURL;
-    private String getLearningDesignDetailsURL;
     private String getAllLearnersProgressURL;
     private String lessonName;
     private String lsId;
@@ -55,17 +52,13 @@
      * MonitorTest Construtor
      * 
      */
-    public MonitorTest(String testName,
-	    Integer minDelay, Integer maxDelay, String initLessonURL, String createLessonClassURL,
-	    String startLessonURL, String getLessonDetailsURL, String getContributeActivitiesURL,
-	    String getLearningDesignDetailsURL, String getAllLearnersProgressURL, String lessonName, String lsId) {
+    public MonitorTest(String testName, Integer minDelay, Integer maxDelay, String initLessonURL,
+	    String createLessonClassURL, String startLessonURL, String getAllLearnersProgressURL, String lessonName,
+	    String lsId) {
 	super(testName, minDelay, maxDelay);
 	this.initLessonURL = initLessonURL;
 	this.createLessonClassURL = createLessonClassURL;
 	this.startLessonURL = startLessonURL;
-	this.getLessonDetailsURL = getLessonDetailsURL;
-	this.getContributeActivitiesURL = getContributeActivitiesURL;
-	this.getLearningDesignDetailsURL = getLearningDesignDetailsURL;
 	this.getAllLearnersProgressURL = getAllLearnersProgressURL;
 	this.lessonName = lessonName == null ? TestUtil.buildName(testName, MonitorTest.DEFAULT_LESSON_NAME) : TestUtil
 		.buildName(testName, lessonName);
@@ -131,16 +124,4 @@
     public final String getGetAllLearnersProgressURL() {
 	return getAllLearnersProgressURL;
     }
-
-    public final String getGetContributeActivitiesURL() {
-	return getContributeActivitiesURL;
-    }
-
-    public final String getGetLearningDesignDetailsURL() {
-	return getLearningDesignDetailsURL;
-    }
-
-    public final String getGetLessonDetailsURL() {
-	return getLessonDetailsURL;
-    }
 }
\ No newline at end of file
Index: lams_build/lib/lams/lams-contentrepository.jar
===================================================================
diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: lams_build/lib/lams/lams-monitoring.jar
===================================================================
diff -u -rb4325ec051bf24b10f4c98560b8105e2e79229e7 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
Binary files differ
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision c135649b64e98c9233da20bdcfb7689598116314)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -426,21 +426,6 @@
      */
     public String getLearningDesignDetails(Long lessonID) throws IOException;
     
-    /**
-     * This method returns the progress information of all learners in a given Lesson.
-     * 
-     * @param lessonID
-     *            The lesson_id of the Lesson whose progress information is required
-     * @param learnerID
-     *            The learner_id of the class learner whose progress information is required If null, provide all
-     *            learner's progress information.
-     * @param userID
-     *            The user id of the user requesting the progress details
-     * @return String The requested information in wddx format
-     * @throws IOException
-     */
-    public String getAllCompletedActivities(Long lessonID, Long learnerID, Integer userID) throws IOException;
-
     public List<ContributeActivityDTO> getAllContributeActivityDTO(Long lessonID);
 
     /**
@@ -761,6 +746,4 @@
      */
     public int cloneLessons(String[] lessonIds, Boolean addAllStaff, Boolean addAllLearners, String[] staffIds,
 	    String[] learnerIds, Organisation group) throws MonitoringServiceException;
-    
-    public String getAllLearnersProgress(Long lessonID, Integer userID, Boolean completedDataOnly) throws IOException;
-}
+}
\ No newline at end of file
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision c135649b64e98c9233da20bdcfb7689598116314)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -1935,63 +1935,6 @@
     }
 
     /**
-     * (non-Javadoc)
-     * 
-     * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllLearnersProgress(java.lang.Long,
-     *      java.lang.Integer)
-     */
-    @Override
-    public String getAllLearnersProgress(Long lessonID, Integer userID, Boolean completedDataOnly) throws IOException {
-	Lesson lesson = lessonDAO.getLesson(lessonID);
-	FlashMessage flashMessage;
-
-	if (lesson != null) {
-	    checkOwnerOrStaffMember(userID, lesson, "get all learners progress");
-	    Vector progressData = new Vector();
-	    Iterator iterator = lesson.getLearnerProgresses().iterator();
-	    while (iterator.hasNext()) {
-		LearnerProgress learnerProgress = (LearnerProgress) iterator.next();
-		if (!completedDataOnly) {
-		    progressData.add(learnerProgress.getLearnerProgressData());
-		} else {
-		    progressData.add(learnerProgress.getLearnerProgressCompletedData());
-		}
-	    }
-	    flashMessage = (!completedDataOnly) ? new FlashMessage("getAllLearnersProgress", progressData)
-		    : new FlashMessage("getAllCompletedActivities", progressData);
-	} else {
-	    flashMessage = new FlashMessage("getAllLearnersProgress", messageService.getMessage("NO.SUCH.LESSON",
-		    new Object[] { lessonID }), FlashMessage.ERROR);
-	}
-	return flashMessage.serializeMessage();
-    }
-
-    @Override
-    public String getAllCompletedActivities(Long lessonID, Long learnerID, Integer userID) throws IOException {
-	Lesson lesson = lessonDAO.getLesson(lessonID);
-	FlashMessage flashMessage;
-
-	if (lesson != null) {
-	    checkOwnerOrStaffMember(userID, lesson, "get all learners progress");
-	    Vector progressData = new Vector();
-
-	    if (learnerID != null) {
-		LearnerProgress learnerProgress = learnerService.getProgress(new Integer(learnerID.intValue()),
-			lessonID);
-		progressData.add(learnerProgress.getLearnerProgressCompletedData());
-		flashMessage = new FlashMessage("getAllCompletedActivities", progressData);
-	    } else {
-		return getAllLearnersProgress(lessonID, userID, true);
-	    }
-
-	} else {
-	    flashMessage = new FlashMessage("getAllCompletedActivities", messageService.getMessage("NO.SUCH.LESSON",
-		    new Object[] { lessonID }), FlashMessage.ERROR);
-	}
-	return flashMessage.serializeMessage();
-    }
-
-    /**
      * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getActivityById(Long, Class)
      */
     @Override
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision c135649b64e98c9233da20bdcfb7689598116314)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -55,7 +55,6 @@
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.learning.web.bean.ActivityURL;
 import org.lamsfoundation.lams.learningdesign.Activity;
-import org.lamsfoundation.lams.learningdesign.ContributionTypes;
 import org.lamsfoundation.lams.learningdesign.exception.LearningDesignException;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
@@ -91,9 +90,6 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 /**
  * <p>
  * The action servlet that provide all the monitoring functionalities. It interact with the teacher via flash and JSP
@@ -740,40 +736,6 @@
 	return null;
     }
 
-    public ActionForward getAllCompletedActivities(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
-
-	String wddxPacket;
-	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet()
-		.getServletContext());
-	try {
-	    Long lessonID = WebUtil.readLongParam(request, "lessonID", false);
-	    Long learnerID = WebUtil.readLongParam(request, "learnerID", true);
-	    wddxPacket = monitoringService.getAllCompletedActivities(lessonID, learnerID, getUserId());
-
-	} catch (Exception e) {
-	    wddxPacket = handleException(e, "getAllLearnersProgress", monitoringService).serializeMessage();
-	}
-
-	PrintWriter writer = response.getWriter();
-	writer.println(wddxPacket);
-	return null;
-
-    }
-
-    public ActionForward getAllContributeActivities(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
-	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet()
-		.getServletContext());
-	Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
-	List<ContributeActivityDTO> contributeActivities = monitoringService.getAllContributeActivityDTO(lessonID);
-
-	response.setContentType("application/json;charset=utf-8");
-	Gson gson = new GsonBuilder().create();
-	gson.toJson(contributeActivities, response.getWriter());
-	return null;
-    }
-
     /**
      * Calls the server to bring up the learner progress page. Assumes destination is a new window. The userid that
      * comes from Flash is the user id of the learner for which we are calculating the url. This is different to all the
@@ -945,24 +907,6 @@
 	return null;
     }
 
-    /** Get the learner progress data for all learners in a lesson. This is called by the sequence tab in monitoring */
-    public ActionForward getAllLearnersProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
-	String wddxPacket;
-	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet()
-		.getServletContext());
-	try {
-	    Long lessonID = WebUtil.readLongParam(request, "lessonID", false);
-	    wddxPacket = monitoringService.getAllLearnersProgress(lessonID, getUserId(), false);
-	} catch (Exception e) {
-	    wddxPacket = handleException(e, "getAllLearnersProgress", monitoringService).serializeMessage();
-	}
-
-	PrintWriter writer = response.getWriter();
-	writer.println(wddxPacket);
-	return null;
-    }
-
     /**
      * Produces necessary data for learner progress bar.
      */
@@ -1008,7 +952,7 @@
     /**
      * Produces data to update Lesson tab in Monitor.
      */
-    public ActionForward getLessonDetailsJSON(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    public ActionForward getLessonDetails(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, JSONException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r94d0394d34137a78c2f75a8cf090245f2598969e -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 94d0394d34137a78c2f75a8cf090245f2598969e)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -327,7 +327,7 @@
 		url : LAMS_URL + 'monitoring/monitoring.do',
 		cache : false,
 		data : {
-			'method'    : 'getLessonDetailsJSON',
+			'method'    : 'getLessonDetails',
 			'lessonID'  : lessonId
 		},
 		
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 6d674e346dea6ce7a824366c8a7c315660677744)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -657,6 +657,10 @@
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	Message message = messageForm.getMessage();
+	boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness"));
+	if (isTestHarness) {
+	    message.setBody(request.getParameter("message.body__textarea"));
+	}
 	message.setIsAuthored(false);
 	message.setCreated(new Date());
 	message.setUpdated(new Date());
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
===================================================================
diff -u -r8ba1cfa3477c5f3ad8a3064db149742d82e8d949 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 8ba1cfa3477c5f3ad8a3064db149742d82e8d949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -21,12 +21,11 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.forum.web.forms;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.poi.util.StringUtil;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
@@ -38,138 +37,141 @@
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 
 /**
- *
- * 	Message Form.
- *	@struts.form name="messageForm"
- *
- * User: conradb
- * Date: 10/06/2005
- * Time: 15:44:47
+ * 
+ * Message Form.
+ * 
+ * @struts.form name="messageForm"
+ * 
+ *              User: conradb Date: 10/06/2005 Time: 15:44:47
  */
 public class MessageForm extends ValidatorForm {
-	private static final long serialVersionUID = -9054365604649146734L;
-	private static Logger logger = Logger.getLogger(MessageForm.class.getName());
-	
+    private static final long serialVersionUID = -9054365604649146734L;
+    private static Logger logger = Logger.getLogger(MessageForm.class.getName());
+
     protected Message message;
     protected String sessionMapID;
     protected Long forumId;
     protected Long parentId;
     protected Long topicId;
-    
+
     private boolean hasAttachment;
-    //attachment file name
+    // attachment file name
     private String attachmentName;
-    //Message attachment file
+    // Message attachment file
     private FormFile attachmentFile;
-    
+
     public MessageForm() {
-    	message = new Message();
+	message = new Message();
     }
+
     /**
      * MessageForm validation method from STRUCT interface.
      * 
      */
-    public ActionErrors validate(ActionMapping mapping,
-                                 javax.servlet.http.HttpServletRequest request) {
-        ActionErrors errors = new ActionErrors(); 
-        try{
-            if (StringUtils.isBlank(message.getSubject())) {
-               ActionMessage error = new ActionMessage("error.subject.required");
-               errors.add("message.subject", error);
-            }
-            if (StringUtils.isBlank(message.getBody())) {
-            	ActionMessage error = new ActionMessage("error.body.required");
-            	errors.add("message.body", error);
-            }
-            
-            
-//          validate item size
-            boolean largeFile = true;
-            if(request.getRequestURI().indexOf("/learning/") != -1){
-            	if(this.getAttachmentFile() != null && FileUtil.isExecutableFile(this.getAttachmentFile().getFileName())){
-                	ActionMessage error = new ActionMessage("error.attachment.executable");
-                	errors.add("message.attachment", error);
-            	}
-            	largeFile = false;
-            }
-            
-			FileValidatorUtil.validateFileSize(this.getAttachmentFile(), largeFile,"message.attachment", errors );
-			
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-        return errors;
+    @Override
+    public ActionErrors validate(ActionMapping mapping, javax.servlet.http.HttpServletRequest request) {
+	ActionErrors errors = new ActionErrors();
+	try {
+	    if (StringUtils.isBlank(message.getSubject())) {
+		ActionMessage error = new ActionMessage("error.subject.required");
+		errors.add("message.subject", error);
+	    }
+	    boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness"));
+	    if (!isTestHarness && StringUtils.isBlank(message.getBody())) {
+		ActionMessage error = new ActionMessage("error.body.required");
+		errors.add("message.body", error);
+	    }
+
+	    // validate item size
+	    boolean largeFile = true;
+	    if (request.getRequestURI().indexOf("/learning/") != -1) {
+		if ((this.getAttachmentFile() != null)
+			&& FileUtil.isExecutableFile(this.getAttachmentFile().getFileName())) {
+		    ActionMessage error = new ActionMessage("error.attachment.executable");
+		    errors.add("message.attachment", error);
+		}
+		largeFile = false;
+	    }
+
+	    FileValidatorUtil.validateFileSize(this.getAttachmentFile(), largeFile, "message.attachment", errors);
+
+	} catch (Exception e) {
+	    MessageForm.logger.error("", e);
+	}
+	return errors;
     }
-    
-    //-------------------------get/set methods----------------
+
+    // -------------------------get/set methods----------------
     public void setMessage(Message message) {
-    	this.message = message;
-    	if(message != null){
-    		if(message.getAttachments() != null
-    				&& message.getAttachments().size() > 0){
-    			hasAttachment = true;
-    			attachmentName = ((Attachment)message.getAttachments().iterator().next()).getFileName();
-    		}else{ 
-    			hasAttachment = false;
-    			attachmentName = null;
-    		}
-    	}
+	this.message = message;
+	if (message != null) {
+	    if ((message.getAttachments() != null) && (message.getAttachments().size() > 0)) {
+		hasAttachment = true;
+		attachmentName = ((Attachment) message.getAttachments().iterator().next()).getFileName();
+	    } else {
+		hasAttachment = false;
+		attachmentName = null;
+	    }
+	}
     }
 
     public Message getMessage() {
-        return message;
+	return message;
     }
 
     public void setForumId(Long forumId) {
-        this.forumId = forumId;
+	this.forumId = forumId;
     }
 
     public Long getForumId() {
-        return this.forumId;
+	return this.forumId;
     }
 
     public void setParentId(Long parentId) {
-        this.parentId = parentId;
+	this.parentId = parentId;
     }
 
     public Long getParentId() {
-        return this.parentId;
+	return this.parentId;
     }
 
     public void setTopicId(Long topicId) {
-        this.topicId = topicId;
+	this.topicId = topicId;
     }
 
     public Long getTopicId() {
-        return this.topicId;
+	return this.topicId;
     }
 
+    public String getAttachmentName() {
+	return attachmentName;
+    }
 
-	public String getAttachmentName() {
-		return attachmentName;
-	}
+    public void setAttachmentName(String attachmentName) {
+	this.attachmentName = attachmentName;
+    }
 
-	public void setAttachmentName(String attachmentName) {
-		this.attachmentName = attachmentName;
-	}
+    public FormFile getAttachmentFile() {
+	return attachmentFile;
+    }
 
-	public FormFile getAttachmentFile() {
-		return attachmentFile;
-	}
+    public void setAttachmentFile(FormFile attachmentFile) {
+	this.attachmentFile = attachmentFile;
+    }
 
-	public void setAttachmentFile(FormFile attachmentFile) {
-		this.attachmentFile = attachmentFile;
-	}
-	public String getSessionMapID() {
-		return sessionMapID;
-	}
-	public void setSessionMapID(String sessionMapID) {
-		this.sessionMapID = sessionMapID;
-	}
-	public boolean isHasAttachment() {
-		return hasAttachment;
-	}
-	public void setHasAttachment(boolean hasAttachment) {
-		this.hasAttachment = hasAttachment;
-	}
+    public String getSessionMapID() {
+	return sessionMapID;
+    }
+
+    public void setSessionMapID(String sessionMapID) {
+	this.sessionMapID = sessionMapID;
+    }
+
+    public boolean isHasAttachment() {
+	return hasAttachment;
+    }
+
+    public void setHasAttachment(boolean hasAttachment) {
+	this.hasAttachment = hasAttachment;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -142,17 +142,18 @@
 
 public class QaLearningAction extends LamsDispatchAction implements QaAppConstants {
     static Logger logger = Logger.getLogger(QaLearningAction.class.getName());
-    
+
     private static IQaService qaService;
 
+    @Override
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException, ToolException {
-	logger.warn("dispatching unspecified...");
+	QaLearningAction.logger.warn("dispatching unspecified...");
 	return null;
     }
 
     /**
-     * submits users responses 
+     * submits users responses
      * 
      * @param mapping
      * @param form
@@ -170,7 +171,7 @@
 	LearningUtil.saveFormRequestData(request, qaLearningForm);
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	QaContent qaContent = qaSession.getQaContent();
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
@@ -182,61 +183,65 @@
 
 	Map<String, String> mapAnswers = new TreeMap<String, String>(new QaComparator());
 	Map<String, String> mapAnswersPresentable = new TreeMap<String, String>(new QaComparator());
-	
-	String forwardName = INDIVIDUAL_LEARNER_RESULTS;
+
+	String forwardName = QaAppConstants.INDIVIDUAL_LEARNER_RESULTS;
 	ActionMessages errors = new ActionMessages();
 
 	String httpSessionID = qaLearningForm.getHttpSessionID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-	
+
 	/* if the listing mode is QUESTION_LISTING_MODE_COMBINED populate  the answers here*/
-	if (questionListingMode.equalsIgnoreCase(QUESTION_LISTING_MODE_COMBINED)) {
-	    
-	    for (int questionIndex = INITIAL_QUESTION_COUNT.intValue(); questionIndex <= intTotalQuestionCount; questionIndex++) {
-		String answer = request.getParameter("answer" + questionIndex);
+	if (questionListingMode.equalsIgnoreCase(QaAppConstants.QUESTION_LISTING_MODE_COMBINED)) {
+
+	    for (int questionIndex = QaAppConstants.INITIAL_QUESTION_COUNT.intValue(); questionIndex <= intTotalQuestionCount; questionIndex++) {
+		// TestHarness can not send "answerX" fields, so stick to the original, unfiltered field
+		boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness"));
+		String answerParamName = "answer" + questionIndex + (isTestHarness ? "__textarea" : "");
+		String answer = request.getParameter(answerParamName);
 		String answerPresentable = QaUtils.replaceNewLines(answer);
 
 		String questionIndexString = new Integer(questionIndex).toString();
 		mapAnswers.put(questionIndexString, answer);
 		mapAnswersPresentable.put(questionIndexString, answerPresentable);
-		
-		Map<String,QaQuestionDTO> questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
+
+		Map<String, QaQuestionDTO> questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
 		QaQuestionDTO dto = questionContentMap.get(questionIndexString);
-		if ( dto.isRequired() && isEmpty(answer)) {
+		if (dto.isRequired() && isEmpty(answer)) {
 		    errors.add(Globals.ERROR_KEY, new ActionMessage("error.required", questionIndexString));
-		    forwardName = LOAD_LEARNER;
+		    forwardName = QaAppConstants.LOAD_LEARNER;
 		}
-		
-		//store
-		qaService.updateResponseWithNewAnswer(answer, toolSessionID, new Long(questionIndex));
+
+		// store
+		QaLearningAction.qaService.updateResponseWithNewAnswer(answer, toolSessionID, new Long(questionIndex));
 	    }
 	    saveErrors(request, errors);
 
 	} else {
 	    mapAnswers = storeSequentialAnswer(qaLearningForm, request, generalLearnerFlowDTO, true);
 
-	    mapAnswersPresentable = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
+	    mapAnswersPresentable = (Map) sessionMap.get(QaAppConstants.MAP_ALL_RESULTS_KEY);
 	    mapAnswersPresentable = MonitoringUtil.removeNewLinesMap(mapAnswersPresentable);
 
 	    // only need to check the final question as the others will have been checked when the user clicked next.
 	    Map<String, QaQuestionDTO> questionMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
 	    int numQuestions = questionMap.size();
 	    String finalQuestionIndex = new Integer(numQuestions).toString();
 	    QaQuestionDTO dto = questionMap.get(finalQuestionIndex);
-	    if (dto.isRequired() && isEmpty((String) mapAnswersPresentable.get(finalQuestionIndex))) {
+	    if (dto.isRequired() && isEmpty(mapAnswersPresentable.get(finalQuestionIndex))) {
 		errors.add(Globals.ERROR_KEY, new ActionMessage("error.required", finalQuestionIndex));
-		forwardName = LOAD_LEARNER;
+		forwardName = QaAppConstants.LOAD_LEARNER;
 	    }
 	}
 
 	generalLearnerFlowDTO.setMapAnswers(mapAnswers);
 	generalLearnerFlowDTO.setMapAnswersPresentable(mapAnswersPresentable);
 
 	/*mapAnswers will be used in the viewAllAnswers screen*/
-	if ( sessionMap == null ) 
+	if (sessionMap == null) {
 	    sessionMap = new SessionMap();
-	
-	sessionMap.put(MAP_ALL_RESULTS_KEY, mapAnswers);
+	}
+
+	sessionMap.put(QaAppConstants.MAP_ALL_RESULTS_KEY, mapAnswers);
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
 	generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
@@ -245,12 +250,12 @@
 	generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
 	generalLearnerFlowDTO.setReflection(new Boolean(qaContent.isReflect()).toString());
 
-	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 
 	qaLearningForm.resetAll();
 	return (mapping.findForward(forwardName));
     }
-    
+
     public ActionForward checkLeaderProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws JSONException, IOException {
 	
@@ -269,7 +274,7 @@
     }
     
     /**
-     * auto saves responses 
+     * auto saves responses
      * 
      * @param mapping
      * @param form
@@ -286,25 +291,28 @@
 
 	LearningUtil.saveFormRequestData(request, qaLearningForm);
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	QaContent qaContent = qaSession.getQaContent();
 	int intTotalQuestionCount = qaContent.getQaQueContents().size();
-	
-	if (! qaContent.isQuestionsSequenced()) {
-	    
-	    for (int questionIndex = INITIAL_QUESTION_COUNT.intValue(); questionIndex <= intTotalQuestionCount; questionIndex++) {
+
+	if (!qaContent.isQuestionsSequenced()) {
+
+	    for (int questionIndex = QaAppConstants.INITIAL_QUESTION_COUNT.intValue(); questionIndex <= intTotalQuestionCount; questionIndex++) {
 		String newAnswer = request.getParameter("answer" + questionIndex);
-		qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Long(questionIndex));
+		QaLearningAction.qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID,
+			new Long(questionIndex));
 	    }
 
 	} else {
 	    String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex();
 	    String newAnswer = qaLearningForm.getAnswer();
-	    QaQueContent currentQuestion = qaService.getQuestionByContentAndDisplayOrder(new Long(currentQuestionIndex), qaContent.getUid());
-	    
+	    QaQueContent currentQuestion = QaLearningAction.qaService.getQuestionByContentAndDisplayOrder(new Long(
+		    currentQuestionIndex), qaContent.getUid());
+
 	    boolean isRequiredQuestionMissed = currentQuestion.isRequired() && isEmpty(newAnswer);
 	    if (!isRequiredQuestionMissed) {
-		qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Long(currentQuestionIndex));
+		QaLearningAction.qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Long(
+			currentQuestionIndex));
 	    }
 	}
 	return null;
@@ -329,7 +337,7 @@
 	LearningUtil.saveFormRequestData(request, qaLearningForm);
 
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	QaContent qaContent = qaSession.getQaContent();
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
@@ -344,20 +352,21 @@
 	generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
 	generalLearnerFlowDTO.setToolContentID(qaContent.getQaContentId().toString());
 
-	//create mapQuestions
+	// create mapQuestions
 	Map<String, QaQuestionDTO> mapQuestions = generalLearnerFlowDTO.getMapQuestionContentLearner();
 	generalLearnerFlowDTO.setMapQuestions(mapQuestions);
 	generalLearnerFlowDTO.setTotalQuestionCount(new Integer(mapQuestions.size()));
 	generalLearnerFlowDTO.setRemainingQuestionCount(new Integer(mapQuestions.size()).toString());
 	qaLearningForm.setTotalQuestionCount(new Integer(mapQuestions.size()).toString());
-		
-	//populate answers
+
+	// populate answers
 	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
-	LearningUtil.populateAnswers(sessionMap, qaContent, qaQueUsr, mapQuestions, generalLearnerFlowDTO, qaService);
+	LearningUtil.populateAnswers(sessionMap, qaContent, qaQueUsr, mapQuestions, generalLearnerFlowDTO,
+		QaLearningAction.qaService);
 
-	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 	qaLearningForm.resetAll();
-	return (mapping.findForward(LOAD_LEARNER));
+	return (mapping.findForward(QaAppConstants.LOAD_LEARNER));
     }
 
     /**
@@ -370,27 +379,27 @@
      */
     public ActionForward storeAllResults(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
-	
+
 	initializeQAService();
 	QaLearningForm qaLearningForm = (QaLearningForm) form;
 	LearningUtil.saveFormRequestData(request, qaLearningForm);
 
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	String userID = request.getParameter("userID");
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	Long toolContentID = qaSession.getQaContent().getQaContentId();
 	QaContent qaContent = qaSession.getQaContent();
 
 	String httpSessionID = qaLearningForm.getHttpSessionID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-	Map mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
-	
-//	LearningUtil.storeResponses(mapAnswers, qaService, toolContentID, new Long(toolSessionID));
-	//mark response as finalised
-	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);	
+	Map mapAnswers = (Map) sessionMap.get(QaAppConstants.MAP_ALL_RESULTS_KEY);
+
+	// LearningUtil.storeResponses(mapAnswers, qaService, toolContentID, new Long(toolSessionID));
+	// mark response as finalised
+	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
 	qaQueUsr.setResponseFinalized(true);
-	qaService.updateQaQueUsr(qaQueUsr);
-	
+	QaLearningAction.qaService.updateQaQueUsr(qaQueUsr);
+
 	qaLearningForm.resetUserActions();
 	qaLearningForm.setSubmitAnswersContent(null);
 
@@ -399,13 +408,13 @@
 	    generalLearnerFlowDTO.setHttpSessionID(httpSessionID);
 	    String isUserNamesVisibleBoolean = generalLearnerFlowDTO.getUserNameVisible();
 	    boolean isUserNamesVisible = new Boolean(isUserNamesVisibleBoolean).booleanValue();
-	    
-	    return prepareViewAllAnswers(mapping, request, qaLearningForm, toolSessionID, userID, qaSession,
-		    qaContent, generalLearnerFlowDTO, isUserNamesVisible);
-	    
+
+	    return prepareViewAllAnswers(mapping, request, qaLearningForm, toolSessionID, userID, qaSession, qaContent,
+		    generalLearnerFlowDTO, isUserNamesVisible);
+
 	} else if (qaContent.isReflect()) {
 	    return forwardtoReflection(mapping, request, qaContent, toolSessionID, userID, qaLearningForm);
-	    
+
 	} else {
 	    return endLearning(mapping, qaLearningForm, request, response);
 	}
@@ -417,8 +426,8 @@
 	    QaContent qaContent, GeneralLearnerFlowDTO generalLearnerFlowDTO, boolean isUserNamesVisible) {
 
 	QaMonitoringAction qaMonitoringAction = new QaMonitoringAction();
-	qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, toolSessionID,
-		userID, generalLearnerFlowDTO, false, toolSessionID);
+	qaMonitoringAction.refreshSummaryData(request, qaContent, QaLearningAction.qaService, isUserNamesVisible, true,
+		toolSessionID, userID, generalLearnerFlowDTO, false, toolSessionID);
 
 	generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
 	generalLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(false).toString());
@@ -429,13 +438,13 @@
 
 	boolean lockWhenFinished = qaContent.isLockWhenFinished();
 	generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
-	
+
 	boolean useSelectLeaderToolOuput = qaContent.isUseSelectLeaderToolOuput();
 	generalLearnerFlowDTO.setUseSelectLeaderToolOuput(new Boolean(useSelectLeaderToolOuput).toString());
 	
 	boolean allowRichEditor = qaContent.isAllowRichEditor();
 	generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString());
-	
+
 	generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
 
 	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
@@ -447,24 +456,24 @@
 	}
 
 	if (sessionUserCount > 1) {
-	    //there are multiple user responses
+	    // there are multiple user responses
 	    generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString());
 	}
 
 	boolean usernameVisible = qaContent.isUsernameVisible();
 	generalLearnerFlowDTO.setUserNameVisible(new Boolean(usernameVisible).toString());
 
-	NotebookEntry notebookEntry = qaService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
-		MY_SIGNATURE, new Integer(userID));
+	NotebookEntry notebookEntry = QaLearningAction.qaService.getEntry(new Long(toolSessionID),
+		CoreNotebookConstants.NOTEBOOK_TOOL, QaAppConstants.MY_SIGNATURE, new Integer(userID));
 
 	if (notebookEntry != null) {
-	    //String notebookEntryPresentable=QaUtils.replaceNewLines(notebookEntry.getEntry());
+	    // String notebookEntryPresentable=QaUtils.replaceNewLines(notebookEntry.getEntry());
 	    String notebookEntryPresentable = notebookEntry.getEntry();
 	    qaLearningForm.setEntryText(notebookEntryPresentable);
 	}
 
-	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-	return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
+	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+	return (mapping.findForward(QaAppConstants.INDIVIDUAL_LEARNER_REPORT));
     }
 
     /**
@@ -488,7 +497,7 @@
 
 	String userID = request.getParameter("userID");
 
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 
 	String toolContentID = qaSession.getQaContent().getQaContentId().toString();
 
@@ -506,30 +515,30 @@
 
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
 
-	Map mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
+	Map mapAnswers = (Map) sessionMap.get(QaAppConstants.MAP_ALL_RESULTS_KEY);
 
 	/*recreate the users and responses*/
 	qaLearningForm.resetUserActions();
 	qaLearningForm.setSubmitAnswersContent(null);
 
 	QaMonitoringAction qaMonitoringAction = new QaMonitoringAction();
-	qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, toolSessionID,
-		userID, generalLearnerFlowDTO, false, toolSessionID);
+	qaMonitoringAction.refreshSummaryData(request, qaContent, QaLearningAction.qaService, isUserNamesVisible, true,
+		toolSessionID, userID, generalLearnerFlowDTO, false, toolSessionID);
 
 	generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
 	generalLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(false).toString());
 
 	generalLearnerFlowDTO.setReflection(new Boolean(qaContent.isReflect()).toString());
-	//generalLearnerFlowDTO.setNotebookEntriesVisible(new Boolean(false).toString());
+	// generalLearnerFlowDTO.setNotebookEntriesVisible(new Boolean(false).toString());
 
 	qaLearningForm.resetAll();
 
 	boolean lockWhenFinished = qaContent.isLockWhenFinished();
 	generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
-	
+
 	boolean allowRichEditor = qaContent.isAllowRichEditor();
 	generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString());
-	
+
 	boolean useSelectLeaderToolOuput = qaContent.isUseSelectLeaderToolOuput();
 	generalLearnerFlowDTO.setUseSelectLeaderToolOuput(new Boolean(useSelectLeaderToolOuput).toString());
 	
@@ -550,9 +559,9 @@
 	boolean usernameVisible = qaContent.isUsernameVisible();
 	generalLearnerFlowDTO.setUserNameVisible(new Boolean(usernameVisible).toString());
 
-	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 
-	return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
+	return (mapping.findForward(QaAppConstants.INDIVIDUAL_LEARNER_REPORT));
     }
 
     /**
@@ -579,20 +588,21 @@
 	String httpSessionID = qaLearningForm.getHttpSessionID();
 	qaLearningForm.setHttpSessionID(httpSessionID);
 
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	QaContent qaContent = qaSession.getQaContent();
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 
 	storeSequentialAnswer(qaLearningForm, request, generalLearnerFlowDTO, true);
 
 	qaLearningForm.resetAll();
-	return (mapping.findForward(LOAD_LEARNER));
+	return (mapping.findForward(QaAppConstants.LOAD_LEARNER));
     }
 
-    /** 
-     * Get the answer from the form and copy into DTO. Set up the next question. If the current question is
-     * required and the answer is blank, then just persist the error and don't change questions. 
+    /**
+     * Get the answer from the form and copy into DTO. Set up the next question. If the current question is required and
+     * the answer is blank, then just persist the error and don't change questions.
+     * 
      * @param form
      * @param request
      * @param generalLearnerFlowDTO
@@ -607,42 +617,44 @@
 
 	String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex();
 
-	Map mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
-	if (mapAnswers == null)
+	Map mapAnswers = (Map) sessionMap.get(QaAppConstants.MAP_ALL_RESULTS_KEY);
+	if (mapAnswers == null) {
 	    mapAnswers = new TreeMap(new QaComparator());
+	}
 
 	String newAnswer = qaLearningForm.getAnswer();
-	Map mapSequentialAnswers = (Map) sessionMap.get(MAP_SEQUENTIAL_ANSWERS_KEY);
+	Map mapSequentialAnswers = (Map) sessionMap.get(QaAppConstants.MAP_SEQUENTIAL_ANSWERS_KEY);
 	if (mapSequentialAnswers.size() >= new Integer(currentQuestionIndex).intValue()) {
 	    mapSequentialAnswers.remove(new Long(currentQuestionIndex).toString());
 	}
 	mapSequentialAnswers.put(new Long(currentQuestionIndex).toString(), newAnswer);
 	mapAnswers.put(currentQuestionIndex, newAnswer);
 
-	int nextQuestionOffset =  getNextQuestion ? 1 : -1;
+	int nextQuestionOffset = getNextQuestion ? 1 : -1;
 
-	// is this question required and are they trying to go to the next question? 
+	// is this question required and are they trying to go to the next question?
 	// if so, check if the answer is blank and generate an error if it is blank.
-	Map<String,QaQuestionDTO> questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
+	Map<String, QaQuestionDTO> questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
 	QaQuestionDTO dto = questionContentMap.get(currentQuestionIndex);
 	boolean isRequiredQuestionMissed = dto.isRequired() && isEmpty(newAnswer);
-	if ( getNextQuestion && isRequiredQuestionMissed) {
+	if (getNextQuestion && isRequiredQuestionMissed) {
 	    ActionMessages errors = new ActionMessages();
 	    errors.add(Globals.ERROR_KEY, new ActionMessage("error.required", currentQuestionIndex));
 	    saveErrors(request, errors);
 	    nextQuestionOffset = 0;
 	}
-	
-	//store
-	if ( ! isRequiredQuestionMissed) {
-	    qaService.updateResponseWithNewAnswer(newAnswer, qaLearningForm.getToolSessionID(), new Long(currentQuestionIndex));
+
+	// store
+	if (!isRequiredQuestionMissed) {
+	    QaLearningAction.qaService.updateResponseWithNewAnswer(newAnswer, qaLearningForm.getToolSessionID(),
+		    new Long(currentQuestionIndex));
 	}
-	
-	sessionMap.put(MAP_ALL_RESULTS_KEY, mapAnswers);
+
+	sessionMap.put(QaAppConstants.MAP_ALL_RESULTS_KEY, mapAnswers);
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
 	generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
-	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 
 	int intCurrentQuestionIndex = new Integer(currentQuestionIndex).intValue() + nextQuestionOffset;
 	String currentAnswer = "";
@@ -651,7 +663,7 @@
 	}
 	generalLearnerFlowDTO.setCurrentAnswer(currentAnswer);
 
-	//currentQuestionIndex will be: 
+	// currentQuestionIndex will be:
 	generalLearnerFlowDTO.setCurrentQuestionIndex(new Integer(intCurrentQuestionIndex));
 
 	String totalQuestionCount = qaLearningForm.getTotalQuestionCount();
@@ -665,29 +677,28 @@
 
 	qaLearningForm.resetUserActions(); /*resets all except submitAnswersContent */
 
-	sessionMap.put(MAP_SEQUENTIAL_ANSWERS_KEY, mapSequentialAnswers);
+	sessionMap.put(QaAppConstants.MAP_SEQUENTIAL_ANSWERS_KEY, mapSequentialAnswers);
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
 	generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
 
-	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 
 	return mapSequentialAnswers;
     }
-    
 
-
     /**
      * Is this string empty? Need to strip out all HTML tags first otherwise an empty DIV might look like a valid answer
      * Smileys and math functions only put in an img tag so explicitly look for that.
      */
     private boolean isEmpty(String answer) {
-	if  ( answer.indexOf("<img") > -1 || answer.indexOf("<IMG") > -1 ) 
+	if ((answer.indexOf("<img") > -1) || (answer.indexOf("<IMG") > -1)) {
 	    return false;
-	else
+	} else {
 	    return StringUtils.isBlank(WebUtil.removeHTMLtags(answer));
+	}
     }
-    
+
     /**
      * moves to the previous question and modifies the map ActionForward
      * 
@@ -711,43 +722,43 @@
 	qaLearningForm.setHttpSessionID(httpSessionID);
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	qaLearningForm.setToolSessionID(toolSessionID);
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	QaContent qaContent = qaSession.getQaContent();
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 
 	storeSequentialAnswer(qaLearningForm, request, generalLearnerFlowDTO, false);
 
 	qaLearningForm.resetAll();
-	return (mapping.findForward(LOAD_LEARNER));
+	return (mapping.findForward(QaAppConstants.LOAD_LEARNER));
     }
-    
+
     /**
-     * Rates answers submitted by other learners. 
+     * Rates answers submitted by other learners.
      * 
      * @param mapping
      * @param form
      * @param request
      * @param response
      * @return
-     * @throws JSONException 
+     * @throws JSONException
      * @throws IOException
      * @throws ServletException
      * @throws ToolException
      */
     public ActionForward rateResponse(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws JSONException, IOException {
-	
+
 	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-	
-	float rating = Float.parseFloat((String) request.getParameter("rate"));
+
+	float rating = Float.parseFloat(request.getParameter("rate"));
 	Long responseId = WebUtil.readLongParam(request, "idBox");
 	Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 	Long userId = new Long(user.getUserID().intValue());
-	
+
 	AverageRatingDTO averageRatingDTO = qaService.rateResponse(responseId, userId, toolSessionID, rating);
-	
+
 	JSONObject JSONObject = new JSONObject();
 	JSONObject.put("averageRating", averageRatingDTO.getRating());
 	JSONObject.put("numberOfVotes", averageRatingDTO.getNumberOfVotes());
@@ -757,7 +768,7 @@
     }
 
     /**
-     * finishes the user's tool activity 
+     * finishes the user's tool activity
      * 
      * @param request
      * @param qaService
@@ -778,11 +789,12 @@
 	String userID = request.getParameter("userID");
 	qaLearningForm.setUserID(userID);
 
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 
-	QaQueUsr qaQueUsr = qaService.getUserByIdAndSession(new Long(userID), qaSession.getQaSessionId());
+	QaQueUsr qaQueUsr = QaLearningAction.qaService.getUserByIdAndSession(new Long(userID),
+		qaSession.getQaSessionId());
 	qaQueUsr.setLearnerFinished(true);
-	qaService.updateQaQueUsr(qaQueUsr);
+	QaLearningAction.qaService.updateQaQueUsr(qaQueUsr);
 
 	/*
 	 * The learner is done with the tool session. The tool needs to clean-up.
@@ -792,17 +804,17 @@
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 
 	qaSession.setSession_end_date(new Date(System.currentTimeMillis()));
-	qaSession.setSession_status(COMPLETED);
-	qaService.updateQaSession(qaSession);
+	qaSession.setSession_status(QaAppConstants.COMPLETED);
+	QaLearningAction.qaService.updateQaSession(qaSession);
 
 	String httpSessionID = qaLearningForm.getHttpSessionID();
-	//request.getSession().removeAttribute(httpSessionID);
+	// request.getSession().removeAttribute(httpSessionID);
 	qaLearningForm.setHttpSessionID(httpSessionID);
 
 	qaLearningForm.resetAll();
 
-	String nextActivityUrl = qaService.leaveToolSession(new Long(toolSessionID), new Long(user.getUserID()
-		.longValue()));
+	String nextActivityUrl = QaLearningAction.qaService.leaveToolSession(new Long(toolSessionID), new Long(user
+		.getUserID().longValue()));
 	response.sendRedirect(nextActivityUrl);
 
 	return null;
@@ -825,23 +837,24 @@
 	String userID = request.getParameter("userID");
 	qaLearningForm.setUserID(userID);
 
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 
 	QaContent qaContent = qaSession.getQaContent();
 
-	QaQueUsr qaQueUsr = qaService.getUserByIdAndSession(new Long(userID), qaSession.getQaSessionId());
+	QaQueUsr qaQueUsr = QaLearningAction.qaService.getUserByIdAndSession(new Long(userID),
+		qaSession.getQaSessionId());
 
 	String entryText = request.getParameter("entryText");
 	qaLearningForm.setEntryText(entryText);
 
 	NotebookEntry notebookEntryLocal = new NotebookEntry();
 	notebookEntryLocal.setEntry(entryText);
-	//notebookEntry.setUser(qaQueUsr);
+	// notebookEntry.setUser(qaQueUsr);
 	User user = new User();
 	user.setUserId(new Integer(userID));
 	notebookEntryLocal.setUser(user);
 
-	qaService.updateEntry(notebookEntryLocal);
+	QaLearningAction.qaService.updateEntry(notebookEntryLocal);
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = new GeneralLearnerFlowDTO();
 
@@ -851,16 +864,16 @@
 	boolean isUserNamesVisible = isUserNamesVisibleBoolean.booleanValue();
 
 	QaMonitoringAction qaMonitoringAction = new QaMonitoringAction();
-	qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, toolSessionID,
-		userID, generalLearnerFlowDTO, false, toolSessionID);
+	qaMonitoringAction.refreshSummaryData(request, qaContent, QaLearningAction.qaService, isUserNamesVisible, true,
+		toolSessionID, userID, generalLearnerFlowDTO, false, toolSessionID);
 
 	int sessionUserCount = 0;
 	if (qaSession.getQaQueUsers() != null) {
 	    sessionUserCount = qaSession.getQaQueUsers().size();
 	}
 
 	if (sessionUserCount > 1) {
-	    //there are multiple user responses
+	    // there are multiple user responses
 	    generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString());
 	}
 
@@ -869,27 +882,26 @@
 
 	boolean lockWhenFinished = qaContent.isLockWhenFinished();
 	generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
-	
+
 	boolean allowRichEditor = qaContent.isAllowRichEditor();
 	generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString());
-	
+
 	boolean useSelectLeaderToolOuput = qaContent.isUseSelectLeaderToolOuput();
 	generalLearnerFlowDTO.setUseSelectLeaderToolOuput(new Boolean(useSelectLeaderToolOuput).toString());
 	
 	generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
 
-	NotebookEntry notebookEntry = qaService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
-		MY_SIGNATURE, new Integer(userID));
+	NotebookEntry notebookEntry = QaLearningAction.qaService.getEntry(new Long(toolSessionID),
+		CoreNotebookConstants.NOTEBOOK_TOOL, QaAppConstants.MY_SIGNATURE, new Integer(userID));
 
-
 	if (notebookEntry != null) {
 	    String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
 	    qaLearningForm.setEntryText(notebookEntryPresentable);
 	}
 
-	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 
-	return (mapping.findForward(REVISITED_LEARNER_REP));
+	return (mapping.findForward(QaAppConstants.REVISITED_LEARNER_REP));
     }
 
     /**
@@ -920,10 +932,10 @@
 	String userID = request.getParameter("userID");
 	qaLearningForm.setUserID(userID);
 
-	String reflectionEntry = request.getParameter(ENTRY_TEXT);
+	String reflectionEntry = request.getParameter(QaAppConstants.ENTRY_TEXT);
 
-	qaService.createNotebookEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, MY_SIGNATURE,
-		new Integer(userID), reflectionEntry);
+	QaLearningAction.qaService.createNotebookEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
+		QaAppConstants.MY_SIGNATURE, new Integer(userID), reflectionEntry);
 
 	qaLearningForm.resetUserActions(); /*resets all except submitAnswersContent */
 	return endLearning(mapping, form, request, response);
@@ -944,14 +956,14 @@
 	    HttpServletResponse response) throws IOException, ServletException, ToolException {
 	initializeQAService();
 	QaLearningForm qaLearningForm = (QaLearningForm) form;
-	
+
 	String httpSessionID = qaLearningForm.getHttpSessionID();
 
 	qaLearningForm.setHttpSessionID(httpSessionID);
 
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 
-	QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 
 	QaContent qaContent = qaSession.getQaContent();
 
@@ -970,38 +982,38 @@
 	reflectionSubject = QaUtils.replaceNewLines(reflectionSubject);
 	generalLearnerFlowDTO.setReflectionSubject(reflectionSubject);
 
-	//attempt getting notebookEntry
-	NotebookEntry notebookEntry = qaService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
-		MY_SIGNATURE, new Integer(userID));
+	// attempt getting notebookEntry
+	NotebookEntry notebookEntry = QaLearningAction.qaService.getEntry(new Long(toolSessionID),
+		CoreNotebookConstants.NOTEBOOK_TOOL, QaAppConstants.MY_SIGNATURE, new Integer(userID));
 
 	if (notebookEntry != null) {
-	    //String notebookEntryPresentable=QaUtils.replaceNewLines(notebookEntry.getEntry());
+	    // String notebookEntryPresentable=QaUtils.replaceNewLines(notebookEntry.getEntry());
 	    String notebookEntryPresentable = notebookEntry.getEntry();
 	    generalLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
 	    qaLearningForm.setEntryText(notebookEntryPresentable);
 	}
 
-	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 	qaLearningForm.resetUserActions(); /*resets all except submitAnswersContent */
 
 	qaLearningForm.resetAll();
-	return (mapping.findForward(NOTEBOOK));
+	return (mapping.findForward(QaAppConstants.NOTEBOOK));
     }
-    
+
     private void initializeQAService() {
-	if (qaService == null) {
-	    qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+	if (QaLearningAction.qaService == null) {
+	    QaLearningAction.qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
 	}
     }
-    
+
     private QaQueUsr getCurrentUser(String toolSessionID) {
 
-	// get back login user DTO 
+	// get back login user DTO
 	HttpSession ss = SessionManager.getSession();
 	UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	Long userId = new Long(toolUser.getUserID().longValue());	
+	Long userId = new Long(toolUser.getUserID().longValue());
 
-	return qaService.getUserByIdAndSession(userId, new Long(toolSessionID));
+	return QaLearningAction.qaService.getUserByIdAndSession(userId, new Long(toolSessionID));
     }
-    
+
 }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -149,7 +150,7 @@
 
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
 		.getServletContext());
-		
+
 	// check if there is submission deadline
 	Date submissionDeadline = mindmap.getSubmissionDeadline();
 	if (submissionDeadline != null) {
@@ -834,7 +835,7 @@
 		    mindmapService.updateEntry(entry);
 		}
 	    } else {
-		if (!mindmap.isMultiUserMode() && learningForm.getMindmapContent() != null)
+		if (!mindmap.isMultiUserMode() && !StringUtils.isBlank(learningForm.getMindmapContent()))
 		    saveMindmapXML(mindmap, mindmapUser, learningForm.getMindmapContent(), mindmapSession);
 	    }
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -79,673 +79,700 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
+
 /**
  * 
  * @author Steve.Ni
- * 	
+ * 
  * @version $Revision$
  */
 public class LearningAction extends Action {
 
-	private static Logger log = Logger.getLogger(LearningAction.class);
-	
-	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException, UploadTaskListFileException {
-		
-		String param = mapping.getParameter();
-		//-----------------------TaskList Learner function ---------------------------
-		if(param.equals("start")){
-			return start(mapping, form, request, response);
-		}
+    private static Logger log = Logger.getLogger(LearningAction.class);
 
-		if(param.equals("complete")){
-			return complete(mapping, form, request, response);
-		}
+    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException, UploadTaskListFileException {
 
-		if(param.equals("finish")){
-			return finish(mapping, form, request, response);
-		}
-		
-		if (param.equals("addtask")) {
-			return addTask(mapping, form, request, response);
-		}
-        if (param.equals("saveNewTask")) {
-        	return saveNewTask(mapping, form, request, response);
-        }
-        
-        if (param.equals("addNewComment")) {
-        	return addNewComment(mapping, form, request, response);
-        }
-        if (param.equals("uploadFile")) {
-       		return uploadFile(mapping, form, request, response);
-        }
-        
-		//================ Reflection =======================
-		if (param.equals("newReflection")) {
-			return newReflection(mapping, form, request, response);
-		}
-		if (param.equals("submitReflection")) {
-			return submitReflection(mapping, form, request, response);
-		}
-		
-		return  mapping.findForward(TaskListConstants.ERROR);
+	String param = mapping.getParameter();
+	// -----------------------TaskList Learner function ---------------------------
+	if (param.equals("start")) {
+	    return start(mapping, form, request, response);
 	}
-	
-	/**
-	 * Read taskList data from database and put them into HttpSession. It will redirect to init.do directly after this
-	 * method run successfully. 
-	 *  
-	 * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
-	 * 
-	 */
-	private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		
-		//initial Session Map 
-		SessionMap sessionMap = new SessionMap();
-		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-		
-		//save toolContentID into HTTPSession
-		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, true);
-		
-		Long sessionId =  new Long(request.getParameter(TaskListConstants.PARAM_TOOL_SESSION_ID));
-		
-		request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-		request.setAttribute(AttributeNames.ATTR_MODE,mode);
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
-		
-		// get back the taskList and item list and display them on page
-		ITaskListService service = getTaskListService();
-		TaskListUser taskListUser = null;
-		if ( mode != null && mode.isTeacher() ) {
-			// monitoring mode - user is specified in URL
-			// taskListUser may be null if the user was force completed.
-			taskListUser = getSpecifiedUser(service, sessionId, WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false));
-		} else {
-			taskListUser = getCurrentUser(service,sessionId);
-		}
 
-		TaskList taskList = service.getTaskListBySessionId(sessionId);
+	if (param.equals("complete")) {
+	    return complete(mapping, form, request, response);
+	}
 
-		//Create set of TaskListItems besides this filtering out items added by users from other groups
-		TreeSet<TaskListItem> items = new TreeSet<TaskListItem> (new TaskListItemComparator());
-		if (mode.isLearner()) {
-			
-			List<TaskListUser> grouppedUsers = service.getUserListBySessionId(sessionId);
-			Set<TaskListItem> allTaskListItems = taskList.getTaskListItems();
+	if (param.equals("finish")) {
+	    return finish(mapping, form, request, response);
+	}
 
-			for(TaskListItem item:allTaskListItems) {
-				for(TaskListUser grouppedUser:grouppedUsers) {
-					if (item.isCreateByAuthor() || grouppedUser.getUserId().equals(item.getCreateBy().getUserId())) items.add(item);
-				}
-			}
-			
-		} else {
-			items.addAll(taskList.getTaskListItems());
-		}
+	if (param.equals("addtask")) {
+	    return addTask(mapping, form, request, response);
+	}
+	if (param.equals("saveNewTask")) {
+	    return saveNewTask(mapping, form, request, response);
+	}
 
+	if (param.equals("addNewComment")) {
+	    return addNewComment(mapping, form, request, response);
+	}
+	if (param.equals("uploadFile")) {
+	    return uploadFile(mapping, form, request, response);
+	}
 
-		//check whehter finish lock is on/off
-		boolean lock = taskList.getLockWhenFinished() && taskListUser !=null && taskListUser.isSessionFinished();
-		
-		// get notebook entry
-		String entryText = new String();
-		if ( taskListUser != null ) {
-			NotebookEntry notebookEntry = service.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, 
-					TaskListConstants.TOOL_SIGNATURE, taskListUser.getUserId().intValue());
-			if (notebookEntry != null) {
-				entryText = notebookEntry.getEntry();
-			}
+	// ================ Reflection =======================
+	if (param.equals("newReflection")) {
+	    return newReflection(mapping, form, request, response);
+	}
+	if (param.equals("submitReflection")) {
+	    return submitReflection(mapping, form, request, response);
+	}
+
+	return mapping.findForward(TaskListConstants.ERROR);
+    }
+
+    /**
+     * Read taskList data from database and put them into HttpSession. It will redirect to init.do directly after this
+     * method run successfully.
+     * 
+     * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
+     * 
+     */
+    private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	// initial Session Map
+	SessionMap sessionMap = new SessionMap();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+
+	// save toolContentID into HTTPSession
+	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
+
+	Long sessionId = new Long(request.getParameter(TaskListConstants.PARAM_TOOL_SESSION_ID));
+
+	request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	request.setAttribute(AttributeNames.ATTR_MODE, mode);
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+
+	// get back the taskList and item list and display them on page
+	ITaskListService service = getTaskListService();
+	TaskListUser taskListUser = null;
+	if (mode != null && mode.isTeacher()) {
+	    // monitoring mode - user is specified in URL
+	    // taskListUser may be null if the user was force completed.
+	    taskListUser = getSpecifiedUser(service, sessionId,
+		    WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false));
+	} else {
+	    taskListUser = getCurrentUser(service, sessionId);
+	}
+
+	TaskList taskList = service.getTaskListBySessionId(sessionId);
+
+	// Create set of TaskListItems besides this filtering out items added by users from other groups
+	TreeSet<TaskListItem> items = new TreeSet<TaskListItem>(new TaskListItemComparator());
+	if (mode.isLearner()) {
+
+	    List<TaskListUser> grouppedUsers = service.getUserListBySessionId(sessionId);
+	    Set<TaskListItem> allTaskListItems = taskList.getTaskListItems();
+
+	    for (TaskListItem item : allTaskListItems) {
+		for (TaskListUser grouppedUser : grouppedUsers) {
+		    if (item.isCreateByAuthor() || grouppedUser.getUserId().equals(item.getCreateBy().getUserId()))
+			items.add(item);
 		}
-		
-		
-		
-		//set complete flag for display purpose
-		if ( taskListUser !=null )
-			service.retrieveComplete(items, taskListUser);
-		
-		TreeSet<TasListItemDTO> itemDTOs = new TreeSet<TasListItemDTO>(new Comparator<TasListItemDTO>() {
-			public int compare(TasListItemDTO o1, TasListItemDTO o2) {
-				if (o1 != null && o2 != null) {
-					return o1.getTaskListItem().getSequenceId() - o2.getTaskListItem().getSequenceId();
-				} else if (o1 != null)
-					return 1;
-				else
-					return -1;
-			}
-		});
-		
-		boolean isPreviousTaskCompleted = true;
-		for(TaskListItem item : items) {
-			TasListItemDTO itemDTO = new TasListItemDTO(item);
-			
-			// checks if this item met all comment requirements 
-			boolean isCommentRequirementsMet = true; 
-			if (item.isCommentsRequired()) {
-				isCommentRequirementsMet = false;
-				Set<TaskListItemComment> comments = item.getComments();
-				for (TaskListItemComment comment : comments) {
-					if (taskListUser.getUserId().equals(comment.getCreateBy().getUserId())) isCommentRequirementsMet = true;
-				}
-			}
-			itemDTO.setCommentRequirementsMet(isCommentRequirementsMet);
+	    }
 
-			// checks if this item met all attachment requirements
-			boolean isAttachmentRequirementsMet = true; 
-			if (item.isFilesRequired()) {
-				isAttachmentRequirementsMet = false;
-				Set<TaskListItemAttachment> attachments = item.getAttachments();
-				for (TaskListItemAttachment attachment : attachments) {
-					if (taskListUser.getUserId().equals(attachment.getCreateBy().getUserId())) isAttachmentRequirementsMet = true;
-				}
-			}
-			itemDTO.setAttachmentRequirementsMet(isAttachmentRequirementsMet);
-			
-			// checks if this item is allowed by its parent
-			boolean isAllowedByParent = true; 
-			if (item.isChildTask()) {
-				for (TaskListItem parentItem : items) {
-					if (parentItem.getTitle().equals(item.getParentTaskName()) && !parentItem.isComplete()) isAllowedByParent = false;
-				}
-			}
-			itemDTO.setAllowedByParent(isAllowedByParent);
-			
-			//checks whether this TaskListItem shoud be displayed open or close
-			boolean isDisplayedOpen = true; 
-			if ((item.getDescription() != null) && (item.getDescription().length() > 1000)) {
-				isDisplayedOpen = false;
-			}
-			itemDTO.setDisplayedOpen(isDisplayedOpen);
-			
-			// sets whether the previous TaskListItem was completed
-			itemDTO.setPreviousTaskCompleted(isPreviousTaskCompleted);
-			isPreviousTaskCompleted = item.isComplete();
-			
-			//filter out comments and attachments which belong to another group
-			Set filteredComments = new TreeSet<TaskListItemComment>(new TaskListItemCommentComparator());
-			Set filteredAttachments = new TreeSet<TaskListItemAttachment>(new TaskListItemAttachmentComparator());
-			if (mode.isLearner()) {
-				
-				List<TaskListUser> grouppedUsers = service.getUserListBySessionId(sessionId);
-				Set<TaskListItemComment> comments = item.getComments();
-				Set<TaskListItemAttachment> attachments = item.getAttachments();
+	} else {
+	    items.addAll(taskList.getTaskListItems());
+	}
 
-				for(TaskListItemComment comment:comments) {
-					for(TaskListUser grouppedUser:grouppedUsers) {
-						if (grouppedUser.getUserId().equals(comment.getCreateBy().getUserId())) filteredComments.add(comment);
-					}
-				}
-				
-				for(TaskListItemAttachment attachment:attachments) {
-					for(TaskListUser grouppedUser:grouppedUsers) {
-						if (grouppedUser.getUserId().equals(attachment.getCreateBy().getUserId())) filteredAttachments.add(attachment);
-					}
-				}
-			} else {
-				filteredComments = item.getComments();
-				filteredAttachments = item.getAttachments();
-			}
-			itemDTO.setComments(filteredComments);
-			itemDTO.setAttachments(filteredAttachments);
-			
-			itemDTOs.add(itemDTO);
+	// check whehter finish lock is on/off
+	boolean lock = taskList.getLockWhenFinished() && taskListUser != null && taskListUser.isSessionFinished();
+
+	// get notebook entry
+	String entryText = new String();
+	if (taskListUser != null) {
+	    NotebookEntry notebookEntry = service.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    TaskListConstants.TOOL_SIGNATURE, taskListUser.getUserId().intValue());
+	    if (notebookEntry != null) {
+		entryText = notebookEntry.getEntry();
+	    }
+	}
+
+	// set complete flag for display purpose
+	if (taskListUser != null)
+	    service.retrieveComplete(items, taskListUser);
+
+	TreeSet<TasListItemDTO> itemDTOs = new TreeSet<TasListItemDTO>(new Comparator<TasListItemDTO>() {
+	    public int compare(TasListItemDTO o1, TasListItemDTO o2) {
+		if (o1 != null && o2 != null) {
+		    return o1.getTaskListItem().getSequenceId() - o2.getTaskListItem().getSequenceId();
+		} else if (o1 != null)
+		    return 1;
+		else
+		    return -1;
+	    }
+	});
+
+	boolean isPreviousTaskCompleted = true;
+	for (TaskListItem item : items) {
+	    TasListItemDTO itemDTO = new TasListItemDTO(item);
+
+	    // checks if this item met all comment requirements
+	    boolean isCommentRequirementsMet = true;
+	    if (item.isCommentsRequired()) {
+		isCommentRequirementsMet = false;
+		Set<TaskListItemComment> comments = item.getComments();
+		for (TaskListItemComment comment : comments) {
+		    if (taskListUser.getUserId().equals(comment.getCreateBy().getUserId()))
+			isCommentRequirementsMet = true;
 		}
+	    }
+	    itemDTO.setCommentRequirementsMet(isCommentRequirementsMet);
 
-		//construct taskList dto field
-		
-		Integer numberCompletedTasks = service.getNumTasksCompletedByUser(sessionId, taskListUser.getUserId());
-		Integer minimumNumberTasks = taskList.getMinimumNumberTasks();
-		if ((minimumNumberTasks - numberCompletedTasks) > 0) {
-			String MinimumNumberTasksStr = service.getMessageService().getMessage("lable.learning.minimum.view.number",new Object[]{minimumNumberTasks, numberCompletedTasks});
-			taskList.setMinimumNumberTasksErrorStr(MinimumNumberTasksStr);
+	    // checks if this item met all attachment requirements
+	    boolean isAttachmentRequirementsMet = true;
+	    if (item.isFilesRequired()) {
+		isAttachmentRequirementsMet = false;
+		Set<TaskListItemAttachment> attachments = item.getAttachments();
+		for (TaskListItemAttachment attachment : attachments) {
+		    if (taskListUser.getUserId().equals(attachment.getCreateBy().getUserId()))
+			isAttachmentRequirementsMet = true;
 		}
-		
-		//basic information
-		sessionMap.put(TaskListConstants.ATTR_TITLE, taskList.getTitle());
-		sessionMap.put(TaskListConstants.ATTR_FINISH_LOCK, lock);
-		sessionMap.put(TaskListConstants.ATTR_USER_FINISHED, taskListUser !=null && taskListUser.isSessionFinished());
-		sessionMap.put(TaskListConstants.ATTR_USER_VERIFIED_BY_MONITOR, taskListUser.isVerifiedByMonitor());
-		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-		sessionMap.put(AttributeNames.ATTR_MODE, mode);
-		sessionMap.put(TaskListConstants.ATTR_TASK_LIST_ITEM_DTOS, itemDTOs);
-		//reflection information
-		sessionMap.put(TaskListConstants.ATTR_REFLECTION_ON, taskList.isReflectOnActivity());
-		sessionMap.put(TaskListConstants.ATTR_REFLECTION_INSTRUCTION, taskList.getReflectInstructions());
-		sessionMap.put(TaskListConstants.ATTR_REFLECTION_ENTRY, entryText);		
-		
-		//add define later support
-		if(taskList.isDefineLater()){
-			return mapping.findForward("defineLater");
+	    }
+	    itemDTO.setAttachmentRequirementsMet(isAttachmentRequirementsMet);
+
+	    // checks if this item is allowed by its parent
+	    boolean isAllowedByParent = true;
+	    if (item.isChildTask()) {
+		for (TaskListItem parentItem : items) {
+		    if (parentItem.getTitle().equals(item.getParentTaskName()) && !parentItem.isComplete())
+			isAllowedByParent = false;
 		}
-		
-		//set contentInUse flag to true!
-		taskList.setContentInUse(true);
-		taskList.setDefineLater(false);
-		service.saveOrUpdateTaskList(taskList);
-		
-        	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
-        		request, getServlet().getServletContext());
-        	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
-		
-		//  check if there is submission deadline
-		Date submissionDeadline = taskList.getSubmissionDeadline();
-		if (submissionDeadline != null) {
-			HttpSession ss = SessionManager.getSession();
-			UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			TimeZone learnerTimeZone = learnerDto.getTimeZone();
-			Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
-			Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
-			sessionMap.put(TaskListConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline);
-			
-			//calculate whether deadline has passed, and if so forward to "submissionDeadline"
-			if (currentLearnerDate.after(tzSubmissionDeadline)) {
-				return mapping.findForward("submissionDeadline");
-			}
-			
+	    }
+	    itemDTO.setAllowedByParent(isAllowedByParent);
+
+	    // checks whether this TaskListItem shoud be displayed open or close
+	    boolean isDisplayedOpen = true;
+	    if ((item.getDescription() != null) && (item.getDescription().length() > 1000)) {
+		isDisplayedOpen = false;
+	    }
+	    itemDTO.setDisplayedOpen(isDisplayedOpen);
+
+	    // sets whether the previous TaskListItem was completed
+	    itemDTO.setPreviousTaskCompleted(isPreviousTaskCompleted);
+	    isPreviousTaskCompleted = item.isComplete();
+
+	    // filter out comments and attachments which belong to another group
+	    Set filteredComments = new TreeSet<TaskListItemComment>(new TaskListItemCommentComparator());
+	    Set filteredAttachments = new TreeSet<TaskListItemAttachment>(new TaskListItemAttachmentComparator());
+	    if (mode.isLearner()) {
+
+		List<TaskListUser> grouppedUsers = service.getUserListBySessionId(sessionId);
+		Set<TaskListItemComment> comments = item.getComments();
+		Set<TaskListItemAttachment> attachments = item.getAttachments();
+
+		for (TaskListItemComment comment : comments) {
+		    for (TaskListUser grouppedUser : grouppedUsers) {
+			if (grouppedUser.getUserId().equals(comment.getCreateBy().getUserId()))
+			    filteredComments.add(comment);
+		    }
 		}
-				
-		sessionMap.put(TaskListConstants.ATTR_RESOURCE,taskList);
-		
-		return mapping.findForward(TaskListConstants.SUCCESS);
-	}
-	
-	/**
-	 * Mark taskList item as complete status. 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
-		
-		doComplete(request);
-		
-		ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig(TaskListConstants.SUCCESS));
-		redirect.addParameter(AttributeNames.ATTR_MODE, mode);
-		redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-		return  redirect;
-	}
-	
-	/**
-	 * Finish learning session. 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		
-		//get back SessionMap
-		String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 
-		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		
-		//auto run mode, when use finish the only one taskList item, mark it as complete then finish this activity as well.
-		String taskListItemUid = request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID);
-		if(taskListItemUid != null){
-			doComplete(request);
-			//NOTE:So far this flag is useless(31/08/2006).
-			//set flag, then finish page can know redir target is parent(AUTO_RUN) or self(normal)
-			request.setAttribute(TaskListConstants.ATTR_RUN_AUTO,true);
-		}else
-			request.setAttribute(TaskListConstants.ATTR_RUN_AUTO,false);
-		
-		if(!validateBeforeFinish(request, sessionMapID))
-			return mapping.getInputForward();
-		
-		ITaskListService service = getTaskListService();
-		// get sessionId from HttpServletRequest
-		String nextActivityUrl = null ;
-		try {
-			HttpSession ss = SessionManager.getSession();
-			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			Long userID = new Long(user.getUserID().longValue());
-			
-			nextActivityUrl = service.finishToolSession(sessionId,userID);
-			request.setAttribute(TaskListConstants.ATTR_NEXT_ACTIVITY_URL,nextActivityUrl);
-		} catch (TaskListException e) {
-			log.error("Failed get next activity url:" + e.getMessage());
+		for (TaskListItemAttachment attachment : attachments) {
+		    for (TaskListUser grouppedUser : grouppedUsers) {
+			if (grouppedUser.getUserId().equals(attachment.getCreateBy().getUserId()))
+			    filteredAttachments.add(attachment);
+		    }
 		}
-		
-		return  mapping.findForward(TaskListConstants.SUCCESS);
+	    } else {
+		filteredComments = item.getComments();
+		filteredAttachments = item.getAttachments();
+	    }
+	    itemDTO.setComments(filteredComments);
+	    itemDTO.setAttachments(filteredAttachments);
+
+	    itemDTOs.add(itemDTO);
 	}
-	
-	/**
-	 * Initial page for add taskList item (single file or URL).
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward addTask(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		TaskListItemForm itemForm = (TaskListItemForm) form;
-		itemForm.setMode(WebUtil.readStrParam(request, AttributeNames.ATTR_MODE));
-		itemForm.setSessionMapID(WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID));
-		return mapping.findForward(TaskListConstants.SUCCESS);
-	}
-	
-	/**
-	 * Save new user task into database.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward saveNewTask(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		//get back SessionMap
-		String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		
-		TaskListItemForm itemForm = (TaskListItemForm)form;
-		ActionErrors errors = validateTaskListItem(itemForm);
-		
-		if(!errors.isEmpty()){
-			this.addErrors(request,errors);
-			request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-			return mapping.findForward("task");
-		}
-		
-		//create a new TaskListItem
-		TaskListItem item = new TaskListItem(); 
-		ITaskListService service = getTaskListService();
-		Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
-		TaskListUser taskListUser = getCurrentUser(service,sessionId);
-		item.setTitle(itemForm.getTitle());
-		item.setDescription(itemForm.getDescription());
-		item.setCreateDate(new Timestamp(new Date().getTime()));
-		item.setCreateByAuthor(false);
-		item.setCreateBy(taskListUser);
-		
-		//setting SequenceId
-		TaskList taskList = (TaskList) sessionMap.get(TaskListConstants.ATTR_RESOURCE);
-		Set<TaskListItem> taskListItems = taskList.getTaskListItems();
-		int maxSeq = 0;
-		for (TaskListItem dbItem : taskListItems) {
-			if (dbItem.getSequenceId() > maxSeq) maxSeq = dbItem.getSequenceId();
-		}
-		maxSeq++;
-		item.setSequenceId(maxSeq);
-		
-		taskListItems.add(item);
-		service.saveOrUpdateTaskList(taskList);
 
-		//redirect
-		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		request.setAttribute(AttributeNames.ATTR_MODE, mode);
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-		return mapping.findForward(TaskListConstants.SUCCESS);
+	// construct taskList dto field
+
+	Integer numberCompletedTasks = service.getNumTasksCompletedByUser(sessionId, taskListUser.getUserId());
+	Integer minimumNumberTasks = taskList.getMinimumNumberTasks();
+	if ((minimumNumberTasks - numberCompletedTasks) > 0) {
+	    String MinimumNumberTasksStr = service.getMessageService().getMessage("lable.learning.minimum.view.number",
+		    new Object[] { minimumNumberTasks, numberCompletedTasks });
+	    taskList.setMinimumNumberTasksErrorStr(MinimumNumberTasksStr);
 	}
-	
-	
-	/**
-	 * Adds new user commment.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward addNewComment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		TaskListItemForm taskListItemForm = (TaskListItemForm) form;
-		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(taskListItemForm.getSessionMapID());
-		request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-		Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
 
-		String commentMessage = taskListItemForm.getComment();
-		if(commentMessage == null || StringUtils.isBlank(commentMessage))
-			return mapping.findForward("refresh");
-		
-		TaskListItemComment comment = new TaskListItemComment();
-		comment.setComment(commentMessage);
-		UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-		ITaskListService service = getTaskListService();
-		TaskListUser taskListUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()),sessionId);
-		comment.setCreateBy(taskListUser);
-		comment.setCreateDate(new Timestamp(new Date().getTime()));
-		
-		//persist TaskListItem changes in DB 
-		Long itemUid =  new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
-		TaskListItem dbItem = service.getTaskListItemByUid(itemUid);
-		Set<TaskListItemComment> dbComments = dbItem.getComments();
-		dbComments.add(comment);
-		service.saveOrUpdateTaskListItem(dbItem);
-				
-		//to make available new changes be visible in jsp page
-		sessionMap.put(TaskListConstants.ATTR_TASK_LIST_ITEM, dbItem);
-		
-//		form.reset(mapping, request);
-		
-		ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig(TaskListConstants.SUCCESS));
-		redirect.addParameter(AttributeNames.ATTR_MODE, mode);
-		redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-		return  redirect;
+	// basic information
+	sessionMap.put(TaskListConstants.ATTR_TITLE, taskList.getTitle());
+	sessionMap.put(TaskListConstants.ATTR_FINISH_LOCK, lock);
+	sessionMap.put(TaskListConstants.ATTR_USER_FINISHED, taskListUser != null && taskListUser.isSessionFinished());
+	sessionMap.put(TaskListConstants.ATTR_USER_VERIFIED_BY_MONITOR, taskListUser.isVerifiedByMonitor());
+	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+	sessionMap.put(AttributeNames.ATTR_MODE, mode);
+	sessionMap.put(TaskListConstants.ATTR_TASK_LIST_ITEM_DTOS, itemDTOs);
+	// reflection information
+	sessionMap.put(TaskListConstants.ATTR_REFLECTION_ON, taskList.isReflectOnActivity());
+	sessionMap.put(TaskListConstants.ATTR_REFLECTION_INSTRUCTION, taskList.getReflectInstructions());
+	sessionMap.put(TaskListConstants.ATTR_REFLECTION_ENTRY, entryText);
+
+	// add define later support
+	if (taskList.isDefineLater()) {
+	    return mapping.findForward("defineLater");
 	}
-	
-	/**
-	 * Uploads specified file to repository and associates it with current TaskListItem.
-	 * @param mapping
-	 * @param form
-	 * @param type
-	 * @param request
-	 * @return
-	 * @throws UploadTaskListFileException 
-	 */
-	private ActionForward uploadFile(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws UploadTaskListFileException {
-		
-		TaskListItemForm taskListItemForm = (TaskListItemForm) form;
-		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(taskListItemForm.getSessionMapID());
-		request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-		Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
 
-		FormFile file = (FormFile) taskListItemForm.getUploadedFile();
-		
-		if(file == null || StringUtils.isBlank(file.getFileName()))
-			return mapping.findForward("refresh");
-		
-		//validate file size
-		ActionMessages errors = new ActionMessages();
-		FileValidatorUtil.validateFileSize(file, true, errors );
-		if(!errors.isEmpty()){
-			this.saveErrors(request, errors);
-			return mapping.findForward("refresh");
-		}
-		
-		//upload to repository
-		ITaskListService service = getTaskListService();
-		UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-		TaskListUser taskListUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()),sessionId);
-		TaskListItemAttachment  att = service.uploadTaskListItemFile(file, taskListUser);
-		
-		//persist TaskListItem changes in DB 
-		Long itemUid =  new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
-		TaskListItem dbItem = service.getTaskListItemByUid(itemUid);
-		Set<TaskListItemAttachment> dbAttachments = dbItem.getAttachments();
-		dbAttachments.add(att);
-		service.saveOrUpdateTaskListItem(dbItem);
-		
-		//to make available new changes be visible in jsp page
-		sessionMap.put(TaskListConstants.ATTR_TASK_LIST_ITEM, dbItem);
-		
-//		form.reset(mapping, request);
-		
-		ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig(TaskListConstants.SUCCESS));
-		redirect.addParameter(AttributeNames.ATTR_MODE, mode);
-		redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-		return  redirect;
+	// set contentInUse flag to true!
+	taskList.setContentInUse(true);
+	taskList.setDefineLater(false);
+	service.saveOrUpdateTaskList(taskList);
+
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+		request, getServlet().getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
+	// check if there is submission deadline
+	Date submissionDeadline = taskList.getSubmissionDeadline();
+	if (submissionDeadline != null) {
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone learnerTimeZone = learnerDto.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
+	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
+	    sessionMap.put(TaskListConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline);
+
+	    // calculate whether deadline has passed, and if so forward to "submissionDeadline"
+	    if (currentLearnerDate.after(tzSubmissionDeadline)) {
+		return mapping.findForward("submissionDeadline");
+	    }
+
 	}
-	
-	/**
-	 * Display empty reflection form.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward newReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,	HttpServletResponse response) {
-		
-		//get session value
-		String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
 
-		if(!validateBeforeFinish(request, sessionMapID))
-			return mapping.getInputForward();
-		
-		ReflectionForm refForm = (ReflectionForm) form;
-		HttpSession ss = SessionManager.getSession();
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		
-		refForm.setUserID(user.getUserID());
-		refForm.setSessionMapID(sessionMapID);
-		
-//		 get the existing reflection entry
-		ITaskListService submitFilesService = getTaskListService();
-		
-		SessionMap map = (SessionMap)request.getSession().getAttribute(sessionMapID);
-		Long toolSessionID = (Long)map.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, TaskListConstants.TOOL_SIGNATURE, user.getUserID());
-		
-		if (entry != null) {
-			refForm.setEntryText(entry.getEntry());		
-		}
-		
-		return mapping.findForward(TaskListConstants.SUCCESS);
+	sessionMap.put(TaskListConstants.ATTR_RESOURCE, taskList);
+
+	return mapping.findForward(TaskListConstants.SUCCESS);
+    }
+
+    /**
+     * Mark taskList item as complete status.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
+
+	doComplete(request);
+
+	ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig(TaskListConstants.SUCCESS));
+	redirect.addParameter(AttributeNames.ATTR_MODE, mode);
+	redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+	return redirect;
+    }
+
+    /**
+     * Finish learning session.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	// get back SessionMap
+	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	// auto run mode, when use finish the only one taskList item, mark it as complete then finish this activity as
+	// well.
+	String taskListItemUid = request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID);
+	if (taskListItemUid != null) {
+	    doComplete(request);
+	    // NOTE:So far this flag is useless(31/08/2006).
+	    // set flag, then finish page can know redir target is parent(AUTO_RUN) or self(normal)
+	    request.setAttribute(TaskListConstants.ATTR_RUN_AUTO, true);
+	} else
+	    request.setAttribute(TaskListConstants.ATTR_RUN_AUTO, false);
+
+	if (!validateBeforeFinish(request, sessionMapID))
+	    return mapping.getInputForward();
+
+	ITaskListService service = getTaskListService();
+	// get sessionId from HttpServletRequest
+	String nextActivityUrl = null;
+	try {
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    Long userID = new Long(user.getUserID().longValue());
+
+	    nextActivityUrl = service.finishToolSession(sessionId, userID);
+	    request.setAttribute(TaskListConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl);
+	} catch (TaskListException e) {
+	    log.error("Failed get next activity url:" + e.getMessage());
 	}
-	/**
-	 * Submit reflection form input database.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward submitReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		ReflectionForm refForm = (ReflectionForm) form;
-		Integer userId = refForm.getUserID();
-		
-		String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		
-		ITaskListService service = getTaskListService();
 
-		// check for existing notebook entry
-		NotebookEntry entry = service.getEntry(sessionId,
-				CoreNotebookConstants.NOTEBOOK_TOOL,
-				TaskListConstants.TOOL_SIGNATURE, userId);
+	return mapping.findForward(TaskListConstants.SUCCESS);
+    }
 
-		if (entry == null) {
-			// create new entry
-			service.createNotebookEntry(sessionId,
-					CoreNotebookConstants.NOTEBOOK_TOOL,
-					TaskListConstants.TOOL_SIGNATURE, userId, refForm
-							.getEntryText());
-		} else {
-			// update existing entry
-			entry.setEntry(refForm.getEntryText());
-			entry.setLastModified(new Date());
-			service.updateEntry(entry);
-		}
+    /**
+     * Initial page for add taskList item (single file or URL).
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward addTask(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	TaskListItemForm itemForm = (TaskListItemForm) form;
+	itemForm.setMode(WebUtil.readStrParam(request, AttributeNames.ATTR_MODE));
+	itemForm.setSessionMapID(WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID));
+	return mapping.findForward(TaskListConstants.SUCCESS);
+    }
 
-		return finish(mapping, form, request, response);
+    /**
+     * Save new user task into database.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward saveNewTask(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	// get back SessionMap
+	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	TaskListItemForm itemForm = (TaskListItemForm) form;
+	ActionErrors errors = validateTaskListItem(itemForm);
+
+	if (!errors.isEmpty()) {
+	    this.addErrors(request, errors);
+	    request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	    return mapping.findForward("task");
 	}
-	
 
-	//*************************************************************************************
-	// Private method 
-	//*************************************************************************************
-	private ITaskListService getTaskListService() {
-	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-	      return (ITaskListService) wac.getBean(TaskListConstants.RESOURCE_SERVICE);
+	// create a new TaskListItem
+	TaskListItem item = new TaskListItem();
+	ITaskListService service = getTaskListService();
+	Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
+	TaskListUser taskListUser = getCurrentUser(service, sessionId);
+	item.setTitle(itemForm.getTitle());
+	item.setDescription(itemForm.getDescription());
+	item.setCreateDate(new Timestamp(new Date().getTime()));
+	item.setCreateByAuthor(false);
+	item.setCreateBy(taskListUser);
+
+	// setting SequenceId
+	TaskList taskList = (TaskList) sessionMap.get(TaskListConstants.ATTR_RESOURCE);
+	Set<TaskListItem> taskListItems = taskList.getTaskListItems();
+	int maxSeq = 0;
+	for (TaskListItem dbItem : taskListItems) {
+	    if (dbItem.getSequenceId() > maxSeq)
+		maxSeq = dbItem.getSequenceId();
 	}
+	maxSeq++;
+	item.setSequenceId(maxSeq);
 
-	private TaskListUser getCurrentUser(ITaskListService service, Long sessionId) {
-		//try to get form system session
-		HttpSession ss = SessionManager.getSession();
-		//get back login user DTO
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		TaskListUser taskListUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()),sessionId);
-		
-		if(taskListUser == null){
-			TaskListSession session = service.getTaskListSessionBySessionId(sessionId);
-			taskListUser = new TaskListUser(user,session);
-			service.createUser(taskListUser);
-		}
-		return taskListUser;
+	taskListItems.add(item);
+	service.saveOrUpdateTaskList(taskList);
+
+	// redirect
+	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode);
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+	return mapping.findForward(TaskListConstants.SUCCESS);
+    }
+
+    /**
+     * Adds new user commment.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward addNewComment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	TaskListItemForm taskListItemForm = (TaskListItemForm) form;
+	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(taskListItemForm.getSessionMapID());
+	request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
+
+	boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness"));
+	String commentMessage = isTestHarness ? request.getParameter("comment__textarea") : taskListItemForm
+		.getComment();
+	if (commentMessage == null || StringUtils.isBlank(commentMessage))
+	    return mapping.findForward("refresh");
+
+	TaskListItemComment comment = new TaskListItemComment();
+	comment.setComment(commentMessage);
+	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	ITaskListService service = getTaskListService();
+	TaskListUser taskListUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), sessionId);
+	comment.setCreateBy(taskListUser);
+	comment.setCreateDate(new Timestamp(new Date().getTime()));
+
+	// persist TaskListItem changes in DB
+	Long itemUid = new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
+	TaskListItem dbItem = service.getTaskListItemByUid(itemUid);
+	Set<TaskListItemComment> dbComments = dbItem.getComments();
+	dbComments.add(comment);
+	service.saveOrUpdateTaskListItem(dbItem);
+
+	// to make available new changes be visible in jsp page
+	sessionMap.put(TaskListConstants.ATTR_TASK_LIST_ITEM, dbItem);
+
+	// form.reset(mapping, request);
+
+	ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig(TaskListConstants.SUCCESS));
+	redirect.addParameter(AttributeNames.ATTR_MODE, mode);
+	redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+	return redirect;
+    }
+
+    /**
+     * Uploads specified file to repository and associates it with current TaskListItem.
+     * 
+     * @param mapping
+     * @param form
+     * @param type
+     * @param request
+     * @return
+     * @throws UploadTaskListFileException
+     */
+    private ActionForward uploadFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws UploadTaskListFileException {
+
+	TaskListItemForm taskListItemForm = (TaskListItemForm) form;
+	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(taskListItemForm.getSessionMapID());
+	request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
+
+	FormFile file = (FormFile) taskListItemForm.getUploadedFile();
+
+	if (file == null || StringUtils.isBlank(file.getFileName()))
+	    return mapping.findForward("refresh");
+
+	// validate file size
+	ActionMessages errors = new ActionMessages();
+	FileValidatorUtil.validateFileSize(file, true, errors);
+	if (!errors.isEmpty()) {
+	    this.saveErrors(request, errors);
+	    return mapping.findForward("refresh");
 	}
-	private TaskListUser getSpecifiedUser(ITaskListService service, Long sessionId, Integer userId) {
-		TaskListUser taskListUser = service.getUserByIDAndSession(new Long(userId.intValue()),sessionId);
-		if ( taskListUser == null ) {
-			log.error("Unable to find specified user for taskList activity. Screens are likely to fail. SessionId="
-					+sessionId+" UserId="+userId);
-		}
-		return taskListUser;
+
+	// upload to repository
+	ITaskListService service = getTaskListService();
+	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	TaskListUser taskListUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), sessionId);
+	TaskListItemAttachment att = service.uploadTaskListItemFile(file, taskListUser);
+
+	// persist TaskListItem changes in DB
+	Long itemUid = new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
+	TaskListItem dbItem = service.getTaskListItemByUid(itemUid);
+	Set<TaskListItemAttachment> dbAttachments = dbItem.getAttachments();
+	dbAttachments.add(att);
+	service.saveOrUpdateTaskListItem(dbItem);
+
+	// to make available new changes be visible in jsp page
+	sessionMap.put(TaskListConstants.ATTR_TASK_LIST_ITEM, dbItem);
+
+	// form.reset(mapping, request);
+
+	ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig(TaskListConstants.SUCCESS));
+	redirect.addParameter(AttributeNames.ATTR_MODE, mode);
+	redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+	return redirect;
+    }
+
+    /**
+     * Display empty reflection form.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward newReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	// get session value
+	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
+
+	if (!validateBeforeFinish(request, sessionMapID))
+	    return mapping.getInputForward();
+
+	ReflectionForm refForm = (ReflectionForm) form;
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	refForm.setUserID(user.getUserID());
+	refForm.setSessionMapID(sessionMapID);
+
+	// get the existing reflection entry
+	ITaskListService submitFilesService = getTaskListService();
+
+	SessionMap map = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
+		TaskListConstants.TOOL_SIGNATURE, user.getUserID());
+
+	if (entry != null) {
+	    refForm.setEntryText(entry.getEntry());
 	}
 
-	/**
-	 * @param itemForm
-	 * @return
-	 */
-	private ActionErrors validateTaskListItem(TaskListItemForm itemForm) {
-		ActionErrors errors = new ActionErrors();
-		if(StringUtils.isBlank(itemForm.getTitle()))
-			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(TaskListConstants.ERROR_MSG_TITLE_BLANK));
-		
-		return errors;
+	return mapping.findForward(TaskListConstants.SUCCESS);
+    }
+
+    /**
+     * Submit reflection form input database.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward submitReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	ReflectionForm refForm = (ReflectionForm) form;
+	Integer userId = refForm.getUserID();
+
+	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	ITaskListService service = getTaskListService();
+
+	// check for existing notebook entry
+	NotebookEntry entry = service.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		TaskListConstants.TOOL_SIGNATURE, userId);
+
+	if (entry == null) {
+	    // create new entry
+	    service.createNotebookEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    TaskListConstants.TOOL_SIGNATURE, userId, refForm.getEntryText());
+	} else {
+	    // update existing entry
+	    entry.setEntry(refForm.getEntryText());
+	    entry.setLastModified(new Date());
+	    service.updateEntry(entry);
 	}
-	
-	private boolean validateBeforeFinish(HttpServletRequest request, String sessionMapID) {
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		
-		HttpSession ss = SessionManager.getSession();
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		Long userID = new Long(user.getUserID().longValue());
-		
-		ITaskListService service = getTaskListService();
-		
-		int numberCompletedTasks = service.getNumTasksCompletedByUser(sessionId, userID);
-		int minimumNumberTasks = service.getTaskListBySessionId(sessionId).getMinimumNumberTasks();
-		//if current user view less than reqired view count number, then just return error message.
-		if((minimumNumberTasks - numberCompletedTasks) > 0){
-			ActionErrors errors = new ActionErrors();
-			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("lable.learning.minimum.view.number",minimumNumberTasks, numberCompletedTasks));
-			this.addErrors(request,errors);
-			return false;
-		}
-		
-		return true;
+
+	return finish(mapping, form, request, response);
+    }
+
+    // *************************************************************************************
+    // Private method
+    // *************************************************************************************
+    private ITaskListService getTaskListService() {
+	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		.getServletContext());
+	return (ITaskListService) wac.getBean(TaskListConstants.RESOURCE_SERVICE);
+    }
+
+    private TaskListUser getCurrentUser(ITaskListService service, Long sessionId) {
+	// try to get form system session
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	TaskListUser taskListUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), sessionId);
+
+	if (taskListUser == null) {
+	    TaskListSession session = service.getTaskListSessionBySessionId(sessionId);
+	    taskListUser = new TaskListUser(user, session);
+	    service.createUser(taskListUser);
 	}
-	
-	
-	/**
-	 * Set complete flag for given taskList item.
-	 * @param request
-	 * @param sessionId 
-	 */
-	private void doComplete(HttpServletRequest request) {
-		//get back sessionMap
-		String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		
-		Long taskListItemUid = new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
-		ITaskListService service = getTaskListService();
-		HttpSession ss = SessionManager.getSession();
-		//get back login user DTO
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		
-		Long sessionId =  (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
-		service.setItemComplete(taskListItemUid, new Long(user.getUserID().intValue()), sessionId);
-		sessionMapID = "4";
+	return taskListUser;
+    }
+
+    private TaskListUser getSpecifiedUser(ITaskListService service, Long sessionId, Integer userId) {
+	TaskListUser taskListUser = service.getUserByIDAndSession(new Long(userId.intValue()), sessionId);
+	if (taskListUser == null) {
+	    log.error("Unable to find specified user for taskList activity. Screens are likely to fail. SessionId="
+		    + sessionId + " UserId=" + userId);
 	}
+	return taskListUser;
+    }
 
+    /**
+     * @param itemForm
+     * @return
+     */
+    private ActionErrors validateTaskListItem(TaskListItemForm itemForm) {
+	ActionErrors errors = new ActionErrors();
+	if (StringUtils.isBlank(itemForm.getTitle()))
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(TaskListConstants.ERROR_MSG_TITLE_BLANK));
+
+	return errors;
+    }
+
+    private boolean validateBeforeFinish(HttpServletRequest request, String sessionMapID) {
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	Long userID = new Long(user.getUserID().longValue());
+
+	ITaskListService service = getTaskListService();
+
+	int numberCompletedTasks = service.getNumTasksCompletedByUser(sessionId, userID);
+	int minimumNumberTasks = service.getTaskListBySessionId(sessionId).getMinimumNumberTasks();
+	// if current user view less than reqired view count number, then just return error message.
+	if ((minimumNumberTasks - numberCompletedTasks) > 0) {
+	    ActionErrors errors = new ActionErrors();
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("lable.learning.minimum.view.number",
+		    minimumNumberTasks, numberCompletedTasks));
+	    this.addErrors(request, errors);
+	    return false;
+	}
+
+	return true;
+    }
+
+    /**
+     * Set complete flag for given taskList item.
+     * 
+     * @param request
+     * @param sessionId
+     */
+    private void doComplete(HttpServletRequest request) {
+	// get back sessionMap
+	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	Long taskListItemUid = new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
+	ITaskListService service = getTaskListService();
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
+	service.setItemComplete(taskListItemUid, new Long(user.getUserID().intValue()), sessionId);
+	sessionMapID = "4";
+    }
+
 }
Index: lams_tool_task/web/pages/learning/parts/itemdetails.jsp
===================================================================
diff -u -rc9b4849d43133cec110d8940dd4f86dac97e89e8 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_task/web/pages/learning/parts/itemdetails.jsp	(.../itemdetails.jsp)	(revision c9b4849d43133cec110d8940dd4f86dac97e89e8)
+++ lams_tool_task/web/pages/learning/parts/itemdetails.jsp	(.../itemdetails.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -1,5 +1,5 @@
-<html:form action="learning/addNewComment" method="post" enctype="multipart/form-data">
 
+
 	<p>${item.description}</p>
 <!-- 	
 					<c:if test="${mode != 'teacher' && (!itemDTO.commentRequirementsMet || !itemDTO.attachmentRequirementsMet)}">
@@ -19,72 +19,69 @@
 					</c:if>
  -->
 	<c:if test="${item.commentsFilesAllowed}">
-				
+		
 		<!-- Comments Part -->
 		<c:if test="${item.commentsAllowed}">
-
-			<c:choose>
-				<c:when test="${(mode != 'teacher') && !itemDTO.commentRequirementsMet}">
-					<div class="info space-bottom">
-						<fmt:message key="label.learning.info.add.comment.required" />
+			<html:form action="/learning/addNewComment.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
+					   method="post" enctype="multipart/form-data">
+				<c:choose>
+					<c:when test="${(mode != 'teacher') && !itemDTO.commentRequirementsMet}">
+						<div class="info space-bottom">
+							<fmt:message key="label.learning.info.add.comment.required" />
+						</div>
+					</c:when>
+					<c:otherwise>
+						<br/>
+					</c:otherwise>
+				</c:choose>
+						
+				<%@ include file="commentlist.jsp"%>
+					
+				<c:if test="${mode != 'teacher'}">
+					<div class="field-name">
+						<fmt:message key="label.preview.add.comment" />
 					</div>
-				</c:when>
-				<c:otherwise>
-					<br/>
-				</c:otherwise>
-			</c:choose>
 					
-			<%@ include file="commentlist.jsp"%>
-				
-			<c:if test="${mode != 'teacher'}">
-				<div class="field-name">
-					<fmt:message key="label.preview.add.comment" />
-				</div>
-				
-				<div >
- 					<!-- <html:textarea property="comment" rows="2" style="width: 65%;" />  -->
-					<lams:STRUTS-textarea property="comment" rows="2" style="width: 65%;" index="${item.uid}"/>
-	
-					<html:button property="commentButton" onclick="javascript:addNewComment(this.form, ${item.uid});" styleClass="button" style="position:relative; left:40px; top:-35px;">
-						<fmt:message key="label.preview.post" />
-					</html:button>
-				</div>
-	
-			</c:if>
-		</c:if>
+					<div >
+	 					<!-- <html:textarea property="comment" rows="2" style="width: 65%;" />  -->
+						<lams:STRUTS-textarea property="comment" rows="2" style="width: 65%;" index="${item.uid}"/>
 						
-		<!-- Uploaded Attachments -->	
-		<c:if test="${item.filesAllowed}">
-		
-			<c:choose>
-				<c:when test="${(mode != 'teacher') && !itemDTO.attachmentRequirementsMet}">
-					<div class="info space-bottom">
-						<fmt:message key="label.learning.info.upload.file.required" />
+						<input type="submit" name="commentButton" value='<fmt:message key="label.preview.post" />'
+							   class="button"style="position:relative; left:40px; top:-35px;" />
 					</div>
-				</c:when>
-				<c:otherwise>
-					<br/>
-				</c:otherwise>
-			</c:choose>
 		
-			<%@ include file="filelist.jsp"%>
-						
-			<c:if test="${sessionMap.mode != 'teacher'}">
-				<div class="field-name">
-					<fmt:message key="label.preview.upload.file" />
-				</div>
-				<html:file property="uploadedFile">
-					<fmt:message key="label.authoring.choosefile.button" />
-				</html:file>
-									 
-				<html:button property="uploadedFileButton" onclick="javascript:doUpload(this.form, ${item.uid});" styleClass="button">
-					<fmt:message key="label.preview.upload.button" /> 
-				</html:button>
-									
-			</c:if>
+				</c:if>
+			</html:form>
 		</c:if>
 			
-	</c:if>
-
-</html:form>
-
+		<!-- Uploaded Attachments -->	
+		<c:if test="${item.filesAllowed}">
+			<html:form action="/learning/uploadFile.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
+					   method="post" enctype="multipart/form-data">
+				<c:choose>
+					<c:when test="${(mode != 'teacher') && !itemDTO.attachmentRequirementsMet}">
+						<div class="info space-bottom">
+							<fmt:message key="label.learning.info.upload.file.required" />
+						</div>
+					</c:when>
+					<c:otherwise>
+						<br/>
+					</c:otherwise>
+				</c:choose>
+			
+				<%@ include file="filelist.jsp"%>
+							
+				<c:if test="${sessionMap.mode != 'teacher'}">
+					<div class="field-name">
+						<fmt:message key="label.preview.upload.file" />
+					</div>
+					<html:file property="uploadedFile">
+						<fmt:message key="label.authoring.choosefile.button" />
+					</html:file>
+										 
+					<input type="submit" name="uploadedFileButton" value='<fmt:message key="label.preview.upload.button" />'
+						   class="button" />										
+				</c:if>
+			</html:form>
+		</c:if>
+	</c:if>
\ No newline at end of file
Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -4,18 +4,6 @@
  
 <script language="JavaScript" type="text/JavaScript">
 	<!--
-	    function doUpload(myForm, itemUid) {
-     		
-       		myForm.action = "<c:url value='/learning/uploadFile.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid='/>" + itemUid;
-       		myForm.submit();
-    	}
-    	
-    	 function addNewComment(myForm, itemUid) {
-     		
-       		myForm.action = "<c:url value='/learning/addNewComment.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid='/>" + itemUid;
-       		myForm.submit();
-    	}
-	
 		$(document).ready(function() {
 
 			$("a.toggling-link").click(function() {
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -51,7 +51,7 @@
 			if (actionMethod == 'learnerFinished') {
 				document.getElementById("finishButton").disabled = true;
 			}
-			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.action += "&dispatch=" + actionMethod; 
 			document.VoteLearningForm.submit();
 		}
 	</script>
@@ -70,7 +70,6 @@
 			<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
 			<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
 			
-			<html:hidden property="dispatch" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="userID" />
 			<html:hidden property="revisitingUser" />
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -144,7 +144,6 @@
 
 		<html:form onsubmit="return validate();" action="/learning?validate=false&dispatch=continueOptionsCombined" method="POST" target="_self">
 			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-			<html:hidden property="dispatch" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="userID" />
 			<html:hidden property="revisitingUser" />
@@ -183,50 +182,50 @@
 				</div>
 			</c:if>
 
-			<p>
-				<c:out value="${voteGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
-			</p>
-
-			<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCount > 1}">
-				<p>&nbsp;</p>
 				<p>
-					<fmt:message key="label.nominations.available">
-						<fmt:param>
-							<c:out value="${voteGeneralLearnerFlowDTO.maxNominationCount}" />
-						</fmt:param>
-					</fmt:message>
+				<c:out value="${voteGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
 				</p>
-			</c:if>
 
-			<table class="shading-bg">
-				<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
+				<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCount > 1}">
+					<p>&nbsp;</p>
+					<p>
+						<fmt:message key="label.nominations.available">
+							<fmt:param>
+								<c:out value="${voteGeneralLearnerFlowDTO.maxNominationCount}" />
+							</fmt:param>
+						</fmt:message>
+					</p>
+				</c:if>
 
-					<tr>
+				<table class="shading-bg">
+					<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
+
+						<tr>
 						<td width="1px">
-							<input type="checkbox" name="checkedVotes" class="noBorder"
-								value="${subEntry.key}" onClick="updateCount(this);">
-						</td>
+								<input type="checkbox" name="checkedVotes" class="noBorder"
+									value="${subEntry.key}" onClick="updateCount(this);">
+							</td>
 
-						<td>
-							<c:out value="${subEntry.value}" escapeXml="false" />
-						</td>
-					</tr>
+							<td>
+								<c:out value="${subEntry.value}" escapeXml="false" />
+							</td>
+						</tr>
 						
-				</c:forEach>
-			</table>
+					</c:forEach>
+				</table>
 
-			<c:if test="${VoteLearningForm.allowTextEntry == 'true'}">
-				<strong> <fmt:message key="label.other" />: </strong>
-				<html:text property="userEntry" size="30" maxlength="100" />
-			</c:if>
+				<c:if test="${VoteLearningForm.allowTextEntry == 'true'}">
+					<strong> <fmt:message key="label.other" />: </strong>
+					<html:text property="userEntry" size="30" maxlength="100" />
+				</c:if>
 
-			<html:hidden property="donePreview" />
+				<html:hidden property="donePreview" />
 
-			<div class="space-bottom-top">
-				<html:submit property="continueOptionsCombined" styleClass="button">
-					<fmt:message key="label.submit.vote" />
-				</html:submit>
-			</div>
+				<div class="space-bottom-top">
+						<html:submit property="continueOptionsCombined" styleClass="button">
+							<fmt:message key="label.submit.vote" />
+						</html:submit>
+				</div>
 				
 		</html:form>
 	</div>
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -41,7 +41,7 @@
 			if (actionMethod == 'learnerFinished') {
 				document.getElementById("finishButton").disabled = true;
 			}
-			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.action += "&dispatch=" + actionMethod; 
 			document.VoteLearningForm.submit();
 		}
 	</script>
@@ -65,7 +65,6 @@
 			<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
 			<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
 			
-			<html:hidden property="dispatch" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="userID" />
 			<html:hidden property="revisitingUser" />
Index: lams_tool_vote/web/learning/mobile/AllNominations.jsp
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_vote/web/learning/mobile/AllNominations.jsp	(.../AllNominations.jsp)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/web/learning/mobile/AllNominations.jsp	(.../AllNominations.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -56,7 +56,7 @@
 			if (actionMethod == 'learnerFinished') {
 				document.getElementById("finishButton").disabled = true;
 			}
-			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.action += "&dispatch=" + actionMethod; 
 			document.VoteLearningForm.submit();
 		}
 	</script>
@@ -78,7 +78,6 @@
 			<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
 			<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
 			
-			<html:hidden property="dispatch" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="userID" />
 			<html:hidden property="revisitingUser" />
Index: lams_tool_vote/web/learning/mobile/AnswersContent.jsp
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_vote/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_vote/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -151,7 +151,6 @@
 
 		<html:form action="/learning?validate=false&dispatch=continueOptionsCombined" method="POST" target="_self">
 			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-			<html:hidden property="dispatch" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="userID" />
 			<html:hidden property="revisitingUser" />
Index: lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -45,7 +45,7 @@
 			if (actionMethod == 'learnerFinished') {
 				document.getElementById("finishButton").disabled = true;
 			}
-			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.action += "&dispatch=" + actionMethod; 
 			document.VoteLearningForm.submit();
 		}
 	</script>
@@ -74,7 +74,6 @@
 			<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
 			<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
 			
-			<html:hidden property="dispatch" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="userID" />
 			<html:hidden property="revisitingUser" />
Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -8,7 +8,7 @@
 	}
 	
 	function continueOrFinish(dispatch) {
-		document.getElementById("dispatch2").value = dispatch;
+		document.getElementById("learningButtonForm").action += "?dispatch=" + dispatch;
 		document.getElementById("learningButtonForm").submit();
 	}
 </script>
@@ -44,7 +44,6 @@
 </c:if>
 
 <html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningButtonForm">
-	<html:hidden property="dispatch" styleId = "dispatch2" value="finishActivity" />
 	<html:hidden property="toolSessionID" styleId="toolSessionID"/>
 	<html:hidden property="mode" value="${mode}" />	
 	<div class="space-bottom-top align-right" id="finishButtonDiv">
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -r95d3a8ab54accdb67b113b8fb22b607d99d8af91 -r883c4cc054a636dc8017da1b244b89bdaf0ff974
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 95d3a8ab54accdb67b113b8fb22b607d99d8af91)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
@@ -106,7 +106,6 @@
 	&nbsp; 
 
 	<html:form action="/learning" method="post"styleId="learningForm" enctype="multipart/form-data">
-		<html:hidden property="dispatch" styleId="dispatch" value="finishActivity" />
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="mode" />
 		<input type="hidden" name="userID" value="${userDTO.userId}"/>
@@ -473,7 +472,7 @@
 	
 	function submitWiki(dispatch)
 	{
-		document.getElementById("dispatch").value=dispatch;
+		document.getElementById("learningForm").action += "?dispatch=" + dispatch;
 		replaceJavascriptTokenAndSubmit("learningForm");
 	}