Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rcb2cfe5b40c7aee12c9e500ee7800b5fa679821f -rce8ce53765e38b46bd112a5933089d51bac130de
Binary files differ
Fisheye: Tag ce8ce53765e38b46bd112a5933089d51bac130de refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/web/util/TokenProcessor.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rce8ce53765e38b46bd112a5933089d51bac130de
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java	(.../ChooseActivityController.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java	(.../ChooseActivityController.java)	(revision ce8ce53765e38b46bd112a5933089d51bac130de)
@@ -34,7 +34,6 @@
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
-import org.lamsfoundation.lams.web.util.TokenProcessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
@@ -69,13 +68,6 @@
 	ActivityMapping actionMappings = LearningWebUtil
 		.getActivityMapping(this.applicationContext.getServletContext());
 
-	// check token
-	if (!TokenProcessor.getInstance().isTokenValid(request, true)) {
-	    // didn't come here from options page
-	    log.info("No valid token in request");
-	    return "error";
-	}
-
 	// Get learner and lesson details.
 	Integer learnerId = LearningWebUtil.getUserId();
 	LearnerProgress progress = LearningWebUtil.getLearnerProgress(request, learnerService);
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rce8ce53765e38b46bd112a5933089d51bac130de
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java	(.../DisplayOptionsActivityController.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java	(.../DisplayOptionsActivityController.java)	(revision ce8ce53765e38b46bd112a5933089d51bac130de)
@@ -41,7 +41,6 @@
 import org.lamsfoundation.lams.learningdesign.dto.ActivityURL;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.lamsfoundation.lams.web.util.TokenProcessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
@@ -119,8 +118,6 @@
 	form.setLessonID(learnerProgress.getLesson().getLessonId());
 	form.setProgressID(learnerProgress.getLearnerProgressId());
 
-	TokenProcessor.getInstance().saveToken(request);
-
 	LearningWebUtil.putActivityPositionInRequest(form.getActivityID(), request,
 		applicationContext.getServletContext());