Index: lams_tool_zoom/.classpath
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r1705f1092adfc371069c59f40381acab66ed8c34
--- lams_tool_zoom/.classpath (.../.classpath) (revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/.classpath (.../.classpath) (revision 1705f1092adfc371069c59f40381acab66ed8c34)
@@ -3,12 +3,8 @@
-
+
-
-
-
-
Fisheye: Tag 1705f1092adfc371069c59f40381acab66ed8c34 refers to a dead (removed) revision in file `lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomToolContentHandler.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java
===================================================================
diff -u -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4 -r1705f1092adfc371069c59f40381acab66ed8c34
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 1705f1092adfc371069c59f40381acab66ed8c34)
@@ -38,13 +38,13 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
import org.lamsfoundation.lams.tool.ToolAccessMode;
import org.lamsfoundation.lams.tool.zoom.model.Zoom;
import org.lamsfoundation.lams.tool.zoom.service.IZoomService;
import org.lamsfoundation.lams.tool.zoom.service.ZoomServiceProxy;
import org.lamsfoundation.lams.tool.zoom.util.ZoomConstants;
import org.lamsfoundation.lams.tool.zoom.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.util.AttributeNames;
import org.lamsfoundation.lams.web.util.SessionMap;
@@ -141,7 +141,7 @@
zoom.setDefineLater(false);
zoomService.saveOrUpdateZoom(zoom);
- request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+ request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
// add the sessionMapID to form
authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/ClearSessionAction.java
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r1705f1092adfc371069c59f40381acab66ed8c34
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/ClearSessionAction.java (.../ClearSessionAction.java) (revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/ClearSessionAction.java (.../ClearSessionAction.java) (revision 1705f1092adfc371069c59f40381acab66ed8c34)
@@ -21,13 +21,12 @@
* ****************************************************************
*/
-
package org.lamsfoundation.lams.tool.zoom.web.actions;
import javax.servlet.http.HttpSession;
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
/**
* This class give a chance to clear HttpSession when user save/close authoring page.
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java
===================================================================
diff -u -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4 -r1705f1092adfc371069c59f40381acab66ed8c34
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java (.../LearningAction.java) (revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java (.../LearningAction.java) (revision 1705f1092adfc371069c59f40381acab66ed8c34)
@@ -35,7 +35,6 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.actions.DispatchAction;
-import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
import org.lamsfoundation.lams.notebook.model.NotebookEntry;
import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -137,7 +136,7 @@
lrnForm.setEntryText(notebookEntry.getEntry());
}
- LearningWebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request,
+ WebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request,
getServlet().getServletContext());
return mapping.findForward("notebook");
@@ -210,8 +209,7 @@
zoomService.saveOrUpdateZoom(zoom);
}
- LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request,
- getServlet().getServletContext());
+ WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext());
ZoomUser user;
if (mode.equals(ToolAccessMode.TEACHER)) {
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/zoomApplicationContext.xml
===================================================================
diff -u -r5da86331a25afcff7dfa0dd4647187c5beaa757b -r1705f1092adfc371069c59f40381acab66ed8c34
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/zoomApplicationContext.xml (.../zoomApplicationContext.xml) (revision 5da86331a25afcff7dfa0dd4647187c5beaa757b)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/zoomApplicationContext.xml (.../zoomApplicationContext.xml) (revision 1705f1092adfc371069c59f40381acab66ed8c34)
@@ -53,8 +53,10 @@