Fisheye: Tag cf2f4262be6c89997e7e578dbcab3dd9e9c41ee0 refers to a dead (removed) revision in file `lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/TestAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ToolTestAction.java
===================================================================
diff -u -r6c544e839799a37a3be14d2e11e73cfa3de0a67d -rcf2f4262be6c89997e7e578dbcab3dd9e9c41ee0
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ToolTestAction.java	(.../ToolTestAction.java)	(revision 6c544e839799a37a3be14d2e11e73cfa3de0a67d)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ToolTestAction.java	(.../ToolTestAction.java)	(revision cf2f4262be6c89997e7e578dbcab3dd9e9c41ee0)
@@ -19,7 +19,7 @@
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
 import org.lamsfoundation.lams.learning.service.TestLearnerService;
-import org.lamsfoundation.lams.learning.web.form.TestForm;
+import org.lamsfoundation.lams.learning.web.form.ToolTestForm;
 
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
@@ -30,7 +30,7 @@
  * 
  * XDoclet definition:
  * 
- * @struts:action path="/toolTest" name="testForm" parameter="method"
+ * @struts:action path="/toolTest" name="toolTestForm" parameter="method"
  *                validate="false" scope="request"
  * @struts:action-forward name="display" path="/toolTest.jsp"
  * @struts:action-forward name="next" path=".requestDisplay"
@@ -52,7 +52,7 @@
 			ActionForm form,
 			HttpServletRequest request,
 			HttpServletResponse response) {
-		TestForm testForm = (TestForm)form;
+		ToolTestForm testForm = (ToolTestForm)form;
 		
 		if (testForm.getActivityId() == null) {
 			System.out.println("foobar");
Fisheye: Tag cf2f4262be6c89997e7e578dbcab3dd9e9c41ee0 refers to a dead (removed) revision in file `lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/TestForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ToolTestForm.java
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ToolTestForm.java	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ToolTestForm.java	(revision cf2f4262be6c89997e7e578dbcab3dd9e9c41ee0)
@@ -0,0 +1,27 @@
+/*
+ * Created on 27/01/2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learning.web.form;
+
+import org.apache.struts.action.ActionForm;
+
+/**
+ * 
+ * XDoclet definition:
+ * @struts:form name="toolTestForm"
+ */
+public class ToolTestForm extends ActionForm {
+	
+	private Long activityId;
+
+	public Long getActivityId() {
+		return activityId;
+	}
+	public void setActivityId(Long activityId) {
+		this.activityId = activityId;
+	}
+	
+}
Index: lams_learning/web/requestDisplayActivity.jsp
===================================================================
diff -u -rf06070060e824f3a3a74c417e4e4ad69779d2e06 -rcf2f4262be6c89997e7e578dbcab3dd9e9c41ee0
--- lams_learning/web/requestDisplayActivity.jsp	(.../requestDisplayActivity.jsp)	(revision f06070060e824f3a3a74c417e4e4ad69779d2e06)
+++ lams_learning/web/requestDisplayActivity.jsp	(.../requestDisplayActivity.jsp)	(revision cf2f4262be6c89997e7e578dbcab3dd9e9c41ee0)
@@ -12,16 +12,16 @@
 		<title>LAMS</title>
 	</head>
 	
+		<c:if test="${empty url}">
+			<bean:parameter id="url" name="url" />
+		</c:if>
+	
 		<script language="JavaScript" type="text/JavaScript"><!--
-				function redirectPage() {
-					setTimeout("doRedirect()", 2000);
-				}
 				function doRedirect() {
-					//top.frames['LDContent'].location.href = "<c:out value='${activity.activityURLs[0].url}' />";
 					var parentWindow = window.parent;
-					parentWindow.location.href = "Activity.do?method=display&activityId=<c:out value='${activityId}' />";
+					//parentWindow.location.href = "Activity.do?method=display&activityId=<c:out value='${activityId}' />";
+					parentWindow.location.href = "<c:out value='${url}' escapeXml='false' />";
 				}
-				//window.onload = redirectPage;
 				window.onload = doRedirect;
 				//-->
 			//-->
Index: lams_learning/web/toolTest.jsp
===================================================================
diff -u -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e -rcf2f4262be6c89997e7e578dbcab3dd9e9c41ee0
--- lams_learning/web/toolTest.jsp	(.../toolTest.jsp)	(revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e)
+++ lams_learning/web/toolTest.jsp	(.../toolTest.jsp)	(revision cf2f4262be6c89997e7e578dbcab3dd9e9c41ee0)
@@ -21,7 +21,8 @@
 			this activity has already been completed<br />
 		</c:if>
 		
-		<a href="Activity.do?method=complete&activityId=<c:out value="${activityId}"/>">Finish</a>
+		<!--a href="Activity.do?method=complete&activityId=<c:out value="${activityId}"/>">Finish</a-->
+		<a href="toolTest.do?method=finish&activityId=<c:out value="${activityId}"/>">Finish</a>
 
 	</body>
 </html:html>