Index: lams_central/.classpath
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_central/.classpath	(.../.classpath)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/.classpath	(.../.classpath)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -12,7 +12,7 @@
 			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.1.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jsp-api">
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.1.Final.jar" sourcepath="/home/korwi/.m2/repository/org/jboss/spec/javax/servlet/jsp/jboss-jsp-api_2.3_spec/1.0.1.Final/jboss-jsp-api_2.3_spec-1.0.1.Final-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.oracle.com/javaee/7/api/javax/servlet/jsp/"/>
 		</attributes>
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,1529 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.authoring.template.web;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.LinkedList;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.http.HttpException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.actions.DispatchAction;
+import org.lamsfoundation.lams.authoring.service.IAuthoringService;
+import org.lamsfoundation.lams.authoring.template.Option;
+import org.lamsfoundation.lams.authoring.template.TextUtil;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.GateActivity;
+import org.lamsfoundation.lams.learningdesign.Grouping;
+import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.rest.RestTags;
+import org.lamsfoundation.lams.rest.ToolRestManager;
+import org.lamsfoundation.lams.tool.Tool;
+import org.lamsfoundation.lams.tool.dao.IToolDAO;
+import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.AuthoringJsonTags;
+import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.JsonUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * Base class for actions processing Learning Design templates.
+ *
+ * TODO stop hardcoding the icons!
+ *
+ * @author Marcin Cieslak, Fiona Malikoff
+ */
+@Controller
+public abstract class LdTemplateController {
+    
+    @Autowired
+    WebApplicationContext applictionContext;
+
+    private static Logger log = Logger.getLogger(LdTemplateController.class);
+    public static final int MAX_OPTION_COUNT = 6;
+    public static final int MAX_FLOATING_ACTIVITY_OPTIONS = 6; // Hardcoded in the Flash client
+
+    public static final String PARENT_ACTIVITY_TYPE = "parentActivityType"; // used to work out transitions - not used by the authoring module
+
+    private final HttpClient httpClient = new DefaultHttpClient();
+
+    private static ILamsCoreToolService lamsCoreToolService;
+    private static IWorkspaceManagementService workspaceManagementService;
+    private static IAuthoringService authoringService;
+    private static IToolDAO toolDAO;
+
+    protected static final String CONTENT_TYPE_JSON = "application/json;charset=utf-8";
+
+    // icon strings found in the lams_learningdesign_activity table
+    protected static final String ASSESSMENT_TOOL_SIGNATURE = "laasse10";
+    protected static final String ASSESSMENT_ICON = "tool/laasse10/images/icon_assessment.swf";
+    protected static final String CHAT_TOOL_SIGNATURE = "lachat11";
+    protected static final String CHAT_ICON = "tool/lachat11/images/icon_chat.swf";
+    protected static final String FORUM_TOOL_SIGNATURE = "lafrum11";
+    protected static final String FORUM_ICON = "tool/lafrum11/images/icon_forum.swf";
+    protected static final String LEADER_TOOL_SIGNATURE = "lalead11";
+    protected static final String LEADER_ICON = "tool/lalead11/images/icon_leaderselection.swf";
+    protected static final String MCQ_TOOL_SIGNATURE = "lamc11";
+    protected static final String MCQ_ICON = "tool/lamc11/images/icon_mcq.swf";
+    protected static final String NOTEBOOK_TOOL_SIGNATURE = "lantbk11";
+    protected static final String NOTEBOOK_ICON = "tool/lantbk11/images/icon_notebook.swf";
+    protected static final String NOTICEBOARD_TOOL_SIGNATURE = "lanb11";
+    protected static final String NOTICEBOARD_ICON = "tool/lanb11/images/icon_htmlnb.swf";
+    protected static final String QA_TOOL_SIGNATURE = "laqa11";
+    protected static final String QA_ICON = "tool/laqa11/images/icon_questionanswer.swf";
+    protected static final String SHARE_RESOURCES_TOOL_SIGNATURE = "larsrc11";
+    protected static final String SHARE_RESOURCES_ICON = "tool/larsrc11/images/icon_rsrc.swf";
+    protected static final String SCRATCHIE_TOOL_SIGNATURE = "lascrt11";
+    protected static final String SCRATCHIE_ICON = "tool/lascrt11/images/icon_scratchie.swf";
+    protected static final String SCRIBE_TOOL_SIGNATURE = "lascrb11";
+    protected static final String SCRIBE_ICON = "tool/lascrb11/images/icon_scribe.swf";
+    protected static final String SUBMIT_TOOL_SIGNATURE = "lasbmt11";
+    protected static final String SUBMIT_ICON = "tool/lasbmt11/images/icon_reportsubmission.swf";
+    protected static final String SURVEY_TOOL_SIGNATURE = "lasurv11";
+    protected static final String SURVEY_ICON = "tool/lasurv11/images/icon_survey.swf";
+    protected static final String WIKI_TOOL_SIGNATURE = "lawiki10";
+    protected static final String WIKI_ICON = "tool/lawiki10/images/icon_wiki.swf";
+    protected static final String MINDMAP_TOOL_SIGNATURE = "lamind10";
+    protected static final String MINDMAP_ICON = "tool/lamind10/images/icon_mindmap.swf";
+    protected static final String VOTE_TOOL_SIGNATURE = "lavote11";
+    protected static final String VOTE_ICON = "tool/lavote11/images/icon_ranking.swf";
+    protected static final String PEER_REVIEW_TOOL_SIGNATURE = "laprev11";
+    protected static final String PEER_REVIEW_ICON = "tool/laprev11/images/icon_peerreview.svg";
+
+    protected static final String CHAT_SCRIBE_DESC = "Combined Chat and Scribe";
+    protected static final String FORUM_SCRIBE_DESC = "Combined Forum and Scribe";
+    protected static final String RESOURCES_FORUM_DESC = "Combined Share Resources and Forum";
+
+    protected static final String TOOL_CONTENT_SERVLET_URL_SUFFIX = "/lams/rest/ToolContent";
+    protected static final String LEARNING_DESIGN_SERVLET_URL_SUFFIX = "/lams/rest/LearningDesign";
+
+    @RequestMapping("")
+    @ResponseBody
+    public final String unspecified( HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	ObjectNode responseJSON = null;
+	try {
+	    responseJSON = createLearningDesign(request);
+
+	    if (!responseJSON.has("learningDesignID") && !responseJSON.has("errors")) {
+		log.error(
+			"The Learning Design was not created successfully. ResponseJSON missing both learningDesignID and errors"
+				+ responseJSON.toString());
+		responseJSON = JsonNodeFactory.instance.objectNode();
+		responseJSON.put("fatal",
+			"The Learning Design was not created successfully. See the server log for more details.");
+	    }
+	} catch (Exception e) {
+	    log.error(e.getMessage(), e);
+	    responseJSON = JsonNodeFactory.instance.objectNode();
+	    responseJSON.put("fatal",
+		    "The Learning Design was not created successfully. See the server log for more details.\n\n"
+			    + e.getMessage());
+	}
+
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
+    /**
+     * If you have a CKEditor in your template interface, you should set up an "init" forward for your servlet in
+     * response to this call (e.g. pbl.do?method=init) and it should forward to your JSP form. Calling this method sets
+     * up the contentFolderID needed by the CKEditor to support image upload. The fields that match these values
+     * are in init.jsp and should be included in the JSP form. The JSP should then call the unspecified
+     * method (e.g. pbl.do) to process the form.
+     *
+     * If you wish to set up other values in the initialisation that are form specific, override this method
+     * in your servlet, remembering to call this method.
+     */
+    @RequestMapping("/init")
+    public String init(HttpServletRequest request) throws Exception {
+	String contentFolderID = FileUtil.generateUniqueContentFolderID();
+	request.setAttribute(RestTags.CONTENT_FOLDER_ID, contentFolderID);
+	return "authoring/template/tbl/tbl";
+    }
+
+    protected abstract ObjectNode createLearningDesign(HttpServletRequest request) throws Exception;
+
+    /**
+     * Creates transitions between activities in the order they were created.
+     * Simple version used if no sequence activities are used.
+     */
+    protected ArrayNode createTransitions(AtomicInteger maxUIID, ArrayNode activities) {
+	ArrayNode transitions = JsonNodeFactory.instance.arrayNode();
+	return createTransitions(transitions, maxUIID, activities);
+    }
+
+    /**
+     * Creates transitions between activities in the order they were created.
+     * Complex version used if sequence activities are used - then the top level activities go in one set and each
+     * sequence
+     * activity is its own set of activities.
+     */
+    protected ArrayNode createTransitions(AtomicInteger maxUIID, Set<ArrayNode> setsOfActivities) {
+	ArrayNode transitions = JsonNodeFactory.instance.arrayNode();
+	if (setsOfActivities != null) {
+	    for (ArrayNode activities : setsOfActivities) {
+		createTransitions(transitions, maxUIID, activities);
+	    }
+	}
+	return transitions;
+    }
+
+    /**
+     * Processes the transitions between activities within a sequence. This could be the overall
+     * sequence or activities within a SequenceActivity. The transitions parameter must not be null.
+     */
+    private ArrayNode createTransitions(ArrayNode transitions, AtomicInteger maxUIID, ArrayNode activities) {
+
+	for (int activityIndex = 1; activityIndex < activities.size(); activityIndex++) {
+	    // If it has parent activity that is a parallel activity or support activity then skip to the next one.
+	    // If the parent activity is a sequence activity then we do want transitions
+	    ObjectNode fromActivity = (ObjectNode) activities.get(activityIndex - 1);
+	    ObjectNode toActivity = (ObjectNode) activities.get(activityIndex);
+	    Integer parentType = JsonUtil.optInt(toActivity, PARENT_ACTIVITY_TYPE, (Integer) null);
+	    while ((activityIndex < activities.size()) && parentType != null
+		    && !parentType.equals(Activity.SEQUENCE_ACTIVITY_TYPE)) {
+		activityIndex++;
+		toActivity = (ObjectNode) activities.get(activityIndex);
+		parentType = JsonUtil.optInt(toActivity, PARENT_ACTIVITY_TYPE, (Integer) null);
+	    }
+	    int fromUIID = JsonUtil.optInt(fromActivity, AuthoringJsonTags.ACTIVITY_UIID);
+	    int toUIID = JsonUtil.optInt(toActivity, AuthoringJsonTags.ACTIVITY_UIID);
+
+	    ObjectNode transitionJSON = JsonNodeFactory.instance.objectNode();
+	    transitionJSON.put(AuthoringJsonTags.TRANSITION_UIID, maxUIID.incrementAndGet());
+	    transitionJSON.put(AuthoringJsonTags.FROM_ACTIVITY_UIID, fromUIID);
+	    transitionJSON.put(AuthoringJsonTags.TO_ACTIVITY_UIID, toUIID);
+	    transitionJSON.put(AuthoringJsonTags.TRANSITION_TYPE, 0);
+
+	    transitions.add(transitionJSON);
+
+	    // don't need the parent type any more so remove it so authoring won't get it!
+	    fromActivity.remove(PARENT_ACTIVITY_TYPE);
+	}
+
+	return transitions;
+    }
+
+    protected static final int rowHeightSpace = 100;
+    protected static final int activityWidthSpace = 185;
+    protected static final int gateHeightOffset = 5;
+    protected static final int gateWidthOffset = 50;
+
+    /**
+     * Calculate where to draw an activity. Aim for 4 activities per line. Returns Integer[x,y]
+     * Used when there is no hardcoding of location of activities.
+     * If some activities use hardcoding of layout, then see calcPositionNextRight(), calcPositionBelow()
+     * to calculate relative positions.
+     *
+     * @return
+     */
+    protected Integer[] calcPosition(int order) {
+	Integer[] pos = new Integer[2];
+	int activity4space = activityWidthSpace * 4;
+	int rawPos = order * activityWidthSpace;
+	int rowNum = rawPos / (activity4space);
+	pos[0] = (20 + rawPos) - (rowNum * activity4space); // x
+	pos[1] = rowHeightSpace + (rowHeightSpace * rowNum); // y
+
+	return pos;
+    }
+
+    /** Work out the next location for an activity to the right of the current activity (given by currPos) */
+    protected Integer[] calcPositionNextRight(Integer[] currPos) {
+	Integer[] newPos = new Integer[2];
+	newPos[1] = currPos[1]; // same row so y co-ord stays the same
+	newPos[0] = currPos[0] + activityWidthSpace; // move x co-ord along to the right.
+	return newPos;
+    }
+
+    /** Work out the next location for an activity directly below the current activity (given by currPos) */
+    protected Integer[] calcPositionBelow(Integer[] currPos) {
+	Integer[] newPos = new Integer[2];
+	newPos[0] = currPos[0]; // same column so x co-ord stays the same
+	newPos[1] = currPos[1] + rowHeightSpace; // move y co-ord down a row.
+	return newPos;
+    }
+
+    /** Work out the offset for a gate icon - different size to an ordinary icons */
+    protected Integer[] calcGateOffset(Integer[] currPos) {
+	Integer[] newPos = new Integer[2];
+	newPos[1] = currPos[1] + gateHeightOffset;
+	newPos[0] = currPos[0] + gateWidthOffset;
+	return newPos;
+    }
+
+    /**
+     * Create a unique title for this learning design, within the right length for the database. The title will
+     * be <ConvertedUserEnteredString>_<TEMPLATE_CODE>_UniqueDate, where the userEnteredString is capitalised and
+     * whitespace is removed.
+     *
+     * @param sequenceTitle
+     * @param workspaceFolderID
+     * @return
+     */
+    private String createTitle(String templateCode, String userEnteredString, Integer workspaceFolderID) {
+	String title = WebUtil.removeHTMLtags(userEnteredString);
+	title = title.replaceAll("[@%<>/^/*/$]", "");
+	title = getAuthoringService().getUniqueNameForLearningDesign(title, workspaceFolderID);
+	if (title.length() > 220) {
+	    title.substring(0, 220);
+	}
+	return title;
+    }
+
+    /**
+     * Setup Learning Design JSON Data
+     *
+     * @throws IOException
+     * @
+     *       @throws
+     *       HttpException
+     */
+    protected ObjectNode saveLearningDesign(String templateCode, String userEnteredTitleString,
+	    String userEnteredDescription, Integer workspaceFolderID, String contentFolderId, Integer maxUIID,
+	    ArrayNode activities, ArrayNode transitions, ArrayNode groupings, ArrayNode branchMappings)
+	    throws HttpException, IOException {
+
+	// fill in required LD data
+	ObjectNode ldJSON = JsonNodeFactory.instance.objectNode();
+	ldJSON.put(AuthoringJsonTags.WORKSPACE_FOLDER_ID, workspaceFolderID);
+	ldJSON.put(AuthoringJsonTags.COPY_TYPE, 1);
+	ldJSON.put(AuthoringJsonTags.TITLE, createTitle(templateCode, userEnteredTitleString, workspaceFolderID));
+	ldJSON.put(AuthoringJsonTags.DESCRIPTION, WebUtil.removeHTMLtags(userEnteredDescription));
+	ldJSON.put(AuthoringJsonTags.DESIGN_TYPE, templateCode.toLowerCase());
+	ldJSON.put(AuthoringJsonTags.MAX_ID, maxUIID);
+	ldJSON.put(AuthoringJsonTags.READ_ONLY, false);
+	ldJSON.put(AuthoringJsonTags.EDIT_OVERRIDE_LOCK, false);
+	ldJSON.put(AuthoringJsonTags.CONTENT_FOLDER_ID, contentFolderId);
+	ldJSON.put(AuthoringJsonTags.SAVE_MODE, 0);
+	ldJSON.put(AuthoringJsonTags.VALID_DESIGN, true);
+	ldJSON.set(AuthoringJsonTags.ACTIVITIES, activities);
+	ldJSON.set(AuthoringJsonTags.TRANSITIONS, transitions);
+	ldJSON.set(AuthoringJsonTags.GROUPINGS, groupings);
+	ldJSON.set(AuthoringJsonTags.BRANCH_MAPPINGS, branchMappings);
+
+	LearningDesign learningDesign = null;
+	try {
+	    learningDesign = getAuthoringService().saveLearningDesignDetails(ldJSON);
+	} catch (Exception e) {
+	    LdTemplateController.log.error("Unable to learning design with details " + ldJSON, e);
+	    throw new HttpException("Unable to learning design with details " + ldJSON);
+
+	}
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put("learningDesignID", learningDesign.getLearningDesignId());
+	responseJSON.put("title", learningDesign.getTitle());
+	return responseJSON;
+    }
+
+    /* ************************************** Non-Tool Activity methods ******************************************** */
+    protected ObjectNode createGateActivity(AtomicInteger uiid, int order, Integer[] layoutCoords) {
+
+	ObjectNode activityJSON = JsonNodeFactory.instance.objectNode();
+	Integer[] pos = layoutCoords;
+	if (pos == null) {
+	    pos = calcPosition(order);
+	    pos[0] = pos[0] + 40; // gate is only a small icon so it needs to be offset to look right
+	    pos[1] = pos[1] + 15;
+	}
+	;
+
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_UIID, uiid.incrementAndGet());
+	activityJSON.put(AuthoringJsonTags.GROUPING_SUPPORT_TYPE, 2);
+	activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, false);
+	activityJSON.put(AuthoringJsonTags.XCOORD, pos[0]);
+	activityJSON.put(AuthoringJsonTags.YCOORD, pos[1]);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, "Gate"); // I18N
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.PERMISSION_GATE_ACTIVITY_TYPE);
+	activityJSON.put(AuthoringJsonTags.GATE_ACTIVITY_LEVEL_ID, GateActivity.LEARNER_GATE_LEVEL);
+
+	return activityJSON;
+    }
+
+    /** Create a group activity's JSON objects */
+    protected ObjectNode[] createGroupingActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Integer groupingTypeID, Integer numLearners, Integer numGroups, String title, String[] groupNames,
+	    ResourceBundle appBundle, MessageFormat formatter) {
+	ObjectNode[] responseJSONs = new ObjectNode[2];
+
+	ObjectNode groupingJSON = JsonNodeFactory.instance.objectNode();
+	responseJSONs[1] = groupingJSON;
+	int groupingUIID = uiid.incrementAndGet();
+	groupingJSON.put(AuthoringJsonTags.GROUPING_UIID, groupingUIID);
+	groupingJSON.put(AuthoringJsonTags.GROUPING_TYPE_ID, groupingTypeID);
+	if (groupingTypeID.equals(Grouping.CHOSEN_GROUPING_TYPE)) {
+	    groupingJSON.put(AuthoringJsonTags.MAX_NUMBER_OF_GROUPS, numGroups);
+	} else {
+	    groupingJSON.put(AuthoringJsonTags.NUMBER_OF_GROUPS, numGroups);
+	}
+	groupingJSON.put(AuthoringJsonTags.LEARNERS_PER_GROUP, numLearners);
+	groupingJSON.put(AuthoringJsonTags.EQUAL_NUMBER_OF_LEARNERS_PER_GROUP, Boolean.FALSE);
+
+	// mimic what Authoring is doing for the group name creations
+	ArrayNode groups = JsonNodeFactory.instance.arrayNode();
+	if (groupNames != null) {
+	    int orderId = 0;
+	    for (String groupName : groupNames) {
+		ObjectNode group = JsonNodeFactory.instance.objectNode();
+		group.put(AuthoringJsonTags.GROUP_NAME, groupName);
+		group.put(AuthoringJsonTags.ORDER_ID, orderId++);
+		group.put(AuthoringJsonTags.GROUP_UIID, uiid.incrementAndGet());
+		groups.add(group);
+	    }
+	} else {
+	    Integer useNumGroups = (numGroups != null && numGroups > 0) ? numGroups : 2;
+	    for (int orderId = 0, groupNum = 1; orderId < useNumGroups; orderId++, groupNum++) {
+		ObjectNode group = JsonNodeFactory.instance.objectNode();
+		group.put(AuthoringJsonTags.GROUP_NAME,
+			TextUtil.getText(appBundle, formatter, "label.course.groups.prefix", null) + groupNum);
+		group.put(AuthoringJsonTags.ORDER_ID, orderId);
+		group.put(AuthoringJsonTags.GROUP_UIID, uiid.incrementAndGet());
+		groups.add(group);
+	    }
+	}
+	groupingJSON.set(AuthoringJsonTags.GROUPS, groups);
+
+	Integer[] pos = layoutCoords != null ? layoutCoords : calcPosition(order);
+
+	ObjectNode activityJSON = JsonNodeFactory.instance.objectNode();
+	responseJSONs[0] = activityJSON;
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_UIID, uiid.incrementAndGet());
+	activityJSON.put(AuthoringJsonTags.GROUPING_SUPPORT_TYPE, 2);
+	activityJSON.put(AuthoringJsonTags.XCOORD, pos[0]);
+	activityJSON.put(AuthoringJsonTags.YCOORD, pos[1]);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, title != null ? title : "Grouping");
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.GROUPING_ACTIVITY_TYPE);
+	activityJSON.put(AuthoringJsonTags.CREATE_GROUPING_UIID, groupingUIID);
+
+	return responseJSONs;
+    }
+
+    /**
+     * Create a parallel activity from two already created activities. Use one of the descriptions CHAT_SCRIBE_DESC,
+     * FORUM_SCRIBE_DESC or RESOURCES_FORUM_DESC for the description field otherwise an exported learning design cannot
+     * be imported!
+     *
+     * @param uiid
+     * @param order
+     * @return
+     * @
+     */
+    protected ObjectNode createParallelActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Integer groupingUIID, String activityTitle, String description) {
+	ObjectNode activityJSON = JsonNodeFactory.instance.objectNode();
+
+	Integer[] pos = layoutCoords;
+	if (pos == null) {
+	    pos = calcPosition(order);
+	    pos[1] = pos[1] - 50; // Extra tall!
+	}
+	;
+
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_UIID, uiid.incrementAndGet());
+	activityJSON.put(AuthoringJsonTags.GROUPING_SUPPORT_TYPE, 2);
+	activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, false);
+	activityJSON.put(AuthoringJsonTags.XCOORD, pos[0]);
+	activityJSON.put(AuthoringJsonTags.YCOORD, pos[1]);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, activityTitle != null ? activityTitle : "Parallel Activity");
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SPLIT);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.PARALLEL_ACTIVITY_TYPE);
+	activityJSON.put(AuthoringJsonTags.DESCRIPTION, description);
+	if (groupingUIID != null) {
+	    activityJSON.put(AuthoringJsonTags.GROUPING_UIID, groupingUIID);
+	    activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, true);
+	} else {
+	    activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, false);
+	}
+	return activityJSON;
+    }
+
+    /**
+     * Create a support activity group from already created activities. The support activities run outside the
+     * sequenced activities
+     */
+    protected ObjectNode createSupportActivity(AtomicInteger uiid, int order, Integer[] layoutCoords) {
+	Integer[] pos = layoutCoords;
+	if (pos == null) {
+	    pos = calcPosition(order);
+	    pos[0] = 20;
+	    pos[1] = pos[1] + rowHeightSpace; // put it on its own line down the bottom
+	}
+
+	ObjectNode activityJSON = JsonNodeFactory.instance.objectNode();
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_UIID, uiid.incrementAndGet());
+	activityJSON.put(AuthoringJsonTags.GROUPING_SUPPORT_TYPE, Activity.GROUPING_SUPPORT_NONE);
+	activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, false);
+	activityJSON.put(AuthoringJsonTags.XCOORD, pos[0]);
+	activityJSON.put(AuthoringJsonTags.YCOORD, pos[1]);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, "Support Activity");
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.FLOATING_ACTIVITY_TYPE);
+	activityJSON.put(AuthoringJsonTags.MAX_ACTIVITIES, MAX_FLOATING_ACTIVITY_OPTIONS);
+	return activityJSON;
+    }
+
+    /**
+     * Create a sequence (or branch) activity, which is a single path that a user follows. This activity will go
+     * into a branching activity. If branchName is null then the branch will be "Branch <no>".
+     * The sequence activity has a circular dependence - to define the SequenceActivity you need the UIID of the first
+     * activity in the sequence. But the first activity in the sequence needs the SequenceActivity's UIID as its parent
+     * activity UIID.
+     * So "reserve" a uuid (using incrementAndGet()) in the template for the SequenceActivity, create the child activity
+     * (setting
+     * the parent activity as the reserved uiid) and then create the SequenceActivity using the reserved uiid.
+     */
+    protected ObjectNode createSequenceActivity(Integer reservedUiid, Integer parentUIID, Integer parentActivityType,
+	    Integer firstActivityUiid, int orderId, String branchName) {
+	ObjectNode activityJSON = JsonNodeFactory.instance.objectNode();
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_UIID, reservedUiid);
+	activityJSON.put(AuthoringJsonTags.GROUPING_SUPPORT_TYPE, Activity.GROUPING_SUPPORT_OPTIONAL);
+	activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, false);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, branchName != null ? branchName : "Branch " + orderId);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.SEQUENCE_ACTIVITY_TYPE);
+	activityJSON.put(AuthoringJsonTags.ORDER_ID, orderId);
+	activityJSON.put(AuthoringJsonTags.PARENT_UIID, parentUIID);
+	activityJSON.put(PARENT_ACTIVITY_TYPE, parentActivityType);
+	activityJSON.put(AuthoringJsonTags.DEFAULT_ACTIVITY_UIID, firstActivityUiid);
+	activityJSON.put(AuthoringJsonTags.STOP_AFTER_ACTIVITY, false);
+	return activityJSON;
+    }
+
+    /**
+     * Map a branch to a group. Creates JSON similar to:
+     * {"entryUIID":16,"groupUIID":11,"branchingActivityUIID":1,"sequenceActivityUIID":3}
+     * Note: it needs the UIID of the matching group, not of the grouping activity
+     *
+     * @
+     */
+    protected ObjectNode createBranchMapping(AtomicInteger uiid, Integer groupUiid, Integer branchingActivityUiid,
+	    Integer sequenceActivityUiid) {
+	ObjectNode bmJSON = JsonNodeFactory.instance.objectNode();
+	bmJSON.put(AuthoringJsonTags.BRANCH_ACTIVITY_ENTRY_UIID, uiid.incrementAndGet());
+	bmJSON.put(AuthoringJsonTags.GROUP_UIID, groupUiid);
+	bmJSON.put(AuthoringJsonTags.BRANCH_ACTIVITY_UIID, branchingActivityUiid);
+	bmJSON.put(AuthoringJsonTags.BRANCH_SEQUENCE_ACTIVITY_UIID, sequenceActivityUiid);
+	return bmJSON;
+
+    }
+
+    /**
+     * Create the overall branching activity, which will have branch activities as its children.
+     * Branch selected based on a group.
+     *
+     * The branching activity has a circular dependence - to define the BranchingActivity you need the UIID of the
+     * default branch (sequence).
+     * But the default sequence needs the BranchingActivity's UIID as its parent activity UIID.
+     * So "reserve" a uuid (using incrementAndGet()) in the template for the BranchingActivity, create the branches
+     * (setting
+     * the parent activity as the reserved uiid) and then create the BranchingActivity using the reserved uiid.
+     */
+    protected ObjectNode createGroupBranchingActivity(Integer reservedUiid, Integer defaultBranchUiid,
+	    Integer groupingUiid, int order, Integer[] layoutCoords, Integer[] startCoords, Integer[] endCoords,
+	    String activityTitle) {
+	ObjectNode activityJSON = createBranchingActivity(reservedUiid, defaultBranchUiid, groupingUiid, order,
+		layoutCoords, startCoords, endCoords, activityTitle, Activity.GROUP_BRANCHING_ACTIVITY_TYPE);
+	return activityJSON;
+    }
+
+    /**
+     * Create the overall branching activity, which will have branch activities as its children.
+     * TODO Branch selected by monitor. Not yet implemented as the branch mappings are yet to be investigated.
+     */
+//    protected ObjectNode createChosenBranchingActivity(AtomicInteger uiid, int order, Integer[] layoutCoords)  {
+//	return createBranchingActivity(uiid, order, layoutCoords, Activity.CHOSEN_BRANCHING_ACTIVITY_TYPE);
+//    }
+
+    /**
+     * Create the overall branching activity, which will have branch activities as its children.
+     * Supports instructor's choice and grouped, but not based on learner output as conditions
+     * are not implemented in the REST authoring for the tools
+     */
+    private ObjectNode createBranchingActivity(Integer reservedUiid, Integer defaultBranchUiid, Integer groupingUiid,
+	    int order, Integer[] layoutCoords, Integer[] startCoords, Integer[] endCoords, String activityTitle,
+	    int activityType) {
+
+	ObjectNode activityJSON = JsonNodeFactory.instance.objectNode();
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_UIID, reservedUiid);
+	activityJSON.put(AuthoringJsonTags.GROUPING_SUPPORT_TYPE, Activity.GROUPING_SUPPORT_OPTIONAL);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, activityTitle != null ? activityTitle : "Branching");
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, activityType);
+	activityJSON.put(AuthoringJsonTags.MAX_ACTIVITIES, MAX_FLOATING_ACTIVITY_OPTIONS);
+	activityJSON.put(AuthoringJsonTags.XCOORD, layoutCoords[0]);
+	activityJSON.put(AuthoringJsonTags.YCOORD, layoutCoords[1]);
+	activityJSON.put(AuthoringJsonTags.START_XCOORD, startCoords[0]);
+	activityJSON.put(AuthoringJsonTags.START_YCOORD, startCoords[1]);
+	activityJSON.put(AuthoringJsonTags.END_XCOORD, endCoords[0]);
+	activityJSON.put(AuthoringJsonTags.END_YCOORD, endCoords[1]);
+	activityJSON.put(AuthoringJsonTags.STOP_AFTER_ACTIVITY, false);
+	activityJSON.put(AuthoringJsonTags.DEFAULT_ACTIVITY_UIID, defaultBranchUiid);
+
+	if (groupingUiid != null) {
+	    activityJSON.put(AuthoringJsonTags.GROUPING_UIID, groupingUiid);
+	    activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, true);
+	} else {
+	    activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, false);
+	}
+
+	return activityJSON;
+    }
+
+    /* ************************************** Tool related methods ********************************************** */
+    /** General method to create a tool content. All calls to create tool content should go through this method */
+    protected Long createToolContent(UserDTO user, String toolSignature, ObjectNode toolContentJSON)
+	    throws HttpException, IOException {
+
+	try {
+	    Tool tool = getTool(toolSignature);
+	    Long toolContentID = getAuthoringService().insertToolContentID(tool.getToolId());
+
+	    // Tools' services implement an interface for processing REST requests
+	    ToolRestManager toolRestService = (ToolRestManager) getLamsCoreToolService().findToolService(tool);
+	    toolRestService.createRestToolContent(user.getUserID(), toolContentID, toolContentJSON);
+
+	    return toolContentID;
+	} catch (Exception e) {
+	    LdTemplateController.log.error("Unable to create tool content for " + toolSignature + " with details "
+		    + toolContentJSON
+		    + ". \nThe tool probably threw an exception - check the server logs for more details.\n"
+		    + "If the exception is \"Servlet.service() for servlet ToolContentRestServlet threw exception java.lang.ClassCastException: com.sun.proxy.$ProxyXXX cannot be cast to org.lamsfoundation.lams.rest.ToolRestManager)\""
+		    + " then the tool doesn't support the LDTemplate service calls (ie has not implemented the ToolRestManager interface / createRestToolContent() method.");
+	    throw new HttpException(
+		    "Unable to create tool content for " + toolSignature + " with details " + toolContentJSON);
+	}
+
+    }
+
+    /**
+     * General method to create tool activity. All calls to create an activity relating to a tool should go through this
+     * method
+     */
+    protected ObjectNode createToolActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, String toolSignature,
+	    String toolIcon, Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID,
+	    Integer parentActivityType, String activityTitle, int activityCategory) {
+	ObjectNode activityJSON = JsonNodeFactory.instance.objectNode();
+	Tool tool = getTool(toolSignature);
+
+	Integer[] pos = layoutCoords != null ? layoutCoords : calcPosition(order);
+
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_UIID, uiid.incrementAndGet());
+	activityJSON.put(RestTags.CONTENT_FOLDER_ID, contentFolderID);
+	activityJSON.put(AuthoringJsonTags.TOOL_ID, tool.getToolId());
+	activityJSON.put(AuthoringJsonTags.LEARNING_LIBRARY_ID, tool.getLearningLibraryId());
+	activityJSON.put(AuthoringJsonTags.TOOL_CONTENT_ID, toolContentID);
+	activityJSON.put(AuthoringJsonTags.GROUPING_SUPPORT_TYPE, 2); // based on values in lams_learning_activity field - this seem to be
+	// 2 for all tools
+	activityJSON.put(AuthoringJsonTags.LIBRARY_IMAGE, toolIcon);
+	activityJSON.put(AuthoringJsonTags.XCOORD, pos[0]);
+	activityJSON.put(AuthoringJsonTags.YCOORD, pos[1]);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, activityTitle != null ? activityTitle : "Activity");
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, activityCategory);
+	activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.TOOL_ACTIVITY_TYPE);
+	if (parentUIID != null) {
+	    activityJSON.put(AuthoringJsonTags.PARENT_UIID, parentUIID);
+	    activityJSON.put(PARENT_ACTIVITY_TYPE, parentActivityType);
+	}
+	if (groupingUIID != null) {
+	    activityJSON.put(AuthoringJsonTags.GROUPING_UIID, groupingUIID);
+	    activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, true);
+	} else {
+	    activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, false);
+	}
+	return activityJSON;
+    }
+
+    /** Sets up the standard fields that are used by many tools! */
+    protected ObjectNode createStandardToolContent(String title, String instructions, String reflectionInstructions,
+	    Boolean lockWhenFinished, Boolean allowRichTextEditor, UserDTO user) {
+	ObjectNode toolContentJSON = JsonNodeFactory.instance.objectNode();
+	toolContentJSON.put(RestTags.TITLE, title != null ? title : "");
+	toolContentJSON.put(RestTags.INSTRUCTIONS, instructions != null ? instructions : "");
+
+	if (reflectionInstructions != null) {
+	    toolContentJSON.put(RestTags.REFLECT_ON_ACTIVITY, true);
+	    toolContentJSON.put(RestTags.REFLECT_INSTRUCTIONS, reflectionInstructions);
+	}
+
+	toolContentJSON.put(RestTags.LOCK_WHEN_FINISHED, lockWhenFinished);
+	toolContentJSON.put(RestTags.ALLOW_RICH_TEXT_EDITOR, allowRichTextEditor);
+
+	if (user != null) {
+	    toolContentJSON.put("firstName", user.getFirstName());
+	    toolContentJSON.put("lastName", user.getLastName());
+	    toolContentJSON.put("loginName", user.getLogin());
+	}
+	return toolContentJSON;
+    }
+
+    /**
+     * Helper method to create a Assessment tool content. Assessment is one of the unusuals tool in that it caches
+     * user's login names and
+     * first/last names Mandatory fields in toolContentJSON: title, instructions, resources, user fields firstName,
+     * lastName and loginName.
+     *
+     * Required fields in toolContentJSON: "title", "instructions", "questions", "firstName", "lastName", "lastName",
+     * "questions" and "references".
+     *
+     * The questions entry should be ArrayNode containing JSON objects, which in turn must contain
+     * "questionTitle", "questionText", "displayOrder" (Integer), "type" (Integer). If the type is Multiple Choice,
+     * Numerical or Matching Pairs
+     * then a ArrayNode "answers" is required.
+     *
+     * The answers entry should be ArrayNode
+     * containing JSON objects, which in turn must contain "answerText" or "answerFloat", "displayOrder" (Integer),
+     * "grade" (Integer).
+     *
+     * For the templates, all the questions that are created will be set up as references, therefore the questions in
+     * the assessment == the bank of questions.
+     * So references entry will be a ArrayNode containing JSON objects, which in turn must contain "displayOrder"
+     * (Integer),
+     * "questionDisplayOrder" (Integer - to match to the question). If default grade or random questions are needed then
+     * this method needs
+     * to be expanded.
+     */
+    protected Long createAssessmentToolContent(UserDTO user, String title, String instructions,
+	    String reflectionInstructions, boolean selectLeaderToolOutput, ArrayNode questions)
+	    throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions, null, null,
+		user);
+	toolContentJSON.put(RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, selectLeaderToolOutput);
+
+	toolContentJSON.set(RestTags.QUESTIONS, questions);
+
+	ArrayNode references = JsonNodeFactory.instance.arrayNode();
+	for (int i = 0; i < questions.size(); i++) {
+	    Integer questionDisplayOrder = ((ObjectNode) questions.get(i)).get(RestTags.DISPLAY_ORDER).asInt();
+	    references.add(JsonNodeFactory.instance.objectNode().put(RestTags.DISPLAY_ORDER, questionDisplayOrder)
+		    .put("questionDisplayOrder", questionDisplayOrder));
+	}
+	toolContentJSON.set("references", references);
+
+	return createToolContent(user, LdTemplateController.ASSESSMENT_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a forum activity's JSON details.
+     */
+    protected ObjectNode createAssessmentActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID,
+	    Integer parentActivityType, String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.ASSESSMENT_TOOL_SIGNATURE,
+		LdTemplateController.ASSESSMENT_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Assessment", Activity.CATEGORY_ASSESSMENT);
+    }
+
+    /**
+     * Helper method to create a chat tool content. Only title and instructions are needed but we support reflection,
+     * lock on
+     * finished and filterKeywords in case it is wanted. The keywords should be a comma deliminated string.
+     */
+    protected Long createChatToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
+	    String filterKeywords, String reflectionInstructions) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions,
+		lockWhenFinished, null, null);
+	toolContentJSON.put("filterKeywords", filterKeywords);
+	return createToolContent(user, LdTemplateController.CHAT_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a noticeboard activity's JSON details.
+     */
+    protected ObjectNode createChatActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID,
+	    String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType,
+	    String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.CHAT_TOOL_SIGNATURE,
+		LdTemplateController.CHAT_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Chat", Activity.CATEGORY_COLLABORATION);
+    }
+
+    /**
+     * Helper method to create a forum tool content. Forum is an unusual tool in that it caches user's login names and
+     * first/last names Mandatory fields: title & instructions; userDTO which gives user's firstName, lastName &
+     * loginName; topics which is Set<Map> where the <Map> contains the keys subject & body There should be at least one
+     * topic.
+     *
+     * Optional fields: allowAnonym, allowEdit, allowNewTopic, allowRateMessages, allowRichTextEditor, allowUpload,
+     * limitedMaxCharacters, limitedMinCharacters, lockWhenFinished, maxCharacters, maximumRate, maximumReply,
+     * minCharacters minimumRate, minimumReply, notifyLearnersOnForumPosting, notifyLearnersOnMarkRelease,
+     * notifyTeachersOnForumPosting reflectInstructions, reflectOnActivity, submissionDeadline
+     *
+     * @param limitedMaxCharacters
+     *            Should the maximum number of characters in a posting be limited
+     * @param maxCharacters
+     *            if limitedMaxCharacters == true then if maxCharacters == null let forum use default otherwise use the
+     *            value supplied.
+     */
+    protected Long createForumToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
+	    boolean allowRichTextEditor, boolean allowNewTopic, boolean allowRateMessages, boolean allowUpload,
+	    boolean limitedMaxCharacters, Integer maxCharacters, ArrayNode topics) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished,
+		allowRichTextEditor, user);
+	toolContentJSON.set("topics", topics);
+	toolContentJSON.put("allowNewTopic", allowNewTopic);
+	toolContentJSON.put("allowRateMessages", allowRateMessages);
+	toolContentJSON.put("allowUpload", allowUpload);
+	toolContentJSON.put("limitedMaxCharacters", limitedMaxCharacters);
+	if (limitedMaxCharacters && maxCharacters != null) {
+	    toolContentJSON.put("maxCharacters", maxCharacters);
+	}
+	return createToolContent(user, LdTemplateController.FORUM_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a forum activity's JSON details.
+     */
+    protected ObjectNode createForumActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID,
+	    String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType,
+	    String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.FORUM_TOOL_SIGNATURE,
+		LdTemplateController.FORUM_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Forum", Activity.CATEGORY_COLLABORATION);
+    }
+
+    /**
+     * Helper method to create a leader selection tool content. Only title and instructions are needed. Leader selection
+     * does not support lockWhenFinished.
+     */
+    protected Long createLeaderSelectionToolContent(UserDTO user, String title, String instructions)
+	    throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, null, null, null);
+	return createToolContent(user, LdTemplateController.LEADER_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a leader selection activity's JSON details.
+     */
+    protected ObjectNode createLeaderSelectionActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID,
+	    Integer parentActivityType, String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.LEADER_TOOL_SIGNATURE,
+		LdTemplateController.LEADER_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Leader Selection",
+		Activity.CATEGORY_RESPONSE);
+    }
+
+    /**
+     * Helper method to create a notebook tool content. Only title and instructions are needed but we support lock on
+     * finished and allow rich text editor in case it is wanted.
+     */
+    protected Long createNotebookToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
+	    boolean allowRichTextEditor) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished,
+		allowRichTextEditor, null);
+	return createToolContent(user, LdTemplateController.NOTEBOOK_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a noticeboard activity's JSON details.
+     */
+    protected ObjectNode createNotebookActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID,
+	    Integer parentActivityType, String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.NOTEBOOK_TOOL_SIGNATURE,
+		LdTemplateController.NOTEBOOK_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Notebook", Activity.CATEGORY_RESPONSE);
+    }
+
+    /**
+     * Helper method to create a noticeboard tool content. Only title and content are needed for noticeboard! But we
+     * support a reflection in case it is wanted.
+     */
+    protected Long createNoticeboardToolContent(UserDTO user, String title, String content,
+	    String reflectionInstructions) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, null, reflectionInstructions, null, null, null);
+	toolContentJSON.put("content", content != null ? content : "");
+	return createToolContent(user, LdTemplateController.NOTICEBOARD_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a noticeboard activity's JSON details.
+     */
+    protected ObjectNode createNoticeboardActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID,
+	    Integer parentActivityType, String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.NOTICEBOARD_TOOL_SIGNATURE,
+		LdTemplateController.NOTICEBOARD_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Noticeboard", Activity.CATEGORY_CONTENT);
+    }
+
+    /**
+     * Helper method to create a Q&A tool content. Only title and instructions are needed but we support other fields in
+     * case they are wanted.
+     */
+    protected Long createQAToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
+	    boolean allowRichTextEditor, boolean oneQuestionPerPage, boolean showOtherLearnersAnswers,
+	    boolean showOtherLearnersNames, ArrayNode questions) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished,
+		allowRichTextEditor, null);
+	toolContentJSON.set(RestTags.QUESTIONS, questions);
+	toolContentJSON.put("questionsSequenced", oneQuestionPerPage);
+	toolContentJSON.put("showOtherAnswers", showOtherLearnersAnswers);
+	toolContentJSON.put("usernameVisible", showOtherLearnersNames);
+	return createToolContent(user, LdTemplateController.QA_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a Q&A activity's JSON details.
+     */
+    protected ObjectNode createQAActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID,
+	    String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType,
+	    String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.QA_TOOL_SIGNATURE,
+		LdTemplateController.QA_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, parentActivityType,
+		activityTitle != null ? activityTitle : "Q&A", Activity.CATEGORY_RESPONSE);
+    }
+
+    /**
+     * Helper method to create a MCQ tool content. Title, instructions and questions are required (see tool for full
+     * details of questions). Other fields are optional.
+     */
+    protected Long createMCQToolContent(UserDTO user, String title, String instructions,
+	    boolean useSelectLeaderToolOuput, ArrayNode questions) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, null, null, null);
+	toolContentJSON.put(RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, useSelectLeaderToolOuput);
+	toolContentJSON.set(RestTags.QUESTIONS, questions);
+	return createToolContent(user, LdTemplateController.MCQ_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a MCQ activity's JSON details.
+     */
+    protected ObjectNode createMCQActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID,
+	    String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType,
+	    String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.MCQ_TOOL_SIGNATURE,
+		LdTemplateController.MCQ_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, parentActivityType,
+		activityTitle != null ? activityTitle : "Multiple Choice", Activity.CATEGORY_ASSESSMENT);
+    }
+
+    /**
+     * Helper method to create a mindmap tool content.
+     */
+    protected Long createMindmapToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
+	    boolean multiUserMode, String reflectionInstruction) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished, null, null);
+	toolContentJSON.put("multiUserMode", multiUserMode);
+	return createToolContent(user, LdTemplateController.MINDMAP_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a multiUserMode activity's JSON details.
+     */
+    protected ObjectNode createMindmapActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID,
+	    Integer parentActivityType, String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.MINDMAP_TOOL_SIGNATURE,
+		LdTemplateController.MINDMAP_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "MindMap", Activity.CATEGORY_RESPONSE);
+    }
+
+    /**
+     * Helper method to create a forum tool content. Forum is an unusual tool in that it caches user's login names and
+     * first/last names Mandatory fields in toolContentJSON: title, instructions, resources, user fields firstName,
+     * lastName and loginName Topics must contain a ArrayNode of ObjectNode objects, which have the following mandatory
+     * fields: title, description, type There should be at least one resource object in the Topics array. See
+     * ResourceService for the optional entries.
+     */
+    protected Long createResourcesToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
+	    boolean runContentAutomatically, boolean allowLearnerAddURL, boolean allowLearnerAddFile,
+	    boolean notifyInstructors, Integer minResourcesToView, String reflectionInstructions, ArrayNode resources)
+	    throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions,
+		lockWhenFinished, null, user);
+	toolContentJSON.put("allowAddFiles", allowLearnerAddFile);
+	toolContentJSON.put("allowAddUrls", allowLearnerAddURL);
+	toolContentJSON.put("notifyTeachersOnAssigmentSumbit", notifyInstructors);
+	toolContentJSON.put("runAuto", runContentAutomatically);
+	if (minResourcesToView != null) {
+	    toolContentJSON.put("minViewResourceNumber", minResourcesToView);
+	}
+	toolContentJSON.set("resources", resources);
+	return createToolContent(user, LdTemplateController.SHARE_RESOURCES_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    // resource type - copied from ResourceConstants
+    public static final short RESOURCE_TYPE_URL = 1;
+    public static final short RESOURCE_TYPE_FILE = 2;
+    public static final short RESOURCE_TYPE_WEBSITE = 3;
+    public static final short RESOURCE_TYPE_LEARNING_OBJECT = 4;
+
+    private ObjectNode createResourceItem(String title, short type, String[] instructions, File file, int displayOrder)
+	    throws IOException {
+	ObjectNode item = JsonNodeFactory.instance.objectNode();
+	item.put(RestTags.TITLE, title != null ? title : "");
+	item.put("type", type);
+	item.put(RestTags.DISPLAY_ORDER, displayOrder);
+
+	if (instructions != null) {
+	    item.set("instructions", JsonUtil.readArray(instructions));
+	} else {
+	    item.set("instructions", JsonNodeFactory.instance.arrayNode());
+	}
+
+	// TODO files - need to save it somehow, validate the file size, etc
+	if (type != LdTemplateController.RESOURCE_TYPE_URL) {
+	    LdTemplateController.log
+		    .warn("LD Templates not handling files yet - file, website & LO resources won't work. Filename "
+			    + file.getAbsoluteFile());
+	}
+	return item;
+    }
+
+    protected ObjectNode createResourceURL(String title, String[] instructions, String URL, boolean openInNewWindow,
+	    int displayOrder) throws IOException {
+	ObjectNode obj = createResourceItem(title, LdTemplateController.RESOURCE_TYPE_URL, instructions, null,
+		displayOrder);
+	obj.put("url", URL);
+	obj.put("openUrlNewWindow", openInNewWindow);
+	return obj;
+    }
+
+    protected ObjectNode createResourceFile(String title, String description, String[] instructions, File file,
+	    int displayOrder) throws IOException {
+	ObjectNode obj = createResourceItem(title, LdTemplateController.RESOURCE_TYPE_FILE, instructions, file,
+		displayOrder);
+	obj.put("description", description);
+	return obj;
+    }
+
+    protected ObjectNode createResourceWebsite(String title, String description, String[] instructions, File file,
+	    int displayOrder) throws IOException {
+	ObjectNode obj = createResourceItem(title, LdTemplateController.RESOURCE_TYPE_WEBSITE, instructions, file,
+		displayOrder);
+	obj.put("description", description);
+	return obj;
+    }
+
+    protected ObjectNode createResourceLearningObject(String title, String description, String[] instructions,
+	    File file, int displayOrder) throws IOException {
+	ObjectNode obj = createResourceItem(title, LdTemplateController.RESOURCE_TYPE_LEARNING_OBJECT, instructions, file,
+		displayOrder);
+	obj.put("description", description);
+	return obj;
+    }
+
+    /**
+     * Creates a forum activity's JSON details.
+     */
+    protected ObjectNode createResourcesActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID,
+	    Integer parentActivityType, String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SHARE_RESOURCES_TOOL_SIGNATURE,
+		LdTemplateController.SHARE_RESOURCES_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Share Resources",
+		Activity.CATEGORY_CONTENT);
+    }
+
+    /**
+     * Helper method to create a Scratchie tool content. Title, instructions and questions are required (see tool for
+     * full details of questions). Other fields are optional.
+     */
+    protected Long createScratchieToolContent(UserDTO user, String title, String instructions,
+	    boolean useSelectLeaderToolOuput, ArrayNode questions) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, null, null, null);
+	toolContentJSON.set(RestTags.QUESTIONS, questions);
+	return createToolContent(user, LdTemplateController.SCRATCHIE_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a Scratchie activity's JSON details.
+     */
+    protected ObjectNode createScratchieActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID,
+	    Integer parentActivityType, String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SCRATCHIE_TOOL_SIGNATURE,
+		LdTemplateController.SCRATCHIE_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Scratchie", Activity.CATEGORY_CONTENT);
+    }
+
+    /**
+     * Helper method to create a scribe tool content. Headings which is ArrayNode of strings. There should be at least
+     * one heading. The scribe service treats reflectInstructions as optional
+     */
+    protected Long createScribeToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
+	    boolean autoSelectScribe, boolean showAggregatedReports, String reflectionInstructions, ArrayNode questions)
+	    throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions,
+		lockWhenFinished, null, null);
+	toolContentJSON.set(RestTags.QUESTIONS, questions);
+	toolContentJSON.put("autoSelectScribe", autoSelectScribe);
+	toolContentJSON.put("showAggregatedReports", showAggregatedReports);
+	return createToolContent(user, LdTemplateController.SCRIBE_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a scribe activity's JSON details.
+     */
+    protected ObjectNode createScribeActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID,
+	    String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType,
+	    String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SCRIBE_TOOL_SIGNATURE,
+		LdTemplateController.SCRIBE_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Scribe", Activity.CATEGORY_COLLABORATION);
+    }
+
+    /**
+     * Helper method to create a submit tool content. Another tool that caches user's login names and
+     * first/last names Mandatory fields: title & instructions; userDTO which gives user's firstName, lastName &
+     * loginName;
+     */
+    protected Long createSubmitToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
+	    Boolean limitUpload, Integer limitUploadNumber, String reflectionInstructions)
+	    throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions,
+		lockWhenFinished, null, user);
+	if (limitUploadNumber != null) {
+	    toolContentJSON.put("limitUpload", limitUpload != null ? limitUpload : true);
+	    toolContentJSON.put("limitUploadNumber", limitUploadNumber);
+	}
+	return createToolContent(user, LdTemplateController.SUBMIT_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a forum activity's JSON details.
+     */
+    protected ObjectNode createSubmitActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID,
+	    String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType,
+	    String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SUBMIT_TOOL_SIGNATURE,
+		LdTemplateController.SUBMIT_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Submit File",
+		Activity.CATEGORY_ASSESSMENT);
+    }
+
+    /**
+     * Helper method to create a survey tool content. Another tool that caches user's login names and
+     * first/last names! See the survey implementation for the full field list.
+     */
+    protected Long createSurveyToolContent(UserDTO user, String title, String instructions, Boolean lockWhenFinished,
+	    ArrayNode questions) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished, null, user);
+	toolContentJSON.set("questions", questions);
+	return createToolContent(user, LdTemplateController.SURVEY_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a forum activity's JSON details.
+     */
+    protected ObjectNode createSurveyActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID,
+	    String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType,
+	    String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SURVEY_TOOL_SIGNATURE,
+		LdTemplateController.SURVEY_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Survey", Activity.CATEGORY_RESPONSE);
+    }
+
+    /**
+     * Helper method to create a Vote tool content. Title, instructions and answers (Array of String) are required.
+     * Other fields are optional.
+     */
+    protected Long createVoteToolContent(UserDTO user, String title, String instructions, ArrayNode answers,
+	    Boolean showResults) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, null, null, null);
+	toolContentJSON.set(RestTags.ANSWERS, answers);
+	toolContentJSON.put("showResults", showResults);
+	return createToolContent(user, LdTemplateController.VOTE_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a MCQ activity's JSON details.
+     */
+    protected ObjectNode createVoteActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID,
+	    String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType,
+	    String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.VOTE_TOOL_SIGNATURE,
+		LdTemplateController.VOTE_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Voting", Activity.CATEGORY_RESPONSE);
+    }
+
+    /**
+     * Helper method to create a wiki tool content.
+     */
+    protected Long createWikiToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
+	    String reflectionInstruction, ArrayNode pages) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished, null, null);
+	toolContentJSON.set("pages", pages);
+	return createToolContent(user, LdTemplateController.WIKI_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a multiUserMode activity's JSON details.
+     */
+    protected ObjectNode createWikiActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID,
+	    String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType,
+	    String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.WIKI_TOOL_SIGNATURE,
+		LdTemplateController.WIKI_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Wiki", Activity.CATEGORY_COLLABORATION);
+    }
+
+    /**
+     * Helper method to create a Peer Review tool content.
+     * Required fields in toolContentJSON: "title", "instructions", "questions", "firstName", "lastName", "lastName",
+     * "questions" and "references".
+     *
+     * The criterias entry should be ArrayNode as defined in PeerReviewCriters object.
+     */
+    protected Long createPeerReviewToolContent(UserDTO user, String title, String instructions,
+	    String reflectionInstructions, ArrayNode criterias) throws HttpException, IOException {
+
+	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions, null, null,
+		user);
+	toolContentJSON.set("criterias", criterias);
+	return createToolContent(user, LdTemplateController.PEER_REVIEW_TOOL_SIGNATURE, toolContentJSON);
+    }
+
+    /**
+     * Creates a PeerRev activity's JSON details.
+     */
+    protected ObjectNode createPeerReviewActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
+	    Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID,
+	    Integer parentActivityType, String activityTitle) {
+
+	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.PEER_REVIEW_TOOL_SIGNATURE,
+		LdTemplateController.PEER_REVIEW_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Peer Review", Activity.CATEGORY_CONTENT);
+    }
+
+    /**
+     *
+     * /* ************************************** Service related methods **********************************************
+     */
+    /* ************************************** I18N related methods ************************************************* */
+
+    protected final IAuthoringService getAuthoringService() {
+	if (LdTemplateController.authoringService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(applictionContext.getServletContext());
+	    LdTemplateController.authoringService = (IAuthoringService) ctx.getBean("authoringService");
+	}
+	return LdTemplateController.authoringService;
+    }
+
+    protected final Tool getTool(String toolSignature) {
+	if (LdTemplateController.toolDAO == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(applictionContext.getServletContext());
+	    LdTemplateController.toolDAO = (IToolDAO) ctx.getBean("toolDAO");
+	}
+	return LdTemplateController.toolDAO.getToolBySignature(toolSignature);
+    }
+
+    protected final IWorkspaceManagementService getWorkspaceManagementService() {
+	if (LdTemplateController.workspaceManagementService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(applictionContext.getServletContext());
+	    LdTemplateController.workspaceManagementService = (IWorkspaceManagementService) ctx
+		    .getBean("workspaceManagementService");
+	}
+	return LdTemplateController.workspaceManagementService;
+    }
+
+    private ILamsCoreToolService getLamsCoreToolService() {
+	if (LdTemplateController.lamsCoreToolService == null) {
+	    LdTemplateController.lamsCoreToolService = (ILamsCoreToolService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(applictionContext.getServletContext()).getBean("lamsCoreToolService");
+	}
+	return LdTemplateController.lamsCoreToolService;
+    }
+
+    class ToolDetails {
+	String signature;
+	String icon;
+	int activityType;
+
+	ToolDetails(String signature, String icon, int activityType) {
+	    this.signature = signature;
+	    this.icon = icon;
+	    this.activityType = activityType;
+	}
+
+    }
+
+    /********************************* Page Interaction Support *************************************/
+
+    /**
+     * Specialised call to create a new question for the Assessment fields. Returns a fragment of HTML
+     * which sets up a new CKEditor. Defaults to essay. If questionType = "mcq" then it will do a multiple choice
+     */
+    @RequestMapping("/createAssessment")
+    public String createAssessment(HttpServletRequest request) {
+	request.setAttribute("questionNumber", WebUtil.readIntParam(request, "questionNumber"));
+
+	String questionType = WebUtil.readStrParam(request, "questionType");
+	if (questionType == null || !questionType.equalsIgnoreCase("mcq")) {
+	    return "/authoring/template/tool/assessment";
+	} else {
+	    return "authoring/template/tool/assessmcq";
+	}
+
+    }
+
+    /**
+     * Specialised call to create a new question & options for the surveys tab. Returns a fragment of HTML
+     * which sets up a new CKEditor. Works with both mcquestion.jsp & surveyquestion.jsp. The template's
+     * struts action determines which jsp is used (see TBL and Inquiry uses).
+     */
+    @RequestMapping("/createQuestion")
+    public String createQuestion(HttpServletRequest request) {
+	request.setAttribute("questionNumber", WebUtil.readIntParam(request, "questionNumber"));
+	String topicNumber = request.getParameter("topicNumber");
+	if (topicNumber != null) {
+	    request.setAttribute("topicNumber", topicNumber);
+	}
+	String forward = request.getParameter("forward");
+	String path;
+	switch (forward) {
+	    case ("init") : path = "authoring/template/tbl/tbl";
+	    	break;
+	    case ("question") : path = "authoring/template/tool/mcquestion";
+	    	break;
+	    case ("questionoption") : path = "authoring/template/tool/mcoption";
+	    	break;
+	    case ("redooption") : path = "authoring/template/tool/mcredooption";
+	    	break;
+	    case ("assess") : path = "authoring/template/tool/assessment";
+	    	break;
+	    case ("assessmcq") : path = "authoring/template/tool/assessmcq";
+	    	break;
+	    case ("assessredooption") : path = "authoring/template/tool/assessredooption";
+	    	break;
+	    case ("assessoption") : path = "authoring/template/tool/assessoption";
+	    	break;
+	    case ("peerreviewstar") : path = "authoring/template/tool/peerreviewstar";
+	    	break;
+	    default : path = null;
+	    	break;
+	}
+	return (path != null && path.length() > 0 ? path : "authoring/template/tool/mcquestion");
+    }
+
+    /**
+     * Specialised call to create a new forum entry. Returns a fragment of HTML
+     * which sets up two new fields - subject and body. Works with both forum.jsp.
+     */
+    @RequestMapping
+    public String createForum(HttpServletRequest request) {
+	request.setAttribute("topicNumber", request.getParameter("topicNumber"));
+	return mapping.findForward("forum");
+    }
+
+    /**
+     * Specialised call to create a new option for a multiple choice question (mcoption.jsp), Survey question
+     * (surveyoption.jsp) or assessment multiple choice (assessmcq.jsp).
+     * Returns a fragment of HTML which sets up the editing field. The template's
+     * struts action determines which jsp is used (see TBL and Inquiry uses).
+     */
+    @RequestMapping("/createOption")
+    public String createOption(HttpServletRequest request) {
+	request.setAttribute("questionNumber", WebUtil.readIntParam(request, "questionNumber"));
+	request.setAttribute("optionNumber", WebUtil.readIntParam(request, "optionNumber"));
+	boolean useAssessmentVersion = WebUtil.readBooleanParam(request, "assess", false);
+	return (useAssessmentVersion ? "authoring/template/tool/assessoption" : "authoring/template/tool/mcoption");
+    }
+
+    @RequestMapping("/deleteOption")
+    public String deleteOption(HttpServletRequest request) {
+
+	Integer questionNumber = WebUtil.readIntParam(request, "questionNumber", true);
+	Integer delete = WebUtil.readIntParam(request, "optionNumber");
+	boolean useAssessmentVersion = WebUtil.readBooleanParam(request, "assess", false);
+
+	TreeMap<Integer, Option> optionsMap = getOptions(request, questionNumber, useAssessmentVersion);
+	optionsMap.remove(delete);
+	// reorder the displayOrder and setup the return value
+	LinkedList<Option> options = new LinkedList<Option>();
+	int displayOrder = 1;
+	for (Option option : optionsMap.values()) {
+	    option.setDisplayOrder(displayOrder++);
+	    options.add(option);
+	}
+	request.setAttribute("questionNumber", questionNumber);
+	request.setAttribute("options", options);
+	request.setAttribute("optionCount", options.size());
+	return (useAssessmentVersion ? "authoring/template/tool/assessredooption" : "authoring/template/tool/mcredooption");
+    }
+
+    @RequestMapping("/swapOption")
+    public String swapOption(HttpServletRequest request) {
+
+	Integer questionNumber = WebUtil.readIntParam(request, "questionNumber", true);
+
+	// Work out which two to swap and make swap1 the smaller of the two.
+	// They should always be consecutive, so we can (the new) swap1 with whichever is the next item.
+	int swap1 = WebUtil.readIntParam(request, "optionNumber1");
+	int swap2 = WebUtil.readIntParam(request, "optionNumber2");
+	if (swap2 < swap1) {
+	    swap1 = swap2;
+	}
+
+	boolean useAssessmentVersion = WebUtil.readBooleanParam(request, "assess", false);
+
+	TreeMap<Integer, Option> optionsMap = getOptions(request, questionNumber, useAssessmentVersion);
+	// reorder the options and setup the return value
+	LinkedList<Option> options = new LinkedList<Option>();
+
+	Option swap = null;
+	for (Option option : optionsMap.values()) {
+	    if (swap != null) {
+		swap.setDisplayOrder(option.getDisplayOrder());
+		option.setDisplayOrder(swap1);
+		options.add(option);
+		options.add(swap);
+		swap = null;
+	    } else if (option.getDisplayOrder() == swap1) {
+		swap = option;
+	    } else {
+		options.add(option);
+	    }
+	}
+	if (swap != null) {
+	    // something wrong - ended up with swap object last!
+	    options.add(swap);
+	}
+	request.setAttribute("questionNumber", questionNumber);
+	request.setAttribute("options", options);
+	request.setAttribute("optionCount", options.size());
+	return (useAssessmentVersion ? "authoring/template/tool/assessredooption" : "authoring/template/tool/mcredooption");
+    }
+
+    // if mcq paramPrefix = "question". if assessment multiple choice paramPrefix = assmcq
+    private TreeMap<Integer, Option> getOptions(HttpServletRequest request, Integer questionNumber,
+	    boolean useAssessmentVersion) {
+
+	String paramPrefix = useAssessmentVersion ? "assmcq" : "question";
+
+	// correctDisplayIdInteger is used for MCQ but not Survey - the value will be ignored by the
+	// survey jsp page.
+	Integer correctDisplayIdInteger = WebUtil.readIntParam(request, paramPrefix + questionNumber + "correct", true);
+	int correctDisplayId = correctDisplayIdInteger != null ? correctDisplayIdInteger.intValue() : 0;
+
+	TreeMap<Integer, Option> optionDtos = new TreeMap<Integer, Option>();
+
+	for (int i = 1; i <= MAX_OPTION_COUNT; i++) {
+	    String optionText = request.getParameter(paramPrefix + questionNumber + "option" + i);
+	    if (optionText != null) {
+		// Grade is used for assessment
+		String grade = request.getParameter(paramPrefix + questionNumber + "option" + i + "grade");
+		Option option = new Option(i, i == correctDisplayId, optionText, grade);
+		optionDtos.put(new Integer(i), option);
+	    }
+	}
+
+	return optionDtos;
+    }
+
+    /**
+     * Specialised call to create a new URL field & title.
+     */
+    @RequestMapping("/createResource")
+    public ActionForward createResource(HttpServletRequest request) {
+	request.setAttribute("urlNumber", request.getParameter("urlNumber"));
+	if (request.getParameter("branchNumberUnderscore") != null) {
+	    request.setAttribute("branchNumberUnderscore", request.getParameter("branchNumberUnderscore"));
+	}
+	return mapping.findForward("resource");
+    }
+
+    /**
+     * Specialised call to create a new set of fields for a branch.
+     */
+    @RequestMapping("/createBranch")
+    public String createBranch(HttpServletRequest request) {
+	request.setAttribute("branchNumber", request.getParameter("branchNumber"));
+	return mapping.findForward("branch");
+    }
+
+    /**
+     * Specialised call to create a new rating criteria for the Peer Review fields. Returns a fragment of HTML
+     * which sets up the new fields.
+     */
+    @RequestMapping("/createRatingCriteria")
+    public String createRatingCriteria(HttpServletRequest request) {
+	request.setAttribute("criteriaNumber", WebUtil.readIntParam(request, "criteriaNumber"));
+	return "authoring/template/tool/peerreviewstar";
+    }
+
+}
\ No newline at end of file
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,433 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.authoring.template.web;
+
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.authoring.template.AssessMCAnswer;
+import org.lamsfoundation.lams.authoring.template.Assessment;
+import org.lamsfoundation.lams.authoring.template.PeerReviewCriteria;
+import org.lamsfoundation.lams.authoring.template.TemplateData;
+import org.lamsfoundation.lams.rest.RestTags;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.JsonUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * A Team Based Learning template.
+ */
+@Controller
+@RequestMapping("/tbl")
+public class TBLTemplateController extends LdTemplateController {
+
+    private static Logger log = Logger.getLogger(TBLTemplateController.class);
+    private static String templateCode = "TBL";
+
+    /**
+     * Sets up the CKEditor stuff
+     */
+    @Override
+    @RequestMapping("/init")
+    public String init(HttpServletRequest request) throws Exception {
+	request.setAttribute("questionNumber", "1");
+	return super.init(request);
+    }
+
+    @Override
+    protected ObjectNode createLearningDesign(HttpServletRequest request) throws Exception {
+
+	TBLData data = new TBLData(request);
+	if (data.getErrorMessages() != null && data.getErrorMessages().size() > 0) {
+	    ObjectNode restRequestJSON = JsonNodeFactory.instance.objectNode();
+	    restRequestJSON.set("errors", JsonUtil.readArray(data.getErrorMessages()));
+	    return restRequestJSON;
+	}
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	Integer workspaceFolderID = getWorkspaceManagementService().getUserWorkspaceFolder(userDTO.getUserID())
+		.getResourceID().intValue();
+	AtomicInteger maxUIID = new AtomicInteger();
+	int order = 0;
+
+	// create activities
+	ArrayNode activities = JsonNodeFactory.instance.arrayNode();
+	ArrayNode groupings = JsonNodeFactory.instance.arrayNode();
+
+	Integer[] firstActivityInRowPosition = new Integer[] { 20, 125 }; // the very first activity, all other locations can be calculated from here if needed!
+
+	// Welcome
+	String activityTitle = data.getText("boilerplate.introduction.title");
+	Long welcomeToolContentId = createNoticeboardToolContent(userDTO, activityTitle,
+		data.getText("boilerplate.introduction.instructions"), null);
+	activities.add(createNoticeboardActivity(maxUIID, order++, firstActivityInRowPosition, welcomeToolContentId,
+		data.contentFolderID, null, null, null, activityTitle));
+
+	// Grouping
+	Integer[] currentActivityPosition = calcPositionNextRight(firstActivityInRowPosition);
+	ObjectNode[] groupingJSONs = createGroupingActivity(maxUIID, order++, currentActivityPosition,
+		data.groupingType, data.numLearners, data.numGroups, null, null, data.getUIBundle(),
+		data.getFormatter());
+	activities.add(groupingJSONs[0]);
+	groupings.add(groupingJSONs[1]);
+	Integer groupingUIID = groupingJSONs[1].get("groupingUIID").asInt();
+
+	// Stop!
+	currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+	activities.add(createGateActivity(maxUIID, order++, calcGateOffset(currentActivityPosition)));
+
+	// iRA Test - MCQ
+	currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+	activityTitle = data.getText("boilerplate.ira.title");
+	Long iRAToolContentId = createMCQToolContent(userDTO, activityTitle,
+		data.getText("boilerplate.ira.instructions"), false, JsonUtil.readArray(data.testQuestions.values()));
+	activities.add(createMCQActivity(maxUIID, order++, currentActivityPosition, iRAToolContentId,
+		data.contentFolderID, groupingUIID, null, null, activityTitle));
+
+	// Stop!
+	currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+	activities.add(createGateActivity(maxUIID, order++, calcGateOffset(currentActivityPosition)));
+
+	// Leader Selection
+	firstActivityInRowPosition = calcPositionBelow(firstActivityInRowPosition);
+	activityTitle = data.getText("boilerplate.leader.title");
+	Long leaderSelectionToolContentId = createLeaderSelectionToolContent(userDTO, activityTitle,
+		data.getText("boilerplate.leader.instructions"));
+	activities.add(createLeaderSelectionActivity(maxUIID, order++, firstActivityInRowPosition,
+		leaderSelectionToolContentId, data.contentFolderID, groupingUIID, null, null, activityTitle));
+
+	// tRA Test
+	currentActivityPosition = calcPositionNextRight(firstActivityInRowPosition);
+	activityTitle = data.getText("boilerplate.tra.title");
+	Long tRAToolContentId = createScratchieToolContent(userDTO, activityTitle,
+		data.getText("boilerplate.tra.instructions"), false, JsonUtil.readArray(data.testQuestions.values()));
+	activities.add(createScratchieActivity(maxUIID, order++, currentActivityPosition, tRAToolContentId,
+		data.contentFolderID, groupingUIID, null, null, activityTitle));
+
+	// Stop!
+	currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+	activities.add(createGateActivity(maxUIID, order++, calcGateOffset(currentActivityPosition)));
+
+	// Application Exercise - all the questions go into one exercise
+	firstActivityInRowPosition = calcPositionBelow(firstActivityInRowPosition);
+	currentActivityPosition = firstActivityInRowPosition;
+	ArrayNode questionsJSONArray = JsonNodeFactory.instance.arrayNode();
+	int displayOrder = 1;
+	for (Assessment exerciseQuestion : data.applicationExercises.values()) {
+	    String applicationExerciseTitle = data.getText("boilerplate.ae.application.exercise.num",
+		    new String[] { Integer.toString(displayOrder) });
+	    exerciseQuestion.setTitle(applicationExerciseTitle);
+	    questionsJSONArray.add(exerciseQuestion.getAsObjectNode(displayOrder));
+	    displayOrder++;
+	}
+	String overallAssessmentTitle = data.getText("boilerplate.ae.application.exercise.num", new String[] { "" });
+	Long aetoolContentId = createAssessmentToolContent(userDTO, overallAssessmentTitle,
+		data.getText("boilerplate.ae.instructions"), null, true, questionsJSONArray);
+	activities.add(createAssessmentActivity(maxUIID, order++, currentActivityPosition, aetoolContentId,
+		data.contentFolderID, groupingUIID, null, null, overallAssessmentTitle));
+
+	// Peer Review - optional. Start by eliminating all criterias with no title. Then if any are left
+	// we create the tool data and activity
+	currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+	ArrayNode criterias = JsonNodeFactory.instance.arrayNode();
+	for (PeerReviewCriteria criteria : data.peerReviewCriteria.values()) {
+	    if (criteria.getTitle() != null && criteria.getTitle().length() > 0) {
+		criterias.add(criteria.getAsObjectNode());
+	    }
+	}
+	if (criterias.size() > 0) {
+	    String peerReviewTitle = data.getText("boilerplate.peerreview");
+	    Long prtoolContentId = createPeerReviewToolContent(userDTO, peerReviewTitle,
+		    data.getText("boilerplate.peerreview.instructions"), null, criterias);
+	    activities.add(createPeerReviewActivity(maxUIID, order++, currentActivityPosition, prtoolContentId,
+		    data.contentFolderID, groupingUIID, null, null, peerReviewTitle));
+	    displayOrder++;
+	    currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+	}
+
+	// Stop!
+	activities.add(createGateActivity(maxUIID, order++, calcGateOffset(currentActivityPosition)));
+
+	// Individual Reflection
+	currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+	activityTitle = data.getText("boilerplate.individual.reflection.title");
+	Long reflectionToolContentId = createNotebookToolContent(userDTO, activityTitle,
+		data.getText("boilerplate.individual.reflection.instructions"), false, false);
+	activities.add(createNotebookActivity(maxUIID, order++, currentActivityPosition, reflectionToolContentId,
+		data.contentFolderID, null, null, null, activityTitle));
+
+	ArrayNode transitions = createTransitions(maxUIID, activities);
+
+	// fill in required LD data and send it to the LearningDesignRestServlet
+	return saveLearningDesign(templateCode, data.sequenceTitle, "", workspaceFolderID, data.contentFolderID,
+		maxUIID.get(), activities, transitions, groupings, null);
+
+    }
+
+    /**
+     * TBLData contains all the data we need for the current instance. Created for each call to ensure that we have the
+     * correct locale, messages, etc for this particular call.
+     *
+     * The complex types are converted straight to JSON objects ready for sending to the tools. No need to process
+     * twice!
+     *
+     * For the test questions need to meet the spec: The questions entry should be ArrayNode containing JSON objects,
+     * which in turn must contain "questionText", "displayOrder" (Integer) and a ArrayNode "answers". The options entry
+     * should be ArrayNode containing JSON objects, which in turn must contain "answerText", "displayOrder" (Integer),
+     * "correctOption" (Boolean).
+     */
+    class TBLData extends TemplateData {
+	/* Fields from form */
+	String contentFolderID;
+	String sequenceTitle;
+	Integer groupingType;
+	Integer numLearners;
+	Integer numGroups;
+	SortedMap<Integer, ObjectNode> testQuestions;
+	SortedMap<Integer, Assessment> applicationExercises;
+	SortedMap<Integer, PeerReviewCriteria> peerReviewCriteria;
+
+	int questionOffset = 8;
+	int assessmentOffset = 10;
+
+	TBLData(HttpServletRequest request) {
+	    super(request, templateCode);
+
+	    contentFolderID = getTrimmedString(request, "contentFolderID", false);
+
+	    sequenceTitle = getTrimmedString(request, "sequenceTitle", false);
+
+	    groupingType = WebUtil.readIntParam(request, "grouping");
+	    numLearners = WebUtil.readIntParam(request, "numLearners", true);
+	    numGroups = WebUtil.readIntParam(request, "numGroups", true);
+
+	    testQuestions = new TreeMap<>();
+	    applicationExercises = new TreeMap<>();
+	    peerReviewCriteria = new TreeMap<>();
+
+	    TreeMap<Integer, Integer> correctAnswers = new TreeMap<>();
+	    Enumeration parameterNames = request.getParameterNames();
+	    while (parameterNames.hasMoreElements()) {
+		String name = (String) parameterNames.nextElement();
+		if (name.startsWith("question")) {
+		    int correctIndex = name.indexOf("correct");
+		    if (correctIndex > 0) { // question1correct
+			Integer questionDisplayOrder = Integer.valueOf(name.substring(questionOffset, correctIndex));
+			Integer correctValue = WebUtil.readIntParam(request, name);
+			correctAnswers.put(questionDisplayOrder, correctValue);
+		    } else {
+			int optionIndex = name.indexOf("option");
+			if (optionIndex > 0) {
+			    Integer questionDisplayOrder = Integer.valueOf(name.substring(questionOffset, optionIndex));
+			    Integer optionDisplayOrder = Integer.valueOf(name.substring(optionIndex + 6));
+			    processTestQuestion(name, null, questionDisplayOrder, optionDisplayOrder,
+				    getTrimmedString(request, name, true));
+			} else {
+			    Integer questionDisplayOrder = Integer.valueOf(name.substring(questionOffset));
+			    processTestQuestion(name, getTrimmedString(request, name, true), questionDisplayOrder, null,
+				    null);
+			}
+		    }
+		} else if (name.startsWith("peerreview")) {
+		    processInputPeerReviewRequestField(name, request);
+		}
+	    }
+	    updateCorrectAnswers(correctAnswers);
+
+	    processAssessments(request);
+
+	    validate();
+
+	}
+
+	// Assessment entries can't be deleted or rearranged so the count should always line up with numAssessments
+	private void processAssessments(HttpServletRequest request) {
+	    int numAssessments = WebUtil.readIntParam(request, "numAssessments");
+	    for (int i = 1; i <= numAssessments; i++) {
+		String assessmentPrefix = "assessment" + i;
+		String questionText = getTrimmedString(request, assessmentPrefix, true);
+		Assessment assessment = new Assessment();
+		if (questionText != null) {
+		    assessment.setQuestionText(questionText);
+		    assessment.setType(WebUtil.readStrParam(request, assessmentPrefix + "type"));
+		    assessment.setRequired(true);
+		    if (assessment.getType() == Assessment.ASSESSMENT_QUESTION_TYPE_MULTIPLE_CHOICE) {
+			String optionPrefix = "assmcq" + i;
+			optionPrefix = optionPrefix + "option";
+			for (int o = 1, order = 0; o <= MAX_OPTION_COUNT; o++) {
+			    String answer = getTrimmedString(request, optionPrefix + o, true);
+			    if (answer != null) {
+				String grade = request.getParameter(optionPrefix + o + "grade");
+				try {
+				    assessment.getAnswers()
+					    .add(new AssessMCAnswer(order++, answer, Float.valueOf(grade)));
+				} catch (Exception e) {
+				    log.error("Error parsing " + grade + " for float", e);
+				    addValidationErrorMessage(
+					    "authoring.error.application.exercise.not.blank.and.grade", new Object[i]);
+				}
+			    }
+			}
+		    }
+		    applicationExercises.put(i, assessment);
+		}
+	    }
+	}
+
+	void processInputPeerReviewRequestField(String name, HttpServletRequest request) {
+	    log.debug("process peer review " + name + " order " + name.substring(10));
+	    int fieldIndex = name.indexOf("EnableComments");
+	    if (fieldIndex > 0) { // peerreview1EnableComments
+		Integer criteriaNumber = Integer.valueOf(name.substring(10, fieldIndex));
+		findCriteriaInMap(criteriaNumber).setCommentsEnabled(WebUtil.readBooleanParam(request, name, false));
+	    } else {
+		fieldIndex = name.indexOf("MinWordsLimit");
+		if (fieldIndex > 0) {
+		    Integer criteriaNumber = Integer.valueOf(name.substring(10, fieldIndex));
+		    findCriteriaInMap(criteriaNumber)
+			    .setCommentsMinWordsLimit(WebUtil.readIntParam(request, name, true));
+		} else {
+		    Integer criteriaNumber = Integer.valueOf(name.substring(10));
+		    findCriteriaInMap(criteriaNumber).setTitle(getTrimmedString(request, name, true));
+		}
+	    }
+	}
+
+	private PeerReviewCriteria findCriteriaInMap(Integer criteriaNumber) {
+	    PeerReviewCriteria criteria = peerReviewCriteria.get(criteriaNumber);
+	    if (criteria == null) {
+		criteria = new PeerReviewCriteria(criteriaNumber);
+		peerReviewCriteria.put(criteriaNumber, criteria);
+	    }
+	    return criteria;
+	}
+
+	void processTestQuestion(String name, String questionText, Integer questionDisplayOrder,
+		Integer optionDisplayOrder, String optionText) {
+
+	    ObjectNode question = testQuestions.get(questionDisplayOrder);
+	    if (question == null) {
+		question = JsonNodeFactory.instance.objectNode();
+		question.set(RestTags.ANSWERS, JsonNodeFactory.instance.arrayNode());
+		question.put(RestTags.DISPLAY_ORDER, questionDisplayOrder);
+		testQuestions.put(questionDisplayOrder, question);
+	    }
+
+	    if (questionText != null) {
+		question.put(RestTags.QUESTION_TEXT, questionText);
+		question.put(RestTags.QUESTION_TITLE, "Q" + questionDisplayOrder.toString()); // only used for
+											      // Scratchie, not MCQ but
+											      // won't hurt MCQ by being
+											      // there!
+	    }
+
+	    if (optionDisplayOrder != null && optionText != null) {
+		ObjectNode newOption = JsonNodeFactory.instance.objectNode();
+		newOption.put(RestTags.DISPLAY_ORDER, optionDisplayOrder);
+		newOption.put(RestTags.CORRECT, false);
+		newOption.put(RestTags.ANSWER_TEXT, optionText);
+		((ArrayNode) question.get(RestTags.ANSWERS)).add(newOption);
+	    }
+
+	}
+
+	void updateCorrectAnswers(TreeMap<Integer, Integer> correctAnswers) {
+	    for (Entry<Integer, ObjectNode> entry : testQuestions.entrySet()) {
+		Integer questionNumber = entry.getKey();
+		ObjectNode question = entry.getValue();
+		if (!question.has(RestTags.QUESTION_TEXT)) {
+		    addValidationErrorMessage("authoring.error.question.num", new Integer[] { questionNumber });
+		}
+
+		Integer correctAnswerDisplay = correctAnswers.get(entry.getKey());
+		if (correctAnswerDisplay == null) {
+		    addValidationErrorMessage("authoring.error.question.correct.num", new Integer[] { questionNumber });
+		} else {
+
+		    ArrayNode answers = (ArrayNode) question.get(RestTags.ANSWERS);
+		    if (answers == null || answers.size() == 0) {
+			addValidationErrorMessage("authoring.error.question.must.have.answer.num",
+				new Integer[] { questionNumber });
+		    } else {
+			boolean correctAnswerFound = false; // may not exist as the user didn't put any text in!
+			for (int i = 0; i < answers.size(); i++) {
+			    ObjectNode option = (ObjectNode) answers.get(i);
+			    if (correctAnswerDisplay.equals(option.get(RestTags.DISPLAY_ORDER).asInt())) {
+				option.remove(RestTags.CORRECT);
+				option.put(RestTags.CORRECT, true);
+				correctAnswerFound = true;
+			    }
+			}
+			if (!correctAnswerFound) {
+			    addValidationErrorMessage("authoring.error.question.correct.num",
+				    new Integer[] { questionNumber });
+			}
+		    }
+		}
+	    }
+	}
+
+	// do any additional validation not included in other checking
+	void validate() {
+	    if (contentFolderID == null) {
+		addValidationErrorMessage("authoring.error.content.id", null);
+	    }
+	    if (sequenceTitle == null) {
+		addValidationErrorMessage("authoring.error.sequence.title", null);
+	    }
+	    if (applicationExercises.size() == 0) {
+		addValidationErrorMessage("authoring.error.application.exercise.num", new Integer[] { 1 });
+	    } else {
+		for (Map.Entry<Integer, Assessment> assessmentEntry : applicationExercises.entrySet()) {
+		    List<String> errors = assessmentEntry.getValue().validate(appBundle, formatter,
+			    assessmentEntry.getKey());
+		    if (errors != null) {
+			errorMessages.addAll(errors);
+		    }
+		}
+	    }
+	    // grouping is enforced on the front end by the layout & by requiring the groupingType
+	    // questions are validated in updateCorrectAnswers
+	}
+
+    }
+
+}
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,507 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+
+package org.lamsfoundation.lams.authoring.web;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.authoring.ObjectExtractorException;
+import org.lamsfoundation.lams.authoring.service.IAuthoringService;
+import org.lamsfoundation.lams.integration.ExtCourseClassMap;
+import org.lamsfoundation.lams.integration.ExtServer;
+import org.lamsfoundation.lams.integration.service.IIntegrationService;
+import org.lamsfoundation.lams.integration.util.LoginRequestDispatcher;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.BranchingActivity;
+import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.LearningDesignAccess;
+import org.lamsfoundation.lams.learningdesign.LearningLibrary;
+import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup;
+import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO;
+import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO;
+import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO;
+import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
+import org.lamsfoundation.lams.security.ISecurityService;
+import org.lamsfoundation.lams.tool.IToolVO;
+import org.lamsfoundation.lams.tool.ToolContentManager;
+import org.lamsfoundation.lams.tool.ToolOutputDefinition;
+import org.lamsfoundation.lams.tool.dto.ToolOutputDefinitionDTO;
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.exception.UserException;
+import org.lamsfoundation.lams.usermanagement.exception.WorkspaceFolderException;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.JsonUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.workspace.web.WorkspaceAction;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * @author Manpreet Minhas
+ */
+@Controller
+@RequestMapping("/authoring")
+public class AuthoringController {
+
+    private static Logger log = Logger.getLogger(AuthoringController.class);
+
+    @Autowired
+    @Qualifier("monitoringService")
+    private IMonitoringService monitoringService;
+    @Autowired
+    @Qualifier("userManagementService")
+    private IUserManagementService userManagementService;
+    private static ILamsToolService toolService;
+    @Autowired
+    @Qualifier("authoringService")
+    private static IAuthoringService authoringService;
+    @Autowired
+    @Qualifier("learningDesignService")
+    private static ILearningDesignService learningDesignService;
+    @Autowired
+    @Qualifier("securityService")
+    private static ISecurityService securityService;
+    @Autowired
+    @Qualifier("integrationService")
+    private static IIntegrationService integrationService;
+    @Autowired
+    WebApplicationContext applicationContext;
+
+    private static int LEARNING_DESIGN_ACCESS_ENTRIES_LIMIT = 7;
+
+    private Integer getUserId() {
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	return user != null ? user.getUserID() : null;
+    }
+
+    private String getUserLanguage() {
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	return user != null ? user.getLocaleLanguage() : "";
+    }
+
+    @RequestMapping("/openAuthoring")
+    public String openAuthoring(HttpServletRequest request) throws IOException {
+	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, FileUtil.generateUniqueContentFolderID());
+
+	request.setAttribute("tools", learningDesignService.getToolDTOs(true, true, request.getRemoteUser()));
+	// build list of existing learning library groups
+	List<LearningLibraryGroup> groups = learningDesignService.getLearningLibraryGroups();
+	ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode();
+	for (LearningLibraryGroup group : groups) {
+	    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
+	    groupJSON.put("name", group.getName());
+	    for (LearningLibrary learningLibrary : group.getLearningLibraries()) {
+		groupJSON.withArray("learningLibraries").add(learningLibrary.getLearningLibraryId());
+	    }
+	    groupsJSON.add(groupJSON);
+	}
+	request.setAttribute("learningLibraryGroups", groupsJSON.toString());
+
+	List<LearningDesignAccess> accessList = authoringService.updateLearningDesignAccessByUser(getUserId());
+	accessList = accessList.subList(0,
+		Math.min(accessList.size(), AuthoringController.LEARNING_DESIGN_ACCESS_ENTRIES_LIMIT - 1));
+	request.setAttribute("access", JsonUtil.toString(accessList));
+	request.setAttribute("licenses", authoringService.getAvailableLicenses());
+
+	return "authoring/authoring";
+    }
+
+    @RequestMapping("/generateSVG")
+    public String generateSVG(HttpServletRequest request) throws IOException {
+	request.setAttribute("tools", learningDesignService.getToolDTOs(true, true, request.getRemoteUser()));
+
+	return "authoring/svgGenerator";
+    }
+
+    @RequestMapping("/getToolOutputDefinitions")
+    @ResponseBody
+    public String getToolOutputDefinitions(HttpServletRequest request, HttpServletResponse response)
+	    throws ServletException, IOException {
+	Long toolContentID = WebUtil.readLongParam(request, "toolContentID");
+	Integer definitionType = ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION;
+
+	List<ToolOutputDefinitionDTO> defnDTOList = authoringService.getToolOutputDefinitions(toolContentID,
+		definitionType);
+
+	response.setContentType("application/json;charset=utf-8");
+	return JsonUtil.toString(defnDTOList);
+    }
+
+    @SuppressWarnings("unchecked")
+    @RequestMapping("/openLearningDesign")
+    @ResponseBody
+    public String openLearningDesign(HttpServletRequest request, HttpServletResponse response)
+	    throws ServletException, IOException {
+	long learningDesignID = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID);
+	LearningDesignDTO learningDesignDTO = learningDesignService.getLearningDesignDTO(learningDesignID,
+		getUserLanguage());
+
+	// some old LDs may not have learning library IDs filled in, try to find them
+	for (AuthoringActivityDTO activity : (List<AuthoringActivityDTO>) learningDesignDTO.getActivities()) {
+	    if (activity.getLearningLibraryID() == null) {
+		learningDesignService.fillLearningLibraryID(activity);
+	    }
+	}
+
+	Integer userId = getUserId();
+	if (learningDesignDTO.getWorkspaceFolderID() != null) {
+	    authoringService.storeLearningDesignAccess(learningDesignID, userId);
+	}
+
+	response.setContentType("application/json;charset=utf-8");
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	ObjectNode ldJSON = JsonUtil.readObject(learningDesignDTO);
+	// get all parent folders of the LD
+	List<Integer> folderPath = new LinkedList<>();
+	WorkspaceFolder folder = (WorkspaceFolder) userManagementService.findById(WorkspaceFolder.class,
+		learningDesignDTO.getWorkspaceFolderID());
+	while (folder != null) {
+	    Integer folderID = folder.getWorkspaceFolderId();
+	    if (folderID.equals(WorkspaceAction.ROOT_ORG_FOLDER_ID)) {
+		// we reached the top folder, finish
+		folder = null;
+	    } else {
+		folderPath.add(folderID);
+		folder = folder.getParentWorkspaceFolder();
+	    }
+	}
+	// we'll go from top to bottom
+	Collections.reverse(folderPath);
+	ldJSON.set("folderPath", JsonUtil.readArray(folderPath));
+	responseJSON.set("ld", ldJSON);
+
+	List<LearningDesignAccess> accessList = authoringService.updateLearningDesignAccessByUser(userId);
+	accessList = accessList.subList(0,
+		Math.min(accessList.size(), AuthoringController.LEARNING_DESIGN_ACCESS_ENTRIES_LIMIT - 1));
+	responseJSON.set("access", JsonUtil.readArray(accessList));
+
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
+    @RequestMapping("/finishLearningDesignEdit")
+    @ResponseBody
+    public void finishLearningDesignEdit(HttpServletRequest request) throws ServletException, IOException {
+	Long learningDesignID = WebUtil.readLongParam(request, "learningDesignID", false);
+	boolean cancelled = WebUtil.readBooleanParam(request, "cancelled", false);
+
+	try {
+	    authoringService.finishEditOnFly(learningDesignID, getUserId(), cancelled);
+	} catch (Exception e) {
+	    String errorMsg = "Error occured ending EditOnFly" + e.getMessage() + " learning design id "
+		    + learningDesignID;
+	    log.error(errorMsg, e);
+	    throw new IOException(e);
+	}
+
+    }
+
+    /**
+     * Copy some existing content. Used when the user copies an activity in authoring. Expects one parameters -
+     * toolContentId (the content to be copied)
+     */
+    @RequestMapping("/copyToolContent")
+    @ResponseBody
+    public String copyToolContent(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException {
+	try {
+	    String customCSV = WebUtil.readStrParam(request, AttributeNames.PARAM_CUSTOM_CSV, true);
+	    long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID, false);
+	    Long newToolContentID = authoringService.copyToolContent(toolContentID, customCSV);
+	    response.setContentType("text/plain;charset=utf-8");
+	    return newToolContentID.toString();
+	} catch (Exception e) {
+	    response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+	}
+
+	return null;
+    }
+
+    /**
+     * Creates a copy of default tool content.
+     */
+    @RequestMapping("/createToolContent")
+    @ResponseBody
+    public String createToolContent(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException {
+	Long toolID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_ID);
+	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID, true);
+	if (toolContentID == null) {
+	    // if the tool content ID was not provided, generate the next unique content ID for the tool
+	    toolContentID = authoringService.insertToolContentID(toolID);
+	}
+
+	if (toolContentID != null) {
+	    String contentFolderID = request.getParameter(AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	    if (StringUtils.isBlank(contentFolderID)) {
+		contentFolderID = FileUtil.generateUniqueContentFolderID();
+	    }
+
+	    String authorUrl = authoringService.getToolAuthorUrl(toolID, toolContentID, contentFolderID);
+	    if (authorUrl != null) {
+		ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+		responseJSON.put("authorURL", authorUrl);
+		// return the generated values
+		responseJSON.put(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentID);
+		responseJSON.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
+		response.setContentType("application/json;charset=utf-8");
+		return responseJSON.toString();
+	    }
+	}
+	return null;
+    }
+
+    /**
+     * Creates a LD with the given activity and starts a lesson with default class and settings.
+     */
+    @ResponseBody
+    @RequestMapping("/createSingleActivityLesson")
+    @SuppressWarnings("unchecked")
+    public String createSingleActivityLesson(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException {
+	Long toolID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_ID);
+	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Long learningLibraryID = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNING_LIBRARY_ID, true);
+	String contentFolderID = request.getParameter(AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID, true);
+	if (organisationID == null) {
+	    // if organisation ID is not set explicitly, derived it from external course
+	    String serverID = request.getParameter(LoginRequestDispatcher.PARAM_SERVER_ID);
+	    String courseID = request.getParameter(LoginRequestDispatcher.PARAM_COURSE_ID);
+	    ExtServer extServer = integrationService.getExtServer(serverID);
+	    ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer.getSid(), courseID);
+	    organisationID = orgMap.getOrganisation().getOrganisationId();
+	}
+	Integer userID = getUserId();
+
+	if (!securityService.isGroupMonitor(organisationID, userID, "create single activity lesson", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
+	    return null;
+	}
+
+	// get title from tool content
+	IToolVO tool = toolService.getToolByID(toolID);
+	if (learningLibraryID == null) {
+	    // if learning library ID is not set explicitly, derive it from tool
+	    learningLibraryID = tool.getLearningLibraryId();
+	}
+	WebApplicationContext wac = WebApplicationContextUtils
+		.getRequiredWebApplicationContext(applicationContext.getServletContext());
+	ToolContentManager toolManager = (ToolContentManager) wac.getBean(tool.getServiceName());
+	String title = toolManager.getToolContentTitle(toolContentID);
+	if (title == null || title.trim().length() == 0) {
+	    title = learningDesignService.internationaliseActivityTitle(learningLibraryID);
+	}
+	// create the LD and put it in Run Sequences folder in the given organisation
+	Long learningDesignID = authoringService.insertSingleActivityLearningDesign(title, toolID, toolContentID,
+		learningLibraryID, contentFolderID, organisationID);
+	if (learningDesignID != null) {
+	    User user = (User) userManagementService.findById(User.class, userID);
+	    Lesson lesson = monitoringService.initializeLessonWithoutLDcopy(title, "", learningDesignID, user, null,
+		    false, false, false, false, true, true, false, false, true, null, null);
+	    Organisation organisation = monitoringService.getOrganisation(organisationID);
+
+	    List<User> staffList = new LinkedList<>();
+	    staffList.add(user);
+
+	    // add organisation's learners as lesson participants
+	    List<User> learnerList = new LinkedList<>();
+	    Vector<User> learnerVector = userManagementService.getUsersFromOrganisationByRole(organisationID,
+		    Role.LEARNER, true);
+	    learnerList.addAll(learnerVector);
+	    monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
+		    organisation.getName() + " learners", learnerList, organisation.getName() + " staff", staffList,
+		    userID);
+
+	    monitoringService.startLesson(lesson.getLessonId(), userID);
+
+	    if (AuthoringController.log.isDebugEnabled()) {
+		AuthoringController.log.debug("Created a single activity lesson with ID: " + lesson.getLessonId());
+	    }
+
+	    response.setContentType("text/plain;charset=utf-8");
+	    return learningDesignID.toString();
+	}
+
+	return null;
+    }
+
+    /**
+     * Stores Learning Desing created in Authoring.
+     */
+    @ResponseBody
+    @RequestMapping(path = "/saveLearningDesign", method = RequestMethod.POST)
+    public String saveLearningDesign(HttpServletRequest request, HttpServletResponse response)
+	    throws UserException, WorkspaceFolderException, IOException, ObjectExtractorException, ParseException {
+	ObjectNode ldJSON = JsonUtil.readObject(request.getParameter("ld"));
+
+	LearningDesign learningDesign = authoringService.saveLearningDesignDetails(ldJSON);
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	if (learningDesign != null) {
+	    Long learningDesignID = learningDesign.getLearningDesignId();
+	    if (learningDesignID != null) {
+		responseJSON.put("learningDesignID", learningDesignID);
+
+		Vector<ValidationErrorDTO> validationDTOs = authoringService.validateLearningDesign(learningDesignID);
+		responseJSON.set("validation", JsonUtil.readArray(validationDTOs));
+	    }
+	}
+
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
+    /**
+     * Gets a list of recently used Learning Designs for currently logged in user.
+     */
+    @ResponseBody
+    @RequestMapping("/")
+    public String getLearningDesignAccess(HttpServletRequest request, HttpServletResponse response) throws IOException {
+	Integer userId = getUserId();
+
+	List<LearningDesignAccess> accessList = authoringService.updateLearningDesignAccessByUser(userId);
+	accessList = accessList.subList(0,
+		Math.min(accessList.size(), AuthoringController.LEARNING_DESIGN_ACCESS_ENTRIES_LIMIT - 1));
+
+	response.setContentType("application/json;charset=utf-8");
+	return JsonUtil.toString(accessList);
+    }
+
+    /**
+     * Stores the binary code of an Learning Design thumbnail, created in Authoring.
+     *
+     * @throws IOException
+     */
+    @ResponseBody
+    @RequestMapping(path = "/saveLearningDesignImage", method = RequestMethod.POST)
+    public void saveLearningDesignImage(HttpServletRequest request, HttpServletResponse response) throws IOException {
+	Long learningDesignID = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID);
+	String image = request.getParameter("image");
+	boolean saveSuccesful = AuthoringController.saveLearningDesignImage(learningDesignID, image);
+	if (!saveSuccesful) {
+	    response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+	}
+    }
+
+    /**
+     * Updates an existing activity coordinates.
+     * It is run when SVG gets recreated in Monitoring or Add Lesson dialog
+     * and activities need to be rearranged as one of them is a branching designed in the old Flash Authoring.
+     */
+    @ResponseBody
+    @RequestMapping(path = "/saveActivityCoordinates", method = RequestMethod.POST)
+    public void saveActivityCoordinates(HttpServletRequest request, HttpServletResponse response) throws IOException {
+	try {
+	    ObjectNode activityJSON = JsonUtil.readObject(request.getParameter("activity"));
+	    Activity activity = monitoringService.getActivityById(JsonUtil.optLong(activityJSON, "activityID"));
+	    activity.setXcoord(JsonUtil.optInt(activityJSON, "xCoord"));
+	    activity.setYcoord(JsonUtil.optInt(activityJSON, "yCoord"));
+	    if (activity.isBranchingActivity()) {
+		BranchingActivity branchingActivity = (BranchingActivity) activity;
+		branchingActivity.setStartXcoord(JsonUtil.optInt(activityJSON, "startXCoord"));
+		branchingActivity.setEndXcoord(JsonUtil.optInt(activityJSON, "endXCoord"));
+		branchingActivity.setStartYcoord(JsonUtil.optInt(activityJSON, "startYCoord"));
+		branchingActivity.setEndYcoord(JsonUtil.optInt(activityJSON, "endYCoord"));
+	    }
+	    userManagementService.save(activity);
+	} catch (Exception e) {
+	    log.error("Exception while saving activity coordinates", e);
+	    response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+	}
+    }
+
+    /**
+     * Stores the binary code of an Learning Design thumbnail, created in Authoring.
+     */
+    private static boolean saveLearningDesignImage(long learningDesignID, String image) {
+	if (StringUtils.isBlank(image)) {
+	    AuthoringController.log.error("No SVG code to save for LD: " + learningDesignID);
+	    return false;
+	}
+
+	// prepare the dir and the file
+	File thumbnailDir = new File(ILearningDesignService.LD_SVG_TOP_DIR);
+	String thumbnailSubdir = String.valueOf(learningDesignID);
+	if (thumbnailSubdir.length() % 2 == 1) {
+	    thumbnailSubdir = "0" + thumbnailSubdir;
+	}
+	for (int charIndex = 0; charIndex < thumbnailSubdir.length(); charIndex += 2) {
+	    thumbnailDir = new File(thumbnailDir,
+		    "" + thumbnailSubdir.charAt(charIndex) + thumbnailSubdir.charAt(charIndex + 1));
+	}
+	thumbnailDir.mkdirs();
+
+	String absoluteFilePath = FileUtil.getFullPath(thumbnailDir.getAbsolutePath(), learningDesignID + ".svg");
+
+	// write out the content
+	try (FileOutputStream fos = new FileOutputStream(absoluteFilePath);
+		Writer writer = new OutputStreamWriter(fos, "UTF8")) {
+	    // encoding is important, especially for Raphael-generated SVGs
+	    writer.write(image);
+	} catch (IOException e) {
+	    AuthoringController.log.error("Error while writing SVG thumbnail of LD " + learningDesignID + ".", e);
+	    return false;
+	}
+	return true;
+    }
+
+}
\ No newline at end of file
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,148 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.authoring.web;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
+import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
+import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * Export tool content action. It needs learingDesignID as input parameter.
+ *
+ * @author Steve.Ni
+ */
+@Controller
+public class ExportToolContentController {
+
+    @Autowired
+    IExportToolContentService exportToolContentService;
+
+    public static final String PARAM_LEARING_DESIGN_ID = "learningDesignID";
+    public static final String ATTR_TOOLS_ERROR_MESSAGE = "toolsErrorMessages";
+    public static final String ATTR_LD_ERROR_MESSAGE = "ldErrorMessages";
+
+    private Logger log = Logger.getLogger(ExportToolContentController.class);
+
+    @RequestMapping("/authoring/exportToolContent")
+    public String execute(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	String param = request.getParameter("method");
+	// -----------------------Resource Author function ---------------------------
+	if (StringUtils.equals(param, "loading")) {
+	    Long learningDesignId = WebUtil.readLongParam(request, ExportToolContentController.PARAM_LEARING_DESIGN_ID);
+	    request.setAttribute(ExportToolContentController.PARAM_LEARING_DESIGN_ID, learningDesignId);
+	    // display initial page for automatically loading download pgm
+	    return "toolcontent/exportloading";
+	} else if (StringUtils.equals(param, "export")) {
+	    // the export LD pgm
+	    return exportLD(request, response);
+	} else { // choice format
+	    Long learningDesignId = WebUtil.readLongParam(request, ExportToolContentController.PARAM_LEARING_DESIGN_ID);
+	    request.setAttribute(ExportToolContentController.PARAM_LEARING_DESIGN_ID, learningDesignId);
+	    // display choose IMS or LAMS format page
+	    return "toolcontent/exportchoice";
+	}
+    }
+
+    private String exportLD(HttpServletRequest request, HttpServletResponse response) {
+	Long learningDesignId = WebUtil.readLongParam(request, ExportToolContentController.PARAM_LEARING_DESIGN_ID);
+	List<String> ldErrorMsgs = new ArrayList<>();
+	List<String> toolsErrorMsgs = new ArrayList<>();
+
+	try {
+	    String zipFilename = exportToolContentService.exportLearningDesign(learningDesignId, toolsErrorMsgs);
+
+	    // get only filename
+	    String zipfile = FileUtil.getFileName(zipFilename);
+
+	    // replace spaces (" ") with underscores ("_")
+
+	    zipfile = zipfile.replaceAll(" ", "_");
+
+	    // write zip file as response stream.
+
+	    // Different browsers handle stream downloads differently LDEV-1243
+	    String filename = FileUtil.encodeFilenameForDownload(request, zipfile);
+	    log.debug("Final filename to export: " + filename);
+
+	    response.setContentType("application/x-download");
+	    // response.setContentType("application/zip");
+	    response.setHeader("Content-Disposition", "attachment;filename=" + filename);
+	    InputStream in = null;
+	    OutputStream out = null;
+	    try {
+		in = new BufferedInputStream(new FileInputStream(zipFilename));
+		out = response.getOutputStream();
+		int count = 0;
+
+		int ch;
+		while ((ch = in.read()) != -1) {
+		    out.write((char) ch);
+		    count++;
+		}
+		log.debug("Wrote out " + count + " bytes");
+		response.setContentLength(count);
+		out.flush();
+	    } catch (Exception e) {
+		log.error("Exception occured writing out file:" + e.getMessage());
+		throw new ExportToolContentException(e);
+	    } finally {
+		try {
+		    if (in != null) {
+			in.close(); // very important
+		    }
+		    if (out != null) {
+			out.close();
+		    }
+		} catch (Exception e) {
+		    log.error("Error Closing file. File already written out - no exception being thrown.", e);
+		}
+	    }
+
+	    return null;
+	} catch (Exception e1) {
+	    log.error("Unable to export tool content: " + e1.toString());
+	    ldErrorMsgs.add(0, e1.getClass().getName());
+	    request.setAttribute(ExportToolContentController.ATTR_LD_ERROR_MESSAGE, ldErrorMsgs);
+	    request.setAttribute(ExportToolContentController.ATTR_TOOLS_ERROR_MESSAGE, toolsErrorMsgs);
+	}
+	// display initial page for upload
+	return "toolcontent/exportresult";
+    }
+}
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,188 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.authoring.web;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.fileupload.DiskFileUpload;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * Import tool content servlet. It needs an uploaded learning design zip file.
+ *
+ * @author Steve.Ni
+ */
+@Controller
+public class ImportToolContentController {
+
+    public static final String EXPORT_TOOLCONTENT_SERVICE_BEAN_NAME = "exportToolContentService";
+    public static final String USER_SERVICE_BEAN_NAME = "userManagementService";
+    public static final String MESSAGE_SERVICE_BEAN_NAME = "authoringMessageService";
+    public static final String PARAM_LEARING_DESIGN_ID = "learningDesignID";
+    public static final String PARAM_LEARNING_FILE_NAME = "fileName";
+    public static final String ATTR_TOOLS_ERROR_MESSAGE = "toolsErrorMessages";
+    public static final String ATTR_LD_ERROR_MESSAGE = "ldErrorMessages";
+    public static final String ATTR_LD_ID = "learningDesignID";
+
+    private static final String KEY_MSG_IMPORT_FILE_NOT_FOUND = "msg.import.file.not.found";
+    private static final String KEY_MSG_IMPORT_FAILED_UNKNOWN_REASON = "msg.import.failed.unknown.reason";
+
+    private Logger log = Logger.getLogger(ImportToolContentController.class);
+
+    @Autowired
+    @Qualifier("userManagementService")
+    IUserManagementService userManagementService;
+    @Autowired
+    @Qualifier("exportToolContentService")
+    IExportToolContentService exportToolContentService;
+    @Autowired
+    @Qualifier("authoringMessageService")
+    MessageService authoringMessageService;
+
+    @RequestMapping("/authoring/importToolContent")
+    public String execute(HttpServletRequest request) throws Exception {
+	String param = request.getParameter("method");
+	String customCSV = WebUtil.readStrParam(request, AttributeNames.PARAM_CUSTOM_CSV, true);
+	//-----------------------Resource Author function ---------------------------
+	if (StringUtils.equals(param, "import")) {
+	    if (customCSV != null) {
+		request.setAttribute(AttributeNames.PARAM_CUSTOM_CSV, customCSV);
+	    }
+	    //display initial page for upload
+	    return "toolcontent/import";
+	} else {
+	    importLD(request);
+	    return "toolcontent/importresult";
+	}
+    }
+
+    /**
+     * @param request
+     */
+    private void importLD(HttpServletRequest request) {
+
+	List<String> ldErrorMsgs = new ArrayList<>();
+	List<String> toolsErrorMsgs = new ArrayList<>();
+	Long ldId = null;
+
+	try {
+	    Integer workspaceFolderUid = null;
+
+	    //get shared session
+	    HttpSession ss = SessionManager.getSession();
+	    //get back login user DTO
+	    UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    User user = (User) userManagementService.findById(User.class, userDto.getUserID());
+
+	    File designFile = null;
+	    Map<String, String> params = new HashMap<>();
+	    String filename = null;
+
+	    String uploadPath = FileUtil.createTempDirectory("_uploaded_learningdesign");
+
+	    DiskFileUpload fu = new DiskFileUpload();
+	    // maximum size that will be stored in memory
+	    fu.setSizeThreshold(4096);
+	    // the location for saving data that is larger than getSizeThreshold()
+	    // fu.setRepositoryPath(uploadPath);
+
+	    List fileItems = fu.parseRequest(request);
+	    Iterator iter = fileItems.iterator();
+	    while (iter.hasNext()) {
+		FileItem fi = (FileItem) iter.next();
+		//UPLOAD_FILE is input field from HTML page
+		if (!fi.getFieldName().equalsIgnoreCase("UPLOAD_FILE")) {
+		    params.put(fi.getFieldName(), fi.getString());
+		} else {
+		    // filename on the client
+		    filename = FileUtil.getFileName(fi.getName());
+		    designFile = new File(uploadPath + filename);
+		    fi.write(designFile);
+
+		}
+		workspaceFolderUid = NumberUtils.createInteger(params.get("WORKSPACE_FOLDER_UID"));
+	    }
+
+	    // get customCSV for tool adapters if it was an external LMS request
+	    String customCSV = params.get(AttributeNames.PARAM_CUSTOM_CSV);
+
+	    if (designFile == null) {
+		MessageService msgService = authoringMessageService;
+		log.error("Upload file missing. Filename was " + filename);
+		String msg = msgService.getMessage(KEY_MSG_IMPORT_FILE_NOT_FOUND);
+		ldErrorMsgs.add(msg != null ? msg : "Upload file missing");
+
+	    } else {
+
+		Object[] ldResults = exportToolContentService.importLearningDesign(designFile, user, workspaceFolderUid,
+			toolsErrorMsgs, customCSV);
+		ldId = (Long) ldResults[0];
+		ldErrorMsgs = (List<String>) ldResults[1];
+		toolsErrorMsgs = (List<String>) ldResults[2];
+
+	    }
+
+	} catch (Exception e) {
+	    log.error("Error occured during import", e);
+	    ldErrorMsgs.add(e.getClass().getName() + " " + e.getMessage());
+	}
+
+	request.setAttribute(ATTR_LD_ID, ldId);
+	if ((ldId == null || ldId.longValue() == -1) && ldErrorMsgs.size() == 0) {
+	    MessageService msgService = authoringMessageService;
+	    ldErrorMsgs.add(msgService.getMessage(KEY_MSG_IMPORT_FAILED_UNKNOWN_REASON));
+	}
+	if (ldErrorMsgs.size() > 0) {
+	    request.setAttribute(ATTR_LD_ERROR_MESSAGE, ldErrorMsgs);
+	}
+	if (toolsErrorMsgs.size() > 0) {
+	    request.setAttribute(ATTR_TOOLS_ERROR_MESSAGE, toolsErrorMsgs);
+	}
+
+    }
+}
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -1,195 +1,195 @@
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- *
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-
-package org.lamsfoundation.lams.authoring.web;
-
-import java.io.IOException;
-import java.net.URLEncoder;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-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.Action;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.logevent.service.ILogEventService;
-import org.lamsfoundation.lams.tool.IToolVO;
-import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.lamsfoundation.lams.tool.ToolContentManager;
-import org.lamsfoundation.lams.tool.service.ILamsToolService;
-import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-/**
- * This action class does some process when author try to save/cancel/close authoring tool pages. If author try to save
- * tool page, this action will redirct tool page to confirm page and execute clearSession() method. If author try to
- * cancel/close window, this action will execute clearSession().
- *
- * @author Steve.Ni
- */
-public abstract class LamsAuthoringFinishAction extends Action {
-    private static Logger log = Logger.getLogger(LamsAuthoringFinishAction.class);
-
-    private static final String ACTION_NAME = "action";
-    private static final String ACTION_MODE = "mode";
-    private static final String CUSTOMISE_SESSION_ID = "customiseSessionID";
-    private static final String TOOL_SIGNATURE = "signature";
-
-    private static final String CONFIRM_ACTION = "confirm";
-    private static final String CANCEL_ACTION = "cancel";
-    private static final String DEFINE_LATER_ACTION = "defineLater";
-
-    private static final String RE_EDIT_URL = "reEditUrl";
-    
-    private static ILogEventService logEventService;
-
-    /**
-     * Action method, will handle save/cancel action.
-     */
-    @Override
-    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
-	String action = request.getParameter(ACTION_NAME);
-	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, ACTION_MODE, false);
-	String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID);
-	String notifyCloseURL = (String) request.getSession().getAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL);
-	Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
-
-	// clear session according to the ToolAccessMode.
-	clearSession(cSessionID, request.getSession(), mode);
-
-	//CONFIRM_ACTION got fired only for general authoring and not for define later one
-	if (StringUtils.equals(action, CONFIRM_ACTION)) {
-	    String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
-	    String signature = request.getParameter(TOOL_SIGNATURE);
-
-	    String contentFolderID = "TODO_remove-change_optional_to_false";
-	    contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID, true);
-
-	    // check whether it use on define it later page
-	    IToolVO tool = getToolService().getToolBySignature(signature);
-
-	    //add reeditUrl parameter
-	    String reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getAuthorUrl(),
-		    AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId.toString());
-	    reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
-		    contentFolderID);
-	    if ( notifyCloseURL != null && notifyCloseURL.length() > 0 ) 
-		reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL);
-	    nextUrl = WebUtil.appendParameterToURL(nextUrl, RE_EDIT_URL, URLEncoder.encode(reeditUrl, "UTF-8"));
-
-	    if (!StringUtils.isBlank(notifyCloseURL)) {
-		nextUrl = WebUtil.appendParameterToURL(nextUrl, AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL);
-	    }
-	    response.sendRedirect(nextUrl);
-	}
-	
-	//audit log content has been finished being edited 
-	if (StringUtils.equals(action, DEFINE_LATER_ACTION)) {
-	    getLogEventService().logFinishEditingActivityInMonitor(toolContentId);
-	}
-	
-	//reset defineLater task
-	if (StringUtils.equals(action, CANCEL_ACTION) && mode.isTeacher()) {
-	    String signature = request.getParameter(TOOL_SIGNATURE);
-
-	    ToolContentManager contentManager = (ToolContentManager) findToolService(signature);
-	    contentManager.resetDefineLater(toolContentId);
-	    
-	    getLogEventService().logCancelEditingActivityInMonitor(toolContentId);
-	}
-
-	return null;
-    }
-
-    /**
-     * All subclass will implements this method and execute clear <code>HttpSession</code> action to remove obsolete
-     * session values.
-     *
-     * @param customiseSessionID
-     *            customised session ID.
-     * @param session
-     * @param mode
-     *            ToolAccessMode to decide which role's session will be clear.
-     */
-    abstract public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode);
-
-    // ---------------------------------------------------------------------
-    // Helper Methods
-    // ---------------------------------------------------------------------
-
-    private String getLamsUrl() {
-	String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL);
-
-	if (StringUtils.isBlank(serverURL)) {
-	    log.warn("ServerURLTag unable to write out server URL as it is missing from the configuration file.");
-	}
-
-	return serverURL;
-    }
-
-    public ILamsToolService getToolService() {
-	WebApplicationContext webContext = WebApplicationContextUtils
-		.getRequiredWebApplicationContext(this.getServlet().getServletContext());
-	return (ILamsToolService) webContext.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME);
-    }
-    
-    /**
-     * Get LogEventService bean
-     */
-    private ILogEventService getLogEventService() {
-	if (logEventService == null) {
-	    WebApplicationContext ctx = WebApplicationContextUtils
-		    .getRequiredWebApplicationContext(getServlet().getServletContext());
-	    logEventService = (ILogEventService) ctx.getBean("logEventService");
-	}
-	return logEventService;
-    }
-
-    /**
-     * Find a tool's service registered inside lams.
-     *
-     * @param signature
-     *            the tool signature.
-     * @return the service object from tool.
-     * @throws NoSuchBeanDefinitionException
-     *             if the tool is not the classpath or the supplied service name is wrong.
-     */
-    public Object findToolService(String signature) throws NoSuchBeanDefinitionException {
-	IToolVO tool = getToolService().getToolBySignature(signature);
-	WebApplicationContext webContext = WebApplicationContextUtils
-		.getRequiredWebApplicationContext(this.getServlet().getServletContext());
-	return webContext.getBean(tool.getServiceName());
-    }
-}
+///****************************************************************
+// * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+// * =============================================================
+// * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+// *
+// * This program is free software; you can redistribute it and/or modify
+// * it under the terms of the GNU General Public License version 2.0
+// * as published by the Free Software Foundation.
+// *
+// * This program is distributed in the hope that it will be useful,
+// * but WITHOUT ANY WARRANTY; without even the implied warranty of
+// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// * GNU General Public License for more details.
+// *
+// * You should have received a copy of the GNU General Public License
+// * along with this program; if not, write to the Free Software
+// * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+// * USA
+// *
+// * http://www.gnu.org/licenses/gpl.txt
+// * ****************************************************************
+// */
+//
+//
+//package org.lamsfoundation.lams.authoring.web;
+//
+//import java.io.IOException;
+//import java.net.URLEncoder;
+//
+//import javax.servlet.ServletException;
+//import javax.servlet.http.HttpServletRequest;
+//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.Action;
+//import org.apache.struts.action.ActionForm;
+//import org.apache.struts.action.ActionForward;
+//import org.apache.struts.action.ActionMapping;
+//import org.lamsfoundation.lams.logevent.service.ILogEventService;
+//import org.lamsfoundation.lams.tool.IToolVO;
+//import org.lamsfoundation.lams.tool.ToolAccessMode;
+//import org.lamsfoundation.lams.tool.ToolContentManager;
+//import org.lamsfoundation.lams.tool.service.ILamsToolService;
+//import org.lamsfoundation.lams.util.Configuration;
+//import org.lamsfoundation.lams.util.ConfigurationKeys;
+//import org.lamsfoundation.lams.util.WebUtil;
+//import org.lamsfoundation.lams.web.util.AttributeNames;
+//import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+//import org.springframework.web.context.WebApplicationContext;
+//import org.springframework.web.context.support.WebApplicationContextUtils;
+//
+///**
+// * This action class does some process when author try to save/cancel/close authoring tool pages. If author try to save
+// * tool page, this action will redirct tool page to confirm page and execute clearSession() method. If author try to
+// * cancel/close window, this action will execute clearSession().
+// *
+// * @author Steve.Ni
+// */
+//public abstract class LamsAuthoringFinishAction extends Action {
+//    private static Logger log = Logger.getLogger(LamsAuthoringFinishAction.class);
+//
+//    private static final String ACTION_NAME = "action";
+//    private static final String ACTION_MODE = "mode";
+//    private static final String CUSTOMISE_SESSION_ID = "customiseSessionID";
+//    private static final String TOOL_SIGNATURE = "signature";
+//
+//    private static final String CONFIRM_ACTION = "confirm";
+//    private static final String CANCEL_ACTION = "cancel";
+//    private static final String DEFINE_LATER_ACTION = "defineLater";
+//
+//    private static final String RE_EDIT_URL = "reEditUrl";
+//    
+//    private static ILogEventService logEventService;
+//
+//    /**
+//     * Action method, will handle save/cancel action.
+//     */
+//    @Override
+//    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+//	    HttpServletResponse response) throws IOException, ServletException {
+//	String action = request.getParameter(ACTION_NAME);
+//	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, ACTION_MODE, false);
+//	String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID);
+//	String notifyCloseURL = (String) request.getSession().getAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL);
+//	Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+//
+//	// clear session according to the ToolAccessMode.
+//	clearSession(cSessionID, request.getSession(), mode);
+//
+//	//CONFIRM_ACTION got fired only for general authoring and not for define later one
+//	if (StringUtils.equals(action, CONFIRM_ACTION)) {
+//	    String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
+//	    String signature = request.getParameter(TOOL_SIGNATURE);
+//
+//	    String contentFolderID = "TODO_remove-change_optional_to_false";
+//	    contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID, true);
+//
+//	    // check whether it use on define it later page
+//	    IToolVO tool = getToolService().getToolBySignature(signature);
+//
+//	    //add reeditUrl parameter
+//	    String reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getAuthorUrl(),
+//		    AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId.toString());
+//	    reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
+//		    contentFolderID);
+//	    if ( notifyCloseURL != null && notifyCloseURL.length() > 0 ) 
+//		reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL);
+//	    nextUrl = WebUtil.appendParameterToURL(nextUrl, RE_EDIT_URL, URLEncoder.encode(reeditUrl, "UTF-8"));
+//
+//	    if (!StringUtils.isBlank(notifyCloseURL)) {
+//		nextUrl = WebUtil.appendParameterToURL(nextUrl, AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL);
+//	    }
+//	    response.sendRedirect(nextUrl);
+//	}
+//	
+//	//audit log content has been finished being edited 
+//	if (StringUtils.equals(action, DEFINE_LATER_ACTION)) {
+//	    getLogEventService().logFinishEditingActivityInMonitor(toolContentId);
+//	}
+//	
+//	//reset defineLater task
+//	if (StringUtils.equals(action, CANCEL_ACTION) && mode.isTeacher()) {
+//	    String signature = request.getParameter(TOOL_SIGNATURE);
+//
+//	    ToolContentManager contentManager = (ToolContentManager) findToolService(signature);
+//	    contentManager.resetDefineLater(toolContentId);
+//	    
+//	    getLogEventService().logCancelEditingActivityInMonitor(toolContentId);
+//	}
+//
+//	return null;
+//    }
+//
+//    /**
+//     * All subclass will implements this method and execute clear <code>HttpSession</code> action to remove obsolete
+//     * session values.
+//     *
+//     * @param customiseSessionID
+//     *            customised session ID.
+//     * @param session
+//     * @param mode
+//     *            ToolAccessMode to decide which role's session will be clear.
+//     */
+//    abstract public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode);
+//
+//    // ---------------------------------------------------------------------
+//    // Helper Methods
+//    // ---------------------------------------------------------------------
+//
+//    private String getLamsUrl() {
+//	String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL);
+//
+//	if (StringUtils.isBlank(serverURL)) {
+//	    log.warn("ServerURLTag unable to write out server URL as it is missing from the configuration file.");
+//	}
+//
+//	return serverURL;
+//    }
+//
+//    public ILamsToolService getToolService() {
+//	WebApplicationContext webContext = WebApplicationContextUtils
+//		.getRequiredWebApplicationContext(this.getServlet().getServletContext());
+//	return (ILamsToolService) webContext.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME);
+//    }
+//    
+//    /**
+//     * Get LogEventService bean
+//     */
+//    private ILogEventService getLogEventService() {
+//	if (logEventService == null) {
+//	    WebApplicationContext ctx = WebApplicationContextUtils
+//		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+//	    logEventService = (ILogEventService) ctx.getBean("logEventService");
+//	}
+//	return logEventService;
+//    }
+//
+//    /**
+//     * Find a tool's service registered inside lams.
+//     *
+//     * @param signature
+//     *            the tool signature.
+//     * @return the service object from tool.
+//     * @throws NoSuchBeanDefinitionException
+//     *             if the tool is not the classpath or the supplied service name is wrong.
+//     */
+//    public Object findToolService(String signature) throws NoSuchBeanDefinitionException {
+//	IToolVO tool = getToolService().getToolBySignature(signature);
+//	WebApplicationContext webContext = WebApplicationContextUtils
+//		.getRequiredWebApplicationContext(this.getServlet().getServletContext());
+//	return webContext.getBean(tool.getServiceName());
+//    }
+//}
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,666 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.comments.web;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.comments.Comment;
+import org.lamsfoundation.lams.comments.CommentConstants;
+import org.lamsfoundation.lams.comments.CommentLike;
+import org.lamsfoundation.lams.comments.dto.CommentDTO;
+import org.lamsfoundation.lams.comments.service.ICommentService;
+import org.lamsfoundation.lams.security.ISecurityService;
+import org.lamsfoundation.lams.tool.GroupedToolSession;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * @author Fiona Malikoff
+ */
+@Controller
+@RequestMapping("/comments")
+public class CommentController {
+
+    private static Logger log = Logger.getLogger(CommentController.class);
+
+    @Autowired
+    @Qualifier("userManagementService")
+    private IUserManagementService userService;
+    @Autowired
+    @Qualifier("commentService")
+    private ICommentService commentService;
+    @Autowired
+    @Qualifier("lamsCoreToolService")
+    private ILamsCoreToolService coreToolService;
+    @Autowired
+    @Qualifier("securityService")
+    private ISecurityService securityService;
+
+    /**
+     * Display the comments for a given external id (usually tool session id). The session comments will be
+     * arranged by Tree structure and loaded thread by thread (with paging).
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+    @SuppressWarnings("unchecked")
+    @RequestMapping("/init")
+    private String init(HttpServletRequest request) throws ServletException {
+
+	// initial Session Map
+	String sessionMapID = request.getParameter(CommentConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap;
+
+	Long externalId;
+	Long externalSecondaryId;
+	int externalType;
+	String externalSignature;
+	String mode;
+	boolean likeAndDislike;
+	boolean allowAnonymous;
+	boolean readOnly;
+	Integer pageSize;
+	Integer sortBy;
+
+	// refresh forum page, not initial enter
+	if (sessionMapID != null) {
+	    sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
+	    externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+	    externalSecondaryId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SECONDARY_ID);
+	    externalType = (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE);
+	    externalSignature = (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG);
+	    mode = (String) sessionMap.get(AttributeNames.ATTR_MODE);
+	    pageSize = (Integer) sessionMap.get(CommentConstants.PAGE_SIZE);
+	    sortBy = (Integer) sessionMap.get(CommentConstants.ATTR_SORT_BY);
+
+	} else {
+	    sessionMap = new SessionMap<>();
+	    request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+
+	    externalId = WebUtil.readLongParam(request, CommentConstants.ATTR_EXTERNAL_ID);
+	    externalSecondaryId = WebUtil.readLongParam(request, CommentConstants.ATTR_EXTERNAL_SECONDARY_ID, true);
+	    externalType = WebUtil.readIntParam(request, CommentConstants.ATTR_EXTERNAL_TYPE);
+	    externalSignature = WebUtil.readStrParam(request, CommentConstants.ATTR_EXTERNAL_SIG);
+	    likeAndDislike = WebUtil.readBooleanParam(request, CommentConstants.ATTR_LIKE_AND_DISLIKE);
+	    allowAnonymous = WebUtil.readBooleanParam(request, CommentConstants.ATTR_ANONYMOUS);
+	    readOnly = WebUtil.readBooleanParam(request, CommentConstants.ATTR_READ_ONLY);
+	    pageSize = WebUtil.readIntParam(request, CommentConstants.PAGE_SIZE, true);
+	    if (pageSize == null) {
+		pageSize = CommentConstants.DEFAULT_PAGE_SIZE;
+	    }
+	    sortBy = WebUtil.readIntParam(request, CommentConstants.ATTR_SORT_BY, true);
+	    if (sortBy == null) {
+		sortBy = ICommentService.SORT_BY_DATE;
+	    }
+
+	    sessionMap.put(CommentConstants.ATTR_EXTERNAL_ID, externalId);
+	    sessionMap.put(CommentConstants.ATTR_EXTERNAL_TYPE, externalType);
+	    if (externalSecondaryId != null) {
+		sessionMap.put(CommentConstants.ATTR_EXTERNAL_SECONDARY_ID, externalSecondaryId);
+	    }
+	    sessionMap.put(CommentConstants.ATTR_EXTERNAL_SIG, externalSignature);
+	    sessionMap.put(CommentConstants.ATTR_LIKE_AND_DISLIKE, likeAndDislike);
+	    sessionMap.put(CommentConstants.ATTR_ANONYMOUS, allowAnonymous);
+	    sessionMap.put(CommentConstants.ATTR_READ_ONLY, readOnly);
+	    sessionMap.put(CommentConstants.PAGE_SIZE, pageSize);
+	    sessionMap.put(CommentConstants.ATTR_SORT_BY, sortBy);
+
+	    mode = request.getParameter(AttributeNames.ATTR_MODE);
+	    sessionMap.put(AttributeNames.ATTR_MODE, mode != null ? mode : ToolAccessMode.LEARNER.toString());
+	}
+
+	User user = getCurrentUser(request);
+	if (externalType != Comment.EXTERNAL_TYPE_TOOL) {
+	    throwException("Unknown comment type ", user.getLogin(), externalId, externalType, externalSignature);
+	}
+
+	Comment rootComment = commentService.createOrGetRoot(externalId, externalSecondaryId, externalType,
+		externalSignature, user);
+	sessionMap.put(CommentConstants.ATTR_ROOT_COMMENT_UID, rootComment.getUid());
+	return viewTopicImpl(request, sessionMap, pageSize, sortBy, true);
+    }
+
+    private void throwException(String msg, String loginName, Long externalId, Integer externalType,
+	    String externalSignature) throws ServletException {
+	String error = msg + " User " + loginName + " " + externalId + ":" + externalType + ":" + externalSignature;
+	log.error(error);
+	throw new ServletException(error);
+    }
+
+    private void throwException(String msg, String loginName) throws ServletException {
+	String error = msg + " User " + loginName;
+	log.error(error);
+	throw new ServletException(error);
+    }
+
+    private boolean learnerInToolSession(Long toolSessionId, User user) {
+	GroupedToolSession toolSession = (GroupedToolSession) coreToolService.getToolSessionById(toolSessionId);
+	return toolSession.getSessionGroup().getUsers().contains(user);
+    }
+
+    private boolean monitorInToolSession(Long toolSessionId, User user, SessionMap<String, Object> sessionMap) {
+
+	if (ToolAccessMode.TEACHER
+		.equals(WebUtil.getToolAccessMode((String) sessionMap.get(AttributeNames.ATTR_MODE)))) {
+	    GroupedToolSession toolSession = (GroupedToolSession) coreToolService.getToolSessionById(toolSessionId);
+	    return securityService.isLessonMonitor(toolSession.getLesson().getLessonId(), user.getUserId(),
+		    "Comment Monitoring Tasks", false);
+	} else {
+	    return false;
+	}
+    }
+
+    /**
+     * Display the comments for a given external id (usually tool session id). The session comments will be
+     * arranged by Tree structure and loaded thread by thread (with paging). This may set a new value of sort by, so
+     * make sure the session is updated.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    @RequestMapping("/viewTopic")
+    private String viewTopic(HttpServletRequest request) {
+
+	String sessionMapID = WebUtil.readStrParam(request, CommentConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	Integer pageSize = WebUtil.readIntParam(request, CommentConstants.PAGE_SIZE, true);
+	Integer sortBy = WebUtil.readIntParam(request, CommentConstants.ATTR_SORT_BY, true);
+	Boolean sticky = WebUtil.readBooleanParam(request, CommentConstants.ATTR_STICKY, false);
+	if (sortBy != null) {
+	    sessionMap.put(CommentConstants.ATTR_SORT_BY, sortBy);
+	}
+	return viewTopicImpl(request, sessionMap, pageSize, sortBy, sticky);
+
+    }
+
+    @RequestMapping("/viewTopicImpl")
+    private String viewTopicImpl(HttpServletRequest request, SessionMap<String, Object> sessionMap, Integer pageSize,
+	    Integer sortBy, boolean includeSticky) {
+
+	Long externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+	Long externalSecondaryId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SECONDARY_ID);
+	Integer externalType = (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE);
+	String externalSignature = (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG);
+
+	// get user and check they are in the tool session....
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	Long lastMsgSeqId = WebUtil.readLongParam(request, CommentConstants.PAGE_LAST_ID, true);
+	String currentLikeCount = WebUtil.readStrParam(request, CommentConstants.ATTR_LIKE_COUNT, true);
+
+	if (pageSize == null) {
+	    pageSize = (Integer) sessionMap.get(CommentConstants.PAGE_SIZE);
+	}
+	if (sortBy == null) {
+	    sortBy = (Integer) sessionMap.get(CommentConstants.ATTR_SORT_BY);
+	}
+
+	List<CommentDTO> msgDtoList = commentService.getTopicThread(externalId, externalSecondaryId, externalType,
+		externalSignature, lastMsgSeqId, pageSize, sortBy, currentLikeCount, user.getUserID());
+	updateMessageFlag(msgDtoList, user.getUserID());
+	request.setAttribute(CommentConstants.ATTR_COMMENT_THREAD, msgDtoList);
+
+	if (includeSticky) {
+	    List<CommentDTO> stickyList = commentService.getTopicStickyThread(externalId, externalSecondaryId,
+		    externalType, externalSignature, sortBy, currentLikeCount, user.getUserID());
+	    updateMessageFlag(stickyList, user.getUserID());
+	    request.setAttribute(CommentConstants.ATTR_STICKY, stickyList);
+	}
+
+	// transfer SessionMapID as well
+	request.setAttribute(CommentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+
+	return (includeSticky ? "comments/allviewwrapper" : "comments/topicviewwrapper");
+    }
+
+    @SuppressWarnings("unchecked")
+    private SessionMap<String, Object> getSessionMap(HttpServletRequest request) {
+	String sessionMapId = WebUtil.readStrParam(request, CommentConstants.ATTR_SESSION_MAP_ID);
+	return (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapId);
+    }
+
+    /**
+     * Display the messages for a particular thread in a particular topic. Returns all messages for this thread - does
+     * not need paging.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/viewTopicThread")
+    private String viewTopicThread(HttpServletRequest request) {
+
+	Long highlightMessageUid = WebUtil.readLongParam(request, CommentConstants.ATTR_COMMENT_ID, true);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+
+	// get forum user and forum
+	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	Long threadId = WebUtil.readLongParam(request, CommentConstants.ATTR_THREAD_ID, true);
+	Integer sortBy = WebUtil.readIntParam(request, CommentConstants.ATTR_SORT_BY, true);
+	if (sortBy != null) {
+	    sessionMap.put(CommentConstants.ATTR_SORT_BY, sortBy);
+	}
+
+	List<CommentDTO> msgDtoList = commentService.getThread(threadId, sortBy, user.getUserID());
+	updateMessageFlag(msgDtoList, user.getUserID());
+	request.setAttribute(CommentConstants.ATTR_COMMENT_THREAD, msgDtoList);
+
+	if (highlightMessageUid != null) {
+	    request.setAttribute(CommentConstants.ATTR_COMMENT_ID, highlightMessageUid);
+	}
+	// transfer SessionMapID as well
+	request.setAttribute(CommentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+
+	// don't want to try to scroll as this is a single thread, completely displayed.
+	request.setAttribute(CommentConstants.ATTR_NO_MORE_PAGES, true);
+
+	return "comments/topicviewwrapper";
+    }
+
+    /**
+     * This method will set the author and voted (has done like/dislike) flag in message DTO
+     *
+     * @param msgDtoList
+     */
+    private void updateMessageFlag(List<CommentDTO> msgDtoList, Integer currUserId) {
+	Iterator<CommentDTO> iter = msgDtoList.iterator();
+	while (iter.hasNext()) {
+	    CommentDTO dto = iter.next();
+	    Comment comment = dto.getComment();
+	    if (comment.getCreatedBy() != null && currUserId.equals(comment.getCreatedBy().getUserId())) {
+		dto.setIsAuthor(true);
+	    } else {
+		dto.setIsAuthor(false);
+	    }
+	}
+    }
+
+    /**
+     * Create a new comment (not a reply)
+     */
+    @RequestMapping("/newComment")
+    @ResponseBody
+    private String newComment(HttpServletRequest request, HttpServletResponse response)
+	    throws InterruptedException, IOException, ServletException {
+
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	Long externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+	Long externalSecondaryId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SECONDARY_ID);
+	Integer externalType = (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE);
+	String externalSignature = (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG);
+
+	String commentText = request.getParameter(CommentConstants.ATTR_BODY);
+	if (commentText != null) {
+	    commentText = commentText.trim();
+	}
+
+	Boolean commentAnonymous = WebUtil.readBooleanParam(request, CommentConstants.ATTR_COMMENT_ANONYMOUS_NEW,
+		false);
+
+	ObjectNode responseJSON;
+
+	if (!validateText(commentText)) {
+	    responseJSON = getFailedValidationJSON();
+	} else {
+
+	    User user = getCurrentUser(request);
+	    ToolAccessMode mode = WebUtil.getToolAccessMode((String) sessionMap.get(AttributeNames.ATTR_MODE));
+	    boolean isMonitor = ToolAccessMode.TEACHER.equals(mode)
+		    && monitorInToolSession(externalId, user, sessionMap);
+	    if (!isMonitor && !learnerInToolSession(externalId, user)) {
+		throwException("New comment: User does not have the rights to access the comments. ", user.getLogin(),
+			externalId, externalType, externalSignature);
+	    }
+
+	    Comment rootSeq = commentService.getRoot(externalId, externalSecondaryId, externalType, externalSignature);
+
+	    // save message into database
+	    Comment newComment = commentService.createReply(rootSeq, commentText, user, isMonitor, commentAnonymous);
+
+	    responseJSON = JsonNodeFactory.instance.objectNode();
+	    responseJSON.put(CommentConstants.ATTR_COMMENT_ID, newComment.getUid());
+	    responseJSON.put(CommentConstants.ATTR_THREAD_ID, newComment.getThreadComment().getUid());
+	    responseJSON.put(CommentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	    responseJSON.put(CommentConstants.ATTR_PARENT_COMMENT_ID, newComment.getParent().getUid());
+
+	}
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
+    /**
+     * Display replay topic page. Message form subject will include parent topics same subject.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/newReplyTopic")
+    private String newReplyTopic(HttpServletRequest request) {
+
+	request.setAttribute(CommentConstants.ATTR_SESSION_MAP_ID,
+		request.getParameter(CommentConstants.ATTR_SESSION_MAP_ID));
+	request.setAttribute(CommentConstants.ATTR_PARENT_COMMENT_ID,
+		request.getParameter(CommentConstants.ATTR_PARENT_COMMENT_ID));
+	return "comments/reply";
+    }
+
+    /**
+     * Create a reply to a parent topic.
+     */
+    @RequestMapping("/replyTopicInline")
+    @ResponseBody
+    private String replyTopicInline(HttpServletRequest request, HttpServletResponse response)
+	    throws InterruptedException, IOException, ServletException {
+
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	Long externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+	Integer externalType = (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE);
+	String externalSignature = (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG);
+
+	Long parentId = WebUtil.readLongParam(request, CommentConstants.ATTR_PARENT_COMMENT_ID);
+	String commentText = WebUtil.readStrParam(request, CommentConstants.ATTR_BODY, true);
+
+	if (commentText != null) {
+	    commentText = commentText.trim();
+	}
+
+	Boolean commentAnonymous = WebUtil.readBooleanParam(request, CommentConstants.ATTR_COMMENT_ANONYMOUS_REPLY,
+		false);
+
+	ObjectNode responseJSON;
+
+	if (!validateText(commentText)) {
+	    responseJSON = getFailedValidationJSON();
+	} else {
+
+	    User user = getCurrentUser(request);
+	    ToolAccessMode mode = WebUtil.getToolAccessMode((String) sessionMap.get(AttributeNames.ATTR_MODE));
+	    boolean isMonitor = ToolAccessMode.TEACHER.equals(mode)
+		    && monitorInToolSession(externalId, user, sessionMap);
+	    if (!isMonitor && !learnerInToolSession(externalId, user)) {
+		throwException("New comment: User does not have the rights to access the comments. ", user.getLogin(),
+			externalId, externalType, externalSignature);
+	    }
+
+	    // save message into database
+	    Comment newComment = commentService.createReply(parentId, commentText.trim(), user, isMonitor,
+		    commentAnonymous);
+
+	    responseJSON = JsonNodeFactory.instance.objectNode();
+	    responseJSON.put(CommentConstants.ATTR_COMMENT_ID, newComment.getUid());
+	    responseJSON.put(CommentConstants.ATTR_THREAD_ID, newComment.getThreadComment().getUid());
+	    responseJSON.put(CommentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	    responseJSON.put(CommentConstants.ATTR_PARENT_COMMENT_ID, newComment.getParent().getUid());
+
+	}
+
+	response.setContentType("application/json;charset=utf-8");
+	return null;
+    }
+
+    private boolean validateText(String commentText) {
+	return commentText != null && commentText.length() > 0
+		&& commentText.length() < CommentConstants.MAX_BODY_LENGTH;
+    }
+
+    private ObjectNode getFailedValidationJSON() {
+	MessageService msgService = commentService.getMessageService();
+	ObjectNode resultJSON = JsonNodeFactory.instance.objectNode();
+	resultJSON.put(CommentConstants.ATTR_ERR_MESSAGE, msgService.getMessage(CommentConstants.KEY_BODY_VALIDATION));
+	return resultJSON;
+    }
+
+    /**
+     * Display a editable form for a topic in order to update it.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws PersistenceException
+     */
+    @RequestMapping("/editTopic")
+    public String editTopic(HttpServletRequest request) {
+
+	Long commentId = WebUtil.readLongParam(request, CommentConstants.ATTR_COMMENT_ID);
+	CommentDTO comment = commentService.getComment(commentId);
+
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	sessionMap.put(CommentConstants.ATTR_COMMENT_ID, commentId);
+	request.setAttribute(CommentConstants.ATTR_COMMENT_ID, commentId);
+	request.setAttribute(CommentConstants.ATTR_COMMENT, comment);
+	request.setAttribute(CommentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	return "comments/edit";
+    }
+
+    /**
+     * Update a topic.
+     *
+     * @throws ServletException
+     */
+    @ResponseBody
+    @RequestMapping("/updateTopicInline")
+    public String updateTopicInline(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException {
+
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	Long commentId = WebUtil.readLongParam(request, CommentConstants.ATTR_COMMENT_ID);
+
+	Long externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+	Integer externalType = (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE);
+	String externalSignature = (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG);
+
+	String commentText = request.getParameter(CommentConstants.ATTR_BODY);
+	if (commentText != null) {
+	    commentText = commentText.trim();
+	}
+
+	// Don't update anonymous if it is monitoring
+	boolean isMonitoring = ToolAccessMode.TEACHER
+		.equals(WebUtil.getToolAccessMode((String) sessionMap.get(AttributeNames.ATTR_MODE)));
+	Boolean commentAnonymous = isMonitoring ? null
+		: WebUtil.readBooleanParam(request, CommentConstants.ATTR_COMMENT_ANONYMOUS_EDIT, false);
+
+	ObjectNode ObjectNode;
+
+	if (!validateText(commentText)) {
+	    ObjectNode = getFailedValidationJSON();
+
+	} else {
+
+	    CommentDTO originalComment = commentService.getComment(commentId);
+
+	    User user = getCurrentUser(request);
+	    if (!originalComment.getComment().getCreatedBy().equals(user)
+		    && !monitorInToolSession(externalId, user, sessionMap)) {
+		throwException(
+			"Update comment: User does not have the rights to update the comment " + commentId + ". ",
+			user.getLogin(), externalId, externalType, externalSignature);
+	    }
+
+	    Comment updatedComment = commentService.updateComment(commentId, commentText, user, commentAnonymous,
+		    isMonitoring);
+
+	    ObjectNode = JsonNodeFactory.instance.objectNode();
+	    ObjectNode.put(CommentConstants.ATTR_COMMENT_ID, commentId);
+	    ObjectNode.put(CommentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	    ObjectNode.put(CommentConstants.ATTR_THREAD_ID, updatedComment.getThreadComment().getUid());
+	    ObjectNode.put(CommentConstants.ATTR_PARENT_COMMENT_ID, updatedComment.getParent().getUid());
+
+	}
+
+	response.setContentType("application/json;charset=utf-8");
+	return ObjectNode.toString();
+    }
+
+    /**
+     * Update the likes/dislikes
+     */
+    @RequestMapping(path = ("/updateLikeCount"), method = RequestMethod.POST)
+    private String updateLikeCount(HttpServletRequest request, HttpServletResponse response, boolean isLike)
+	    throws InterruptedException, IOException, ServletException {
+
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	Long messageUid = WebUtil.readLongParam(request, CommentConstants.ATTR_COMMENT_ID);
+	Long externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+
+	User user = getCurrentUser(request);
+	if (!learnerInToolSession(externalId, user)) {
+	    throwException(
+		    "Update comment: User does not have the rights to like/dislike the comment " + messageUid + ". ",
+		    user.getLogin(), externalId, (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE),
+		    (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG));
+	}
+
+	boolean added = commentService.addLike(messageUid, user, isLike ? CommentLike.LIKE : CommentLike.DISLIKE);
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put(CommentConstants.ATTR_COMMENT_ID, messageUid);
+	responseJSON.put(CommentConstants.ATTR_STATUS, added);
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
+    /**
+     * Update hide flag
+     */
+    @ResponseBody
+    @RequestMapping("/hideComment")
+    private String hideComment(HttpServletRequest request, HttpServletResponse response, boolean isLike)
+	    throws InterruptedException, IOException, ServletException {
+
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	Long commentId = WebUtil.readLongParam(request, CommentConstants.ATTR_COMMENT_ID);
+	Long externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+	boolean status = WebUtil.readBooleanParam(request, CommentConstants.ATTR_HIDE_FLAG);
+
+	User user = getCurrentUser(request);
+	if (!monitorInToolSession(externalId, user, sessionMap)) {
+	    throwException("Update comment: User does not have the rights to hide the comment " + commentId + ". ",
+		    user.getLogin(), externalId, (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE),
+		    (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG));
+	}
+
+	Comment updatedComment = commentService.hideComment(commentId, user, status);
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put(CommentConstants.ATTR_COMMENT_ID, updatedComment.getUid());
+	responseJSON.put(CommentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	responseJSON.put(CommentConstants.ATTR_THREAD_ID, updatedComment.getThreadComment().getUid());
+	responseJSON.put(CommentConstants.ATTR_PARENT_COMMENT_ID, updatedComment.getParent().getUid());
+
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
+    /**
+     * Make a topic sticky - the topic should be level 1 only.
+     *
+     * @throws ServletException
+     */
+    @ResponseBody
+    @RequestMapping("/makeSticky")
+    public String makeSticky(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException {
+
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	Long commentId = WebUtil.readLongParam(request, CommentConstants.ATTR_COMMENT_ID);
+	Boolean sticky = WebUtil.readBooleanParam(request, CommentConstants.ATTR_STICKY);
+	Long externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+
+	CommentDTO originalComment = commentService.getComment(commentId);
+	User user = getCurrentUser(request);
+
+	if (!monitorInToolSession(externalId, user, sessionMap)) {
+	    throwException(
+		    "Make comment sticky: User does not have the rights to make the comment stick to the top of the list "
+			    + commentId + ". ",
+		    user.getLogin());
+	}
+	if (originalComment.getComment().getCommentLevel() != 1) {
+	    throwException("Make comment sticky: Comment much be level 1 to stick to the top of the list " + commentId
+		    + " level " + originalComment.getLevel() + ". ", user.getLogin());
+	}
+
+	Comment updatedComment = commentService.updateSticky(commentId, sticky);
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put(CommentConstants.ATTR_COMMENT_ID, commentId);
+	responseJSON.put(CommentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	responseJSON.put(CommentConstants.ATTR_THREAD_ID, updatedComment.getThreadComment().getUid());
+	responseJSON.put(CommentConstants.ATTR_PARENT_COMMENT_ID, updatedComment.getParent().getUid());
+
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
+    /**
+     * Get login user information from system level session.
+     */
+    private User getCurrentUser(HttpServletRequest request) {
+	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	return userService.getUserByLogin(user.getLogin());
+    }
+
+}
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentForm.java	(.../CommentForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentForm.java	(.../CommentForm.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -21,21 +21,21 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.comments.web;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
-import org.apache.struts.validator.ValidatorForm;
 import org.lamsfoundation.lams.comments.Comment;
+import org.lamsfoundation.lams.util.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
 /**
  * Comment Form.
  */
-public class CommentForm extends ValidatorForm {
+public class CommentForm {
     private static final long serialVersionUID = -9054365604649146734L;
     private static Logger logger = Logger.getLogger(CommentForm.class.getName());
 
@@ -48,22 +48,24 @@
 	comment = new Comment();
     }
 
+    @Autowired
+    MessageService messageservice;
+
     /**
      * MessageForm validation method from STRUCT interface.
      *
      */
-    @Override
-    public ActionErrors validate(ActionMapping mapping, javax.servlet.http.HttpServletRequest request) {
-	ActionErrors errors = new ActionErrors();
+    public MultiValueMap<String, String> validate(javax.servlet.http.HttpServletRequest request) {
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	try {
 	    if (StringUtils.isBlank(comment.getBody())) {
 		ActionMessage error = new ActionMessage("error.body.required");
-		errors.add("message.body", error);
+		errorMap.add("message.body", messageservice.getMessage("error.body.required"));
 	    }
 	} catch (Exception e) {
 	    CommentForm.logger.error("", e);
 	}
-	return errors;
+	return errorMap;
     }
 
     // -------------------------get/set methods----------------
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/action/EditLessonIntroAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/EditLessonIntroController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/controller/EditLessonIntroController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/controller/EditLessonIntroController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,84 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.web.controller;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * Edit lesson intro page.
+ */
+@Controller
+@RequestMapping("/editLessonIntro")
+public class EditLessonIntroController {
+
+    @Autowired
+    private ILessonService lessonService;
+
+    /**
+     * Edit lesson intro page.
+     */
+    @RequestMapping("/edit")
+    public String edit(HttpServletRequest req) throws IOException, ServletException {
+
+	Long lessonId = WebUtil.readLongParam(req, AttributeNames.PARAM_LESSON_ID);
+	Lesson lesson = lessonService.getLesson(lessonId);
+	req.setAttribute("lesson", lesson);
+	req.setAttribute("displayDesignImage", lesson.isDisplayDesignImage());
+	req.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, lesson.getLearningDesign().getContentFolderID());
+
+	return "editLessonIntro";
+    }
+
+    /**
+     * Save lesson intro page.
+     */
+    @RequestMapping(path = "/save", method = RequestMethod.POST)
+    public String save(HttpServletRequest req) throws IOException, ServletException {
+
+	Long lessonId = WebUtil.readLongParam(req, AttributeNames.PARAM_LESSON_ID);
+	Lesson lesson = lessonService.getLesson(lessonId);
+	String lessonName = WebUtil.readStrParam(req, "lessonName");
+	String lessonDescription = WebUtil.readStrParam(req, "lessonDescription");
+	boolean displayDesignImage = WebUtil.readBooleanParam(req, "displayDesignImage", false);
+
+	//sore lesson in DB
+	lesson.setLessonName(lessonName);
+	lesson.setLessonDescription(lessonDescription);
+	lesson.setDisplayDesignImage(displayDesignImage);
+	lessonService.saveLesson(lesson);
+
+	return null;
+    }
+}
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,416 @@
+package org.lamsfoundation.lams.web.controller;
+
+import static org.imsglobal.lti.BasicLTIConstants.LTI_MESSAGE_TYPE;
+import static org.imsglobal.lti.BasicLTIConstants.LTI_VERSION;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Vector;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.imsglobal.lti.BasicLTIConstants;
+import org.imsglobal.lti.BasicLTIUtil;
+import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
+import org.lamsfoundation.lams.integration.ExtCourseClassMap;
+import org.lamsfoundation.lams.integration.ExtServer;
+import org.lamsfoundation.lams.integration.ExtServerLessonMap;
+import org.lamsfoundation.lams.integration.ExtUserUseridMap;
+import org.lamsfoundation.lams.integration.UserInfoFetchException;
+import org.lamsfoundation.lams.integration.UserInfoValidationException;
+import org.lamsfoundation.lams.integration.service.IIntegrationService;
+import org.lamsfoundation.lams.integration.util.LoginRequestDispatcher;
+import org.lamsfoundation.lams.integration.util.LtiUtils;
+import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
+import org.lamsfoundation.lams.lesson.LearnerProgress;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.dto.LearnerProgressDTO;
+import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
+import org.lamsfoundation.lams.security.ISecurityService;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import net.oauth.OAuth;
+
+/**
+ * Shows either addLesson.jsp or learnerMonitor.jsp pages.
+ *
+ * @author Andrey Balan
+ */
+@Controller
+@RequestMapping("/lti")
+public class LtiController {
+
+    private static Logger log = Logger.getLogger(LtiController.class);
+
+    @Autowired
+    private IIntegrationService integrationService;
+    @Autowired
+    private IMonitoringService monitoringService;
+    @Autowired
+    private IUserManagementService userManagementService;
+    @Autowired
+    private ILearningDesignService learningDesignService;
+    @Autowired
+    private ILessonService lessonService;
+    @Autowired
+    private IWorkspaceManagementService workspaceManagementService;
+    @Autowired
+    private ISecurityService securityService;
+
+    /**
+     * Single entry point to LAMS LTI processing mechanism. It determines here whether to show author or learnerMonitor
+     * pages
+     */
+    @RequestMapping("")
+    public String unspecified(HttpServletRequest request, HttpServletResponse respnse) throws IOException,
+	    UserAccessDeniedException, RepositoryCheckedException, UserInfoFetchException, UserInfoValidationException {
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String tcGradebookId = request.getParameter(BasicLTIConstants.LIS_RESULT_SOURCEDID);
+	String extUserId = request.getParameter(BasicLTIConstants.USER_ID);
+
+	ExtServerLessonMap lesson = integrationService.getLtiConsumerLesson(consumerKey, resourceLinkId);
+	//support for ContentItemSelectionRequest. If lesson was created during such request, update its ExtServerLesson's resourceLinkId for the first time
+	boolean isContentItemSelection = WebUtil.readBooleanParam(request, "custom_isContentItemSelection", false);
+	if (lesson == null && isContentItemSelection) {
+	    Long lessonId = WebUtil.readLongParam(request, "custom_lessonId");
+	    lesson = integrationService.getExtServerLessonMap(lessonId);
+	    lesson.setResourceLinkId(resourceLinkId);
+	    userManagementService.save(lesson);
+	}
+
+	//update lessonFinishCallbackUrl. We store it one time during the very first call to LAMS and it stays the same all the time afterwards
+	String lessonFinishCallbackUrl = request.getParameter(BasicLTIConstants.LIS_OUTCOME_SERVICE_URL);
+	ExtServer extServer = integrationService.getExtServer(consumerKey);
+	if (StringUtils.isNotBlank(lessonFinishCallbackUrl) && StringUtils.isBlank(extServer.getLessonFinishUrl())) {
+	    extServer.setLessonFinishUrl(lessonFinishCallbackUrl);
+	    userManagementService.save(extServer);
+	}
+
+	//check if learner tries to access the link that hasn't been authored by teacher yet
+	String method = request.getParameter("_" + LoginRequestDispatcher.PARAM_METHOD);
+	if (LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION.equals(method) && lesson == null) {
+	    String errorMsg = "Learner tries to access the link that hasn't been authored by teacher yet. resource_link_id: "
+		    + tcGradebookId;
+	    log.debug(errorMsg);
+	    request.setAttribute("error", errorMsg);
+	    request.setAttribute("javax.servlet.error.exception", new UserAccessDeniedException(errorMsg));
+	    return "error";
+	}
+
+	//determine whether to show author or learnerMonitor pages
+	if (lesson == null) {
+	    return addLesson(request, respnse);
+
+	} else {
+
+	    //as per LTI spec we need to update tool consumer's gradebook id on every LTI call
+	    ExtUserUseridMap extUserMap = integrationService.getExistingExtUserUseridMap(extServer, extUserId);
+	    extUserMap.setTcGradebookId(tcGradebookId);
+	    userManagementService.save(extUserMap);
+
+	    return learnerMonitor(request, respnse);
+	}
+
+    }
+
+    /**
+     * When teacher accesses link for the very first time, we show him addLesson page where he can choose learning
+     * design and start a lesson.
+     */
+    @RequestMapping("/addLesson")
+    private String addLesson(HttpServletRequest request, HttpServletResponse response) throws IOException,
+	    UserAccessDeniedException, RepositoryCheckedException, UserInfoFetchException, UserInfoValidationException {
+	Integer userId = getUser().getUserID();
+	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String resourceLinkTitle = request.getParameter(BasicLTIConstants.RESOURCE_LINK_TITLE);
+	String resourceLinkDescription = request.getParameter(BasicLTIConstants.RESOURCE_LINK_DESCRIPTION);
+
+	ExtServer extServer = integrationService.getExtServer(consumerKey);
+	ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer.getSid(), contextId);
+	Integer organisationId = orgMap.getOrganisation().getOrganisationId();
+	//only monitors are allowed to create lesson
+	if (!securityService.isGroupMonitor(organisationId, userId, "add lesson", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
+	    return null;
+	}
+
+	// get all user accessible folders and LD descriptions as JSON
+	String folderContentsJSON = workspaceManagementService.getFolderContentsJSON(null, userId, false);
+	request.setAttribute("folderContents", folderContentsJSON);
+	request.setAttribute(LtiUtils.OAUTH_CONSUMER_KEY, consumerKey);
+	request.setAttribute(BasicLTIConstants.RESOURCE_LINK_ID, resourceLinkId);
+	request.setAttribute(CentralConstants.ATTR_COURSE_ID, organisationId);
+	request.setAttribute(BasicLTIConstants.CONTEXT_ID, contextId);
+	request.setAttribute(CentralConstants.PARAM_TITLE, resourceLinkTitle);
+	request.setAttribute(CentralConstants.PARAM_DESC, resourceLinkDescription);
+
+	//support for ContentItemSelectionRequest
+	String ltiMessageType = request.getParameter(BasicLTIConstants.LTI_MESSAGE_TYPE);
+	if (LtiUtils.LTI_MESSAGE_TYPE_CONTENTITEMSELECTIONREQUEST.equals(ltiMessageType)) {
+	    String contentItemReturnUrl = request.getParameter(LtiUtils.CONTENT_ITEM_RETURN_URL);
+	    if (StringUtils.isEmpty(contentItemReturnUrl)) {
+		response.sendError(HttpServletResponse.SC_BAD_REQUEST,
+			"ContentItemSelectionRequest is missing content_item_return_url parameter");
+		return null;
+	    }
+
+	    request.setAttribute(BasicLTIConstants.LTI_MESSAGE_TYPE, ltiMessageType);
+	    request.setAttribute(LtiUtils.CONTENT_ITEM_RETURN_URL, contentItemReturnUrl);
+	    request.setAttribute("title", request.getParameter("title"));
+	    request.setAttribute("desc", request.getParameter("text").replaceAll("\\<[^>]*>", ""));
+	    request.setAttribute("data", request.getParameter("data"));
+	}
+
+	return "lti/addLesson";
+    }
+
+    /**
+     * Starts a lesson. Then prompts to learnerMonitor page or autosubmitForm (in case of ContentItemSelectionRequest).
+     */
+    @RequestMapping("/startLesson")
+    public String startLesson(HttpServletRequest request, HttpServletResponse response) throws IOException,
+	    UserAccessDeniedException, RepositoryCheckedException, UserInfoValidationException, UserInfoFetchException {
+	Integer userId = getUser().getUserID();
+	User user = getRealUser(getUser());
+
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String title = request.getParameter(CentralConstants.PARAM_TITLE);
+	String desc = request.getParameter(CentralConstants.PARAM_DESC);
+	String ldIdStr = request.getParameter(CentralConstants.PARAM_LEARNING_DESIGN_ID);
+	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+	Integer organisationId = new Integer(WebUtil.readIntParam(request, CentralConstants.ATTR_COURSE_ID));
+	boolean enableLessonIntro = WebUtil.readBooleanParam(request, "enableLessonIntro", false);
+
+	//only monitors are allowed to create lesson
+	if (!securityService.isGroupMonitor(organisationId, userId, "add lesson", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
+	    return null;
+	}
+
+	ExtServer extServer = integrationService.getExtServer(consumerKey);
+	Organisation organisation = monitoringService.getOrganisation(organisationId);
+
+	// 1. init lesson
+	Lesson lesson = monitoringService.initializeLesson(title, desc, new Long(ldIdStr),
+		organisation.getOrganisationId(), user.getUserId(), null, false, enableLessonIntro, false, false, true,
+		true, false, false, true, null, null);
+	// 2. create lessonClass for lesson
+	List<User> staffList = new LinkedList<>();
+	staffList.add(user);
+	List<User> learnerList = new LinkedList<>();
+	Vector<User> learnerVector = userManagementService
+		.getUsersFromOrganisationByRole(organisation.getOrganisationId(), Role.LEARNER, true);
+	learnerList.addAll(learnerVector);
+	monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
+		organisation.getName() + "Learners", learnerList, organisation.getName() + "Staff", staffList,
+		user.getUserId());
+	// 3. start lesson
+	monitoringService.startLesson(lesson.getLessonId(), user.getUserId());
+	// store information which extServer has started the lesson
+	integrationService.createExtServerLessonMap(lesson.getLessonId(), resourceLinkId, extServer);
+
+	//support for ContentItemSelectionRequest
+	String ltiMessageType = request.getParameter(BasicLTIConstants.LTI_MESSAGE_TYPE);
+	String contentItemReturnUrl = request.getParameter(LtiUtils.CONTENT_ITEM_RETURN_URL);
+	if (LtiUtils.LTI_MESSAGE_TYPE_CONTENTITEMSELECTIONREQUEST.equals(ltiMessageType)) {
+	    String opaqueTCData = request.getParameter("data");
+
+	    // Get the post data for the placement
+	    String returnValues = postLaunchHTML(extServer, lesson, contentItemReturnUrl, opaqueTCData);
+
+	    response.setContentType("text/html; charset=UTF-8");
+	    response.setCharacterEncoding("utf-8");
+	    response.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
+	    response.addDateHeader("Last-Modified", System.currentTimeMillis());
+	    response.addHeader("Cache-Control",
+		    "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
+	    response.addHeader("Pragma", "no-cache");
+	    ServletOutputStream out = response.getOutputStream();
+
+	    out.println("<!DOCTYPE html>");
+	    out.println("<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">");
+	    out.println("<html>\n<head>");
+	    out.println("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />");
+	    out.println("</head>\n<body>");
+	    out.println(returnValues);
+	    out.println("</body>\n</html>");
+
+	    return null;
+
+	    //regular BasicLTI request
+	} else {
+	    //set roles to contain monitor so that the user can see monitor link
+	    String redirectURL = "redirect:/lti/learnerMonitor.do";
+	    redirectURL = WebUtil.appendParameterToURL(redirectURL, LtiUtils.OAUTH_CONSUMER_KEY, consumerKey);
+	    redirectURL = WebUtil.appendParameterToURL(redirectURL, BasicLTIConstants.RESOURCE_LINK_ID, resourceLinkId);
+	    redirectURL = WebUtil.appendParameterToURL(redirectURL, BasicLTIConstants.CONTEXT_ID, contextId);
+	    return redirectURL;
+	}
+    }
+
+    /**
+     * Return HTML form to be posted to TC
+     */
+    private String postLaunchHTML(ExtServer extServer, Lesson lesson, String contentItemReturnUrl, String opaqueTCData)
+	    throws UnsupportedEncodingException {
+	String key = extServer.getServerid();
+	String secret = extServer.getServerkey();
+
+	//required parameters
+//	  <input type="hidden" name="lti_message_type" value="ContentItemSelection" />
+//	  <input type="hidden" name="lti_version" value="LTI-1p0" />
+//	  <input type="hidden" name="content_items" value="{ &quot;@context&quot;: &quot;http://purl.imsglobal.org/ctx/lti/v1/ContentItem&quot;, &quot;@graph&quot;: [ { &quot;@type&quot;: &quot;FileItem&quot;, &quot;url&quot;: &quot;https://www.imsglobal.org/sites/default/files/IMSconformancelogosm.png&quot;, &quot;mediaType&quot;: &quot;image/png&quot;, &quot;text&quot;: &quot;IMS logo for certified products&quot;, &quot;title&quot;: &quot;The logo used to identify IMS certified products&quot;, &quot;placementAdvice&quot;: { &quot;displayWidth&quot;: 147, &quot;displayHeight&quot;: 184, &quot;presentationDocumentTarget&quot;: &quot;embed&quot; } } ] }" />
+//	  <input type="hidden" name="data" value="Some opaque TC data" />
+//	  <input type="hidden" name="oauth_version" value="1.0" />
+//	  <input type="hidden" name="oauth_nonce" value="..." />
+//	  <input type="hidden" name="oauth_timestamp" value="..." />
+//	  <input type="hidden" name="oauth_consumer_key" value="${oauth_consumer_key}" />
+//	  <input type="hidden" name="oauth_callback" value="about:blank" />
+//	  <input type="hidden" name="oauth_signature_method" value="HMAC-SHA1" />
+//	  <input type="hidden" name="oauth_signature" value="..." />
+
+	Properties properties = new Properties();
+	properties.put(LTI_MESSAGE_TYPE, "ContentItemSelection");
+	properties.put(LTI_VERSION, "LTI-1p0");
+	if (StringUtils.isNotBlank(opaqueTCData)) {
+	    properties.put("data", opaqueTCData);
+	}
+
+	properties.put("lti_msg", "Information about LAMS lesson has been imported successfully.");
+	properties.put(OAuth.OAUTH_VERSION, OAuth.VERSION_1_0);
+	properties.put("oauth_callback", "about:blank");
+	properties.put(OAuth.OAUTH_SIGNATURE_METHOD, OAuth.HMAC_SHA1);
+
+	//contentItem Json
+//	{
+//	    "@context" : "http://purl.imsglobal.org/ctx/lti/v1/ContentItem",
+//	    "@graph" : [
+//	{
+//	    "@type" : "LtiLinkItem",
+//	    "mediaType" : "application/vnd.ims.lti.v1.ltilink",
+//	    "icon" : {
+//	      "@id" : "https://www.server.com/path/animage.png",
+//	      "width" : 50,
+//	      "height" : 50
+//	    },
+//	    "title" : "Week 1 reading",
+//	    "text" : "Read this section prior to your tutorial.",
+//	    "custom" : {
+//	      "chapter" : "12",
+//	      "section" : "3"
+//	    }
+//	  }
+//	]
+//    }
+	ObjectNode contentItemJSON = JsonNodeFactory.instance.objectNode();
+	contentItemJSON.put("@type", "LtiLinkItem");
+	contentItemJSON.put("mediaType", "application/vnd.ims.lti.v1.ltilink");
+	contentItemJSON.put("title", lesson.getLessonName());
+	contentItemJSON.put("text", lesson.getLessonDescription());
+	ObjectNode customJSON = JsonNodeFactory.instance.objectNode();
+	customJSON.put("lessonId", lesson.getLessonId().toString());
+	customJSON.put("isContentItemSelection", "true");
+	contentItemJSON.set("custom", customJSON);
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.set("@graph", contentItemJSON);
+	responseJSON.put("@context", "http://purl.imsglobal.org/ctx/lti/v1/ContentItem");
+
+	String content_items = URLEncoder.encode(responseJSON.toString(), "UTF-8");
+//	content_items = content_items.replace("\"", "%22");
+//	content_items = content_items.replace("'", "%27");
+	properties.put("content_items", content_items);
+
+	properties = BasicLTIUtil.signProperties(properties, contentItemReturnUrl, "POST", key, secret, null, null,
+		null);
+	boolean dodebug = false;
+	String postData = BasicLTIUtil.postLaunchHTML(properties, contentItemReturnUrl, dodebug);
+	return postData;
+    }
+
+    /**
+     * Once lesson was created, start showing learnerMonitor page to everybody regardless of his role.
+     */
+    @RequestMapping("/learnerMonitor")
+    public String learnerMonitor(HttpServletRequest request, HttpServletResponse response) throws IOException,
+	    UserAccessDeniedException, RepositoryCheckedException, UserInfoValidationException, UserInfoFetchException {
+	Integer userId = getUser().getUserID();
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+
+	//get orgId
+//	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+//	ExtServer extServer = integrationService.getExtServer(consumerKey);
+//	ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer.getSid(), contextId);
+//	Integer organisationId = orgMap.getOrganisation().getOrganisationId();
+
+	//get lesson
+	ExtServerLessonMap extLesson = integrationService.getLtiConsumerLesson(consumerKey, resourceLinkId);
+	Long lessonId = extLesson.getLessonId();
+	Lesson lesson = (Lesson) userManagementService.findById(Lesson.class, lessonId);
+
+	//set all required attributes for jsp
+	request.setAttribute("lessonId", lessonId);
+	request.setAttribute("ldId", lesson.getLearningDesign().getLearningDesignId());
+	request.setAttribute("title", lesson.getLessonName());
+	request.setAttribute("description", lesson.getLessonDescription());
+	request.setAttribute("isDisplayDesignImage", lesson.isDisplayDesignImage());
+	boolean isMonitor = securityService.isLessonMonitor(lessonId, userId, "learner monitor", false);
+	request.setAttribute("isMonitor", isMonitor);
+
+	//get learnerProgressDto
+	LearnerProgress learnProg = lessonService.getUserProgressForLesson(userId, lessonId);
+	if (learnProg != null) {
+	    LearnerProgressDTO learnerProgress = learnProg.getLearnerProgressData();
+	    request.setAttribute("learnerProgressDto", learnerProgress);
+	}
+
+	// check if we need to create svg, png files on the server
+//	if (lesson.isDisplayDesignImage() && lesson.getLearnerProgresses().isEmpty()) {
+//	    Long learningDesignId = lesson.getLearningDesign().getLearningDesignId();
+//	    learningDesignService.createLearningDesignSVG(learningDesignId, SVGGenerator.OUTPUT_FORMAT_SVG);
+//	    learningDesignService.createLearningDesignSVG(learningDesignId, SVGGenerator.OUTPUT_FORMAT_PNG);
+//	}
+
+	return "lti/learnerMonitor";
+    }
+
+    private UserDTO getUser() {
+	HttpSession ss = SessionManager.getSession();
+	return (UserDTO) ss.getAttribute(AttributeNames.USER);
+    }
+
+    private User getRealUser(UserDTO dto) {
+	return userManagementService.getUserByLogin(dto.getLogin());
+    }
+}
Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,235 @@
+package org.lamsfoundation.lams.web.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.signup.model.SignupOrganisation;
+import org.lamsfoundation.lams.signup.service.ISignupService;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.Emailer;
+import org.lamsfoundation.lams.util.HashUtil;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.ValidationUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.form.SignupForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/signup")
+public class SignupController {
+
+    private static Logger log = Logger.getLogger(SignupController.class);
+    @Autowired
+    private ISignupService signupService;
+    @Autowired
+    @Qualifier("centralMessageService")
+    MessageService messageService;
+
+    @RequestMapping("")
+    public String execute(@ModelAttribute SignupForm signupForm, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	String method = WebUtil.readStrParam(request, "method", true);
+	String context = WebUtil.readStrParam(request, "context", true);
+	SignupOrganisation signupOrganisation = null;
+	if (StringUtils.isNotBlank(context)) {
+	    signupOrganisation = signupService.getSignupOrganisation(context);
+	    request.setAttribute("signupOrganisation", signupOrganisation);
+	}
+	if ((signupForm.getSubmitted() == null) || !((Boolean) signupForm.getSubmitted())) {
+	    if (signupOrganisation == null) {
+		request.setAttribute("messageKey", "no.such.signup.page.exist");
+		return "msgContent";
+	    }
+
+	    // no context and unsubmitted form means it's the initial request
+	    return "signup/signup";
+	} else if (StringUtils.equals(method, "register")) {
+	    return signUp(signupForm, request);
+	} else {
+	    return signIn(signupForm, request, response);
+	}
+    }
+
+    @RequestMapping("/signUp")
+    private String signUp(@ModelAttribute SignupForm signupForm, HttpServletRequest request) {
+
+	try {
+
+	    // validation
+	    MultiValueMap<String, String> errorMap = validateSignup(signupForm);
+	    if (!errorMap.isEmpty()) {
+		request.setAttribute("errorMap", errorMap);
+		return "signup/signup";
+	    } else {
+		// proceed with signup
+		User user = new User();
+		user.setLogin(signupForm.getUsername());
+		user.setFirstName(signupForm.getFirstName());
+		user.setLastName(signupForm.getLastName());
+		user.setEmail(signupForm.getEmail());
+		String salt = HashUtil.salt();
+		user.setSalt(salt);
+		user.setPassword(HashUtil.sha256(signupForm.getPassword(), salt));
+		signupService.signupUser(user, signupForm.getContext());
+
+		// send email
+		try {
+		    String subject = "Your LAMS account details";
+		    String body = "Hi there,\n\n";
+		    body += "You've successfully registered an account with username " + user.getLogin();
+		    body += " on the LAMS server at " + Configuration.get(ConfigurationKeys.SERVER_URL);
+		    body += ".  If you ever forget your password, you can reset it via this URL "
+			    + Configuration.get(ConfigurationKeys.SERVER_URL) + "/forgotPassword.jsp.";
+		    body += "\n\n";
+		    body += "Regards,\n";
+		    body += "LAMS Signup System";
+		    boolean isHtmlFormat = false;
+
+		    Emailer.sendFromSupportEmail(subject, user.getEmail(), body, isHtmlFormat);
+		} catch (Exception e) {
+		    SignupController.log.error(e.getMessage(), e);
+		    request.setAttribute("error", e.getMessage());
+		}
+
+		return "signup/successfulSignup";
+	    }
+	} catch (Exception e) {
+	    SignupController.log.error(e.getMessage(), e);
+	    request.setAttribute("error", e.getMessage());
+	}
+
+	return "/";
+    }
+
+    @RequestMapping("/signIn")
+    private String signIn(@ModelAttribute SignupForm signupForm, HttpServletRequest request,
+	    HttpServletResponse response) {
+	try {
+
+	    // validation
+	    MultiValueMap<String, String> errorMap = validateSignin(signupForm);
+	    if (!errorMap.isEmpty()) {
+		request.setAttribute("errorMap", errorMap);
+		return "signup/signup";
+	    } else {
+		String login = signupForm.getUsernameTab2();
+		String password = signupForm.getPasswordTab2();
+		String context = signupForm.getContext();
+		signupService.signinUser(login, context);
+
+		HttpSession hses = request.getSession();
+		hses.setAttribute("login", login);
+		hses.setAttribute("password", password);
+		response.sendRedirect("/lams/login.jsp?redirectURL=/lams");
+		return null;
+	    }
+	} catch (Exception e) {
+	    SignupController.log.error(e.getMessage(), e);
+	    request.setAttribute("error", e.getMessage());
+	}
+
+	return "/";
+    }
+
+    private MultiValueMap<String, String> validateSignup(SignupForm signupForm) {
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+
+	// user name validation
+	String userName = (signupForm.getUsername() == null) ? null : signupForm.getUsername();
+	if (StringUtils.isBlank(userName)) {
+	    errorMap.add("username", messageService.getMessage("error.username.blank"));
+	} else if (!ValidationUtil.isUserNameValid(userName)) {
+	    errorMap.add("username", messageService.getMessage("error.username.invalid.characters"));
+	    SignupController.log.info("username has invalid characters: " + userName);
+	} else if (signupService.usernameExists(userName)) {
+	    errorMap.add("username", messageService.getMessage("error.username.exists"));
+	}
+
+	// first name validation
+	String firstName = (signupForm.getFirstName() == null) ? null : signupForm.getFirstName();
+	if (StringUtils.isBlank(firstName)) {
+	    errorMap.add("firstName", messageService.getMessage("error.first.name.blank"));
+	} else if (!ValidationUtil.isFirstLastNameValid(firstName)) {
+	    errorMap.add("firstName", messageService.getMessage("error.firstname.invalid.characters"));
+	    SignupController.log.info("firstname has invalid characters: " + firstName);
+	}
+
+	//last name validation
+	String lastName = (signupForm.getLastName() == null) ? null : signupForm.getLastName();
+	if (StringUtils.isBlank(lastName)) {
+	    errorMap.add("lastName", messageService.getMessage("error.last.name.blank"));
+	} else if (!ValidationUtil.isFirstLastNameValid(lastName)) {
+	    errorMap.add("lastName", messageService.getMessage("error.lastname.invalid.characters"));
+	    SignupController.log.info("lastName has invalid characters: " + lastName);
+	}
+
+	//password validation
+	if (StringUtils.isBlank(signupForm.getPassword())) {
+	    errorMap.add("password", messageService.getMessage("error.password.blank"));
+	} else if (!StringUtils.equals(signupForm.getPassword(), signupForm.getConfirmPassword())) {
+	    errorMap.add("password", messageService.getMessage("error.passwords.unequal"));
+	} else if (!ValidationUtil.isPasswordValueValid(signupForm.getPassword(), signupForm.getConfirmPassword())) {
+	    errorMap.add("password", messageService.getMessage("label.password.restrictions"));
+	}
+
+	//user email validation
+	String userEmail = (signupForm.getEmail() == null) ? null : signupForm.getEmail();
+	if (StringUtils.isBlank(userEmail)) {
+	    errorMap.add("email", messageService.getMessage("error.email.blank"));
+	} else if (!ValidationUtil.isEmailValid(userEmail)) {
+	    errorMap.add("email", messageService.getMessage("error.email.invalid.format"));
+	} else if (!StringUtils.equals(userEmail, signupForm.getConfirmEmail())) {
+	    errorMap.add("email", messageService.getMessage("error.emails.unequal"));
+	}
+
+	// courseKey validation
+	if (!signupService.courseKeyIsValid(signupForm.getContext(), signupForm.getCourseKey())) {
+	    errorMap.add("courseKey", messageService.getMessage("error.course.key.invalid"));
+	}
+	return errorMap;
+    }
+
+    private MultiValueMap<String, String> validateSignin(SignupForm signupForm) {
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	if (StringUtils.isBlank(signupForm.getUsernameTab2())) {
+	    errorMap.add("usernameTab2", messageService.getMessage("error.username.blank"));
+	}
+	if (StringUtils.isBlank(signupForm.getPasswordTab2())) {
+	    errorMap.add("passwordTab2", messageService.getMessage("error.password.blank"));
+	}
+	if (!signupService.courseKeyIsValid(signupForm.getContext(), signupForm.getCourseKeyTab2())) {
+	    errorMap.add("courseKeyTab2", messageService.getMessage("error.course.key.invalid"));
+	}
+
+	if (errorMap.isEmpty()) {
+	    String login = signupForm.getUsernameTab2();
+	    String password = signupForm.getPasswordTab2();
+	    User user = signupService.getUserByLogin(login);
+	    if (user == null) {
+		errorMap.add("usernameTab2", messageService.getMessage("error.login.or.password.incorrect",
+			new Object[] { "<a onclick='selectSignupTab();' id='selectLoginTabA'>", "</a>" }));
+	    } else {
+		String passwordHash = user.getPassword().length() == HashUtil.SHA1_HEX_LENGTH ? HashUtil.sha1(password)
+			: HashUtil.sha256(password, user.getSalt());
+		if (!user.getPassword().equals(passwordHash)) {
+		    errorMap.add("usernameTab2", messageService.getMessage("error.login.or.password.incorrect",
+			    new Object[] { "<a onclick='selectSignupTab();' id='selectLoginTabA'>", "</a>" }));
+		}
+	    }
+	}
+
+	return errorMap;
+    }
+}
Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/TwoFactorAuthenticationController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/controller/TwoFactorAuthenticationController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/controller/TwoFactorAuthenticationController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,76 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.web.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import com.warrenstrange.googleauth.GoogleAuthenticator;
+import com.warrenstrange.googleauth.GoogleAuthenticatorKey;
+import com.warrenstrange.googleauth.GoogleAuthenticatorQRGenerator;
+
+/**
+ * @author Andrey Balan
+ */
+@Controller
+public class TwoFactorAuthenticationController {
+
+    @Autowired
+    WebApplicationContext applicationContext;
+
+    @RequestMapping("/twoFactorAuthentication")
+    public String execute(HttpServletRequest request) throws Exception {
+
+	WebApplicationContext ctx = WebApplicationContextUtils
+		.getWebApplicationContext(applicationContext.getServletContext());
+	UserManagementService userManagementService = (UserManagementService) ctx.getBean("userManagementService");
+
+	// check if user needs to get his shared two-factor authorization secret
+	User loggedInUser = userManagementService.getUserByLogin(request.getRemoteUser());
+	if (loggedInUser.isTwoFactorAuthenticationEnabled()
+		&& loggedInUser.getTwoFactorAuthenticationSecret() == null) {
+
+	    GoogleAuthenticator gAuth = new GoogleAuthenticator();
+	    final GoogleAuthenticatorKey key = gAuth.createCredentials();
+	    String sharedSecret = key.getKey();
+
+	    loggedInUser.setTwoFactorAuthenticationSecret(sharedSecret);
+	    userManagementService.saveUser(loggedInUser);
+
+	    request.setAttribute("sharedSecret", sharedSecret);
+	    String QRCode = GoogleAuthenticatorQRGenerator.getOtpAuthURL(null,
+		    "LAMS account: " + loggedInUser.getLogin(), key);
+	    request.setAttribute("QRCode", QRCode);
+	}
+
+	return "twoFactorAuthSecret";
+    }
+}
Index: lams_central/src/java/org/lamsfoundation/lams/web/form/SignupForm.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/form/SignupForm.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/form/SignupForm.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,98 @@
+package org.lamsfoundation.lams.web.form;
+
+public class SignupForm {
+
+    private String username;
+    private String password;
+    private String confirmPassword;
+    private String firstName;
+    private String lastName;
+    private String email;
+    private String confirmEmail;
+    private String courseKey;
+    private Boolean submitted;
+    private String context;
+    private String usernameTab2;
+    private String passwordTab2;
+    private String courseKeyTab2;
+    public String getUsername() {
+        return username;
+    }
+    public void setUsername(String username) {
+        this.username = username;
+    }
+    public String getPassword() {
+        return password;
+    }
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    public String getConfirmPassword() {
+        return confirmPassword;
+    }
+    public void setConfirmPassword(String confirmPassword) {
+        this.confirmPassword = confirmPassword;
+    }
+    public String getFirstName() {
+        return firstName;
+    }
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+    public String getLastName() {
+        return lastName;
+    }
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+    public String getEmail() {
+        return email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    public String getConfirmEmail() {
+        return confirmEmail;
+    }
+    public void setConfirmEmail(String confirmEmail) {
+        this.confirmEmail = confirmEmail;
+    }
+    public String getCourseKey() {
+        return courseKey;
+    }
+    public void setCourseKey(String courseKey) {
+        this.courseKey = courseKey;
+    }
+    public Boolean getSubmitted() {
+        return submitted;
+    }
+    public void setSubmitted(Boolean submitted) {
+        this.submitted = submitted;
+    }
+    public String getContext() {
+        return context;
+    }
+    public void setContext(String context) {
+        this.context = context;
+    }
+    public String getUsernameTab2() {
+        return usernameTab2;
+    }
+    public void setUsernameTab2(String usernameTab2) {
+        this.usernameTab2 = usernameTab2;
+    }
+    public String getPasswordTab2() {
+        return passwordTab2;
+    }
+    public void setPasswordTab2(String passwordTab2) {
+        this.passwordTab2 = passwordTab2;
+    }
+    public String getCourseKeyTab2() {
+        return courseKeyTab2;
+    }
+    public void setCourseKeyTab2(String courseKeyTab2) {
+        this.courseKeyTab2 = courseKeyTab2;
+    }
+    
+    
+}
Fisheye: Tag f32bc3c30b8ea0463d84b4dbdc112f77a400297a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerController.java	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,1843 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.web.planner;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.Vector;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.authoring.service.IAuthoringService;
+import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.BranchingActivity;
+import org.lamsfoundation.lams.learningdesign.Grouping;
+import org.lamsfoundation.lams.learningdesign.GroupingActivity;
+import org.lamsfoundation.lams.learningdesign.LearnerChoiceGrouping;
+import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.OptionsActivity;
+import org.lamsfoundation.lams.learningdesign.ParallelActivity;
+import org.lamsfoundation.lams.learningdesign.RandomGrouping;
+import org.lamsfoundation.lams.learningdesign.SequenceActivity;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.learningdesign.Transition;
+import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
+import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
+import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
+import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
+import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityMetadata;
+import org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode;
+import org.lamsfoundation.lams.planner.dao.PedagogicalPlannerDAO;
+import org.lamsfoundation.lams.planner.dto.PedagogicalPlannerActivityDTO;
+import org.lamsfoundation.lams.planner.dto.PedagogicalPlannerSequenceNodeDTO;
+import org.lamsfoundation.lams.planner.dto.PedagogicalPlannerTemplateDTO;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.FileUtilException;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
+import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
+import com.thoughtworks.xstream.security.AnyTypePermission;
+
+/**
+ * Action managing Pedagogical Planner base page and non-tool activities.
+ *
+ * @author Marcin Cieslak
+ */
+@Controller
+@RequestMapping("/pedagogicalPlanner")
+public class PedagogicalPlannerController {
+    private static Logger log = Logger.getLogger(PedagogicalPlannerController.class);
+
+    // Services used in the class, injected by Spring
+    @Autowired
+    @Qualifier("userManagementService")
+    private IUserManagementService userManagementService;
+    @Autowired
+    @Qualifier("exportToolContentService")
+    private IExportToolContentService exportService;
+    @Autowired
+    @Qualifier("authoringService")
+    private IAuthoringService authoringService;
+    @Autowired
+    @Qualifier("monitoringService")
+    private IMonitoringService monitoringService;
+    @Autowired
+    @Qualifier("centralMessageService")
+    private MessageService messageService;
+    @Autowired
+    @Qualifier("pedagogicalPlannerDAO")
+    private PedagogicalPlannerDAO pedagogicalPlannerDAO;
+    @Autowired
+    @Qualifier("activityDAO")
+    private IActivityDAO activityDAO;
+
+    private static final String FILE_EXTENSION_ZIP = ".zip";
+    private static final String FILE_EXTENSION_LAS = ".las";
+
+    // ActionForwards
+    private static final String FORWARD_TEMPLATE = "template";
+    private static final String FORWARD_PREVIEW = "preview";
+    private static final String FORWARD_SEQUENCE_CHOOSER = "sequenceChooser";
+    public static final String FORWARD_GROUPING = "grouping";
+
+    // for building HTML requests
+    private static final String ACTIVITY_METADATA_PREFIX = "activity";
+    private static final String ACTIVITY_METADATA_HIDDEN = "Hidden";
+    private static final String ACTIVITY_METADATA_EXPANDED = "Expanded";
+    private static final String ACTIVITY_METADATA_COLLAPSED = "Collapsed";
+    private static final String ACTIVITY_METADATA_EDITING_ADVICE = "EditingAdvice";
+
+    // Keys of error messages used in this class. They are meant to be displayed for user.
+    private static final String ERROR_KEY_TOOL_ERRORS = "error.planner.tools.";
+    private static final String ERROR_KEY_NODE_TITLE_BLANK = "error.planner.node.title.blank";
+    private static final String ERROR_KEY_FILE_BAD_EXTENSION = "error.planner.file.bad.extension";
+    private static final String ERROR_KEY_FILE_EMPTY = "error.planner.file.empty";
+    private static final String ERROR_KEY_FILE_OPEN = "error.planner.file.open";
+    private static final String ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED = "error.planner.learning.design.retrieve";
+    private static final String ERROR_KEY_EXPORT = "error.planner.export";
+    private static final String ERROR_KEY_IMPORT = "error.planner.import";
+    private static final String ERROR_KEY_FILTER_PARSE = "error.planner.filter.parse";
+    private static final String ERROR_KEY_EXPORT_TEMPLATE = "error.planner.export.template";
+    private static final String ERROR_KEY_REMOVE_NODE_TREE = "error.planner.remove.node.tree";
+
+    // Error messages used in this class. They are ment to be thrown.
+    private static final String ERROR_USER_NOT_FOUND = "User not found.";
+    private static final String ERROR_NOT_PROPER_FILE = "The sequence template does not exist or is not a proper file.";
+    private static final String ERROR_TOO_MANY_OPTIONS = "Number of options in options activity is limited to "
+	    + CentralConstants.PLANNER_MAX_OPTIONS + " in Pedagogical Planner.";
+    private static final String ERROR_NESTED_OPTIONS = "Nested optional activities are not allowed in Pedagogical Planner.";
+    private static final String ERROR_NESTED_BRANCHING = "Nested branching activities are not allowed in Pedagogical Planner.";
+    private static final String ERROR_NESTED_PARALLEL = "Nested parallel activities are not allowed in Pedagogical Planner.";
+    private static final String ERROR_TOO_MANY_BRANCHES = "Number of branches in branching activity is limited to "
+	    + CentralConstants.PLANNER_MAX_BRANCHES + " in Pedagogical Planner.";
+    private static final String ERROR_TOO_MANY_PARALLEL_ACTIVITIES = "Number of parallel activities is limited to "
+	    + CentralConstants.PLANNER_MAX_PARALLEL_ACTIVITIES + " in Pedagogical Planner.";
+
+    // Paths used in templateBase.jsp
+    private static final String IMAGE_PATH_GATE = "images/stop.gif";
+    private static final String PATH_ACTIVITY_NO_PLANNER_SUPPORT = "/pedagogical_planner/defaultActivityForm.jsp";
+    private static final String IMAGE_PATH_GROUPING = "images/grouping.gif";
+
+    // Parts of paths used in importing/exporting nodes
+
+    private static final String NODE_FILE_NAME = "node.xml";
+    private static final String DIR_CONTENT = "content";
+    private static final String DIR_TEMPLATES = "template";
+
+    private static final String EXPORT_NODE_FOLDER_SUFFIX = "export_node";
+    private static final String EXPORT_NODE_CONTENT_ZIP_PREFIX = "content_";
+    private static final String ENCODING_UTF_8 = "UTF-8";
+    private static final String DIR_UPLOADED_NODE_SUFFIX = "_uploaded_node";
+    private static final String EXPORT_NODE_ZIP_PREFIX = "lams_planner_node_";
+    private static final String PLANNER_FOLDER_NAME = "Preview Planner";
+
+    // Filter constants
+    private static final String FIELD_NAME_TITLE = "title";
+    private static final String FIELD_NAME_BRIEF_DESCRIPTION = "briefDescription";
+    private static final String FIELD_NAME_FULL_DESCRIPTION = "fullDescription";
+    private static final String FIELD_NAME_ANCESTOR_UID = "ancestorUid";
+
+    // Tutorial video page string for recognising which page the video was started from
+    private static final String PAGE_STRING_START_PLANNER = "StPed";
+
+    // Parameters
+    public static final String PARAM_REQUEST_SRC = "requestSrc";
+    public static final String PARAM_FORBID_BUTTONS = "forbidButtons";
+    public static final String PARAM_RETURN_TO_PARENT = "returnToParent";
+
+    // Template copy mode values
+    public static final String COPY_MODE_EDIT_CURRENT = "editCurrent";
+    public static final String COPY_MODE_MOVE_CURRRENT = "moveCurrent";
+    public static final String COPY_MODE_MAKE_COPY = "makeCopy";
+
+    /**
+     * Go straight to open sequence node.
+     */
+    @RequestMapping("")
+    public String unspecified(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm, HttpServletRequest request)
+	    throws Exception {
+
+	// First we check if a tutorial video should be displayed
+	HttpSession session = SessionManager.getSession();
+	UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
+	boolean doNotShowAgain = (userDto.getPagesWithDisabledTutorials() != null) && userDto
+		.getPagesWithDisabledTutorials().contains(PedagogicalPlannerController.PAGE_STRING_START_PLANNER);
+	boolean showTutorial = !(userDto.getTutorialsDisabled() || doNotShowAgain);
+	request.setAttribute(AttributeNames.ATTR_SHOW_TUTORIAL, showTutorial);
+
+	// process requestSrc and notifyCloseURL parameters (if any)
+	String requestSrc = request.getParameter(PedagogicalPlannerController.PARAM_REQUEST_SRC);
+	if (StringUtils.isNotBlank(requestSrc)) {
+	    request.getSession().setAttribute(PedagogicalPlannerController.PARAM_REQUEST_SRC, requestSrc);
+	}
+	String notifyCloseURL = request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL);
+	if (StringUtils.isNotBlank(notifyCloseURL)) {
+	    request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL);
+	}
+
+	return openSequenceNode(nodeForm, request);
+    }
+
+    /*----------------------- TEMPLATE CHOOSER METHODS --------------------*/
+
+    /**
+     * Opens an existing learning design.
+     */
+    @RequestMapping("/openExistingTemplate")
+    public String openExistingTemplate(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm,
+	    HttpServletRequest request, HttpServletResponse response) throws ServletException {
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true);
+
+	LearningDesign learningDesign = null;
+	// either get the design ID or we don't know it and need to extract it from the node
+	Long learningDesignId = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID, true);
+	boolean isEditor = true;
+	PedagogicalPlannerSequenceNode node = null;
+	if ((learningDesignId == null) && (nodeUid != null)) {
+	    // we are opening a LD from a certain node, so check is we are allowed to do it
+	    isEditor = canEditNode(request, nodeUid);
+	    node = pedagogicalPlannerDAO.getByUid(nodeUid);
+	    learningDesignId = node.getLearningDesignId();
+	}
+
+	if (learningDesignId != null) {
+	    String copyMode = WebUtil.readStrParam(request, CentralConstants.PARAM_COPY_MODE, true);
+	    if (StringUtils.isBlank(copyMode)
+		    || PedagogicalPlannerController.COPY_MODE_EDIT_CURRENT.equalsIgnoreCase(copyMode)) {
+		// make sure user has priviledges
+		if (!isEditor || ((node != null) && (node.getPermissions() != null)
+			&& ((node.getPermissions() & PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_MODIFY) == 0))) {
+		    PedagogicalPlannerController.log.debug("Unauthorised attempt to openExistingTemplate (original)");
+		    throw new UserAccessDeniedException();
+		}
+		// modify the original design (a hard copy in user's folder)
+		learningDesign = authoringService.getLearningDesign(learningDesignId);
+		copyMode = PedagogicalPlannerController.COPY_MODE_EDIT_CURRENT;
+	    } else if (PedagogicalPlannerController.COPY_MODE_MAKE_COPY.equalsIgnoreCase(copyMode)) {
+		if (isEditor
+			? (node != null) && (node.getPermissions() != null)
+				&& ((node.getPermissions()
+					& PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_VIEW) == 0)
+			: (node != null) && (node.getPermissions() != null) && ((node.getPermissions()
+				& PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_COPY) == 0)) {
+		    PedagogicalPlannerController.log.debug("Unauthorised attempt to openExistingTemplate (copy)");
+		    throw new UserAccessDeniedException();
+		}
+		// make a temporary copy in common folder
+		learningDesign = copyLearningDesign(learningDesignId, errorMap);
+		copyMode = PedagogicalPlannerController.COPY_MODE_MOVE_CURRRENT;
+	    }
+	    request.setAttribute(CentralConstants.PARAM_COPY_MODE, copyMode);
+	}
+	if (learningDesign == null) {
+	    errorMap.add("GLOBAL",
+		    messageService.getMessage("no.such.learningdesign.exist", new Object[] { learningDesignId }));
+	} else {
+	    errorMap = openTemplate(request, learningDesign);
+	}
+	if (!errorMap.isEmpty()) {
+	    request.setAttribute("errorMap", errorMap);
+	    // If anything goes wrong, errors will be displayed at top. This approach is used widely in this action.
+	    return openSequenceNode(nodeForm, request, nodeUid);
+	}
+
+	// process requestSrc and notifyCloseURL parameters (if any)
+	String requestSrc = request.getParameter(PedagogicalPlannerController.PARAM_REQUEST_SRC);
+	if (StringUtils.isNotBlank(requestSrc)) {
+	    request.getSession().setAttribute(PedagogicalPlannerController.PARAM_REQUEST_SRC, requestSrc);
+	}
+	String notifyCloseURL = request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL);
+	if (StringUtils.isNotBlank(notifyCloseURL)) {
+	    request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL);
+	}
+
+	return "pedagogical_planner/templateBase";
+    }
+
+    /**
+     * The main method for opening and parsing template (chosen learning desing).
+     *
+     * @param request
+     * @param learningDesign
+     * @return
+     * @throws ServletException
+     */
+    private MultiValueMap<String, String> openTemplate(HttpServletRequest request, LearningDesign learningDesign)
+	    throws ServletException {
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+
+	List<PedagogicalPlannerActivityDTO> activities = new ArrayList<>();
+
+	// Create DTOs that hold all the necessary information of the activities
+	Activity activity = learningDesign.getFirstActivity();
+	PedagogicalPlannerController.log.debug("Parsing learning design activities");
+	try {
+	    while (activity != null) {
+		// Iterate through all the activities, detecting type of each one
+		addActivityToPlanner(learningDesign, activities, activity);
+		Transition transitionFrom = activity.getTransitionFrom();
+		if (transitionFrom == null) {
+		    activity = null;
+		} else {
+		    activity = transitionFrom.getToActivity();
+		}
+	    }
+	} catch (ServletException e) {
+	    PedagogicalPlannerController.log.error(e, e);
+	    errorMap.add("GLOBAL", messageService
+		    .getMessage(PedagogicalPlannerController.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
+	    return errorMap;
+	}
+
+	// Recalculate how many activities actually support the planner
+	int activitySupportingPlannerCount = 0;
+	for (PedagogicalPlannerActivityDTO activityDTO : activities) {
+	    if (activityDTO.getSupportsPlanner()) {
+		activitySupportingPlannerCount++;
+	    }
+	}
+	// create DTO for the whole design
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true);
+
+	PedagogicalPlannerTemplateDTO planner = new PedagogicalPlannerTemplateDTO();
+	planner.setActivitySupportingPlannerCount(activitySupportingPlannerCount);
+	planner.setSequenceTitle(learningDesign.getTitle());
+	planner.setActivities(activities);
+	planner.setLearningDesignID(learningDesign.getLearningDesignId());
+
+	if (nodeUid != null) {
+	    PedagogicalPlannerSequenceNode node = pedagogicalPlannerDAO.getByUid(nodeUid);
+	    if (node != null) {
+		boolean isEditor = canEditNode(request, nodeUid);
+		Integer nodePermissions = node.getPermissions();
+		planner.setPermissions(nodePermissions, isEditor);
+
+		boolean returnToParent = WebUtil.readBooleanParam(request,
+			PedagogicalPlannerController.PARAM_RETURN_TO_PARENT, false);
+		// after editing the node, should user return to parent or to current node
+		if (returnToParent) {
+		    // if parent is null, do not set anything and user will return to root node
+		    if (node.getParent() != null) {
+			planner.setNodeUid(node.getParent().getUid());
+		    }
+		} else {
+		    planner.setNodeUid(node.getUid());
+		}
+	    }
+	}
+
+	String forbidButtonsString = request.getParameter(PedagogicalPlannerController.PARAM_FORBID_BUTTONS);
+	planner.overridePermissions(forbidButtonsString);
+
+	// Some additional options for submitting activity forms; should be moved to configuration file in the future
+	planner.setSendInPortions(false);
+	planner.setSubmitDelay(5000);
+	planner.setActivitiesPerPortion(2);
+
+	request.setAttribute(CentralConstants.ATTR_PLANNER, planner);
+
+	return errorMap;
+    }
+
+    /**
+     * Copies LearningDesign to common folder.
+     *
+     * @throws ServletException
+     */
+    private LearningDesign copyLearningDesign(Long originalDesignId, MultiValueMap<String, String> errorMap)
+	    throws ServletException {
+	PedagogicalPlannerController.log.debug("Copying LearningDesign to common folder");
+	LearningDesign originalDesign = null;
+	if (originalDesignId != null) {
+	    originalDesign = authoringService.getLearningDesign(originalDesignId);
+	}
+	if (originalDesign == null) {
+	    errorMap.add("GLOBAL",
+		    messageService.getMessage("no.such.learningdesign.exist", new Object[] { originalDesignId }));
+	    return null;
+	}
+	User user = getUser();
+	WorkspaceFolder targetFolder = getCommonWorkspaceFolderId(user.getUserId());
+	Integer copyType = LearningDesign.COPY_TYPE_NONE;
+	boolean setOriginalDesign = false;
+	String newDesignName = originalDesign.getTitle();
+	String customCSV = null;
+
+	return authoringService.copyLearningDesign(originalDesign, copyType, user, targetFolder, setOriginalDesign,
+		newDesignName, customCSV);
+    }
+
+    /**
+     * Recognises activitiy type and creates proper DTO for web pages use. For branching and options it can be called
+     * recursevely.
+     *
+     * @param learningDesign
+     *            learning design from which activity was taken
+     * @param activities
+     *            set of DTOs
+     * @param activity
+     *            currently parsed activity
+     * @return created DTO
+     * @throws ServletException
+     */
+    @SuppressWarnings("unchecked")
+    private PedagogicalPlannerActivityDTO addActivityToPlanner(LearningDesign learningDesign,
+	    List<PedagogicalPlannerActivityDTO> activities, Activity activity) throws ServletException {
+	PedagogicalPlannerController.log.debug("Parsing activity: " + activity.getTitle());
+
+	// Check if the activity is contained in some complex activity: branching or options
+	boolean isNested = (activity.getParentActivity() != null)
+		&& (activity.getParentActivity().isBranchingActivity() || activity.isOptionsActivity());
+
+	PedagogicalPlannerActivityDTO addedDTO = null;
+
+	// Load the real object, otherwise we get an error when casting to concrete Activity classes
+	activity = activityDAO.getActivityByActivityId(activity.getActivityId());
+
+	// Simple tool activity
+	if (activity.isToolActivity()) {
+	    ToolActivity toolActivity = (ToolActivity) activity;
+	    Long toolContentID = toolActivity.getToolContentId();
+
+	    // Every tool has an URL that leads to Action that returns proper tool form to use
+	    String pedagogicalPlannerUrl = toolActivity.getTool().getPedagogicalPlannerUrl();
+	    String authorUrl = WebUtil.appendParameterToURL(toolActivity.getTool().getAuthorUrl(),
+		    AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentID.toString());
+	    authorUrl = WebUtil.appendParameterToURL(authorUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
+		    learningDesign.getContentFolderID());
+
+	    if (pedagogicalPlannerUrl == null) {
+		// if there is no URL, the tool does not support the planner
+		addedDTO = new PedagogicalPlannerActivityDTO(false,
+			PedagogicalPlannerController.PATH_ACTIVITY_NO_PLANNER_SUPPORT);
+		addedDTO.setType(toolActivity.getTool().getToolDisplayName());
+		addedDTO.setTitle(activity.getTitle());
+		addedDTO.setAuthorUrl(authorUrl);
+		addedDTO.setToolIconUrl(activity.getLibraryActivityUiImage());
+
+		PedagogicalPlannerActivityMetadata plannerMetadata = toolActivity.getPlannerMetadata();
+		if (plannerMetadata != null) {
+		    addedDTO.setCollapsed(plannerMetadata.getCollapsed());
+		    addedDTO.setExpanded(plannerMetadata.getExpanded());
+		    addedDTO.setHidden(plannerMetadata.getHidden());
+		}
+	    } else {
+		pedagogicalPlannerUrl = WebUtil.appendParameterToURL(pedagogicalPlannerUrl,
+			AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentID.toString());
+		pedagogicalPlannerUrl = WebUtil.appendParameterToURL(pedagogicalPlannerUrl,
+			AttributeNames.PARAM_CONTENT_FOLDER_ID, learningDesign.getContentFolderID());
+
+		// Looks heavy, but we just build URLs for DTO - see that class the meaning of constructor parameters
+		addedDTO = new PedagogicalPlannerActivityDTO(true, pedagogicalPlannerUrl);
+		addedDTO.setType(toolActivity.getTool().getToolDisplayName());
+		addedDTO.setTitle(activity.getTitle());
+		addedDTO.setAuthorUrl(authorUrl);
+		addedDTO.setToolIconUrl(activity.getLibraryActivityUiImage());
+
+		PedagogicalPlannerActivityMetadata plannerMetadata = toolActivity.getPlannerMetadata();
+		if (plannerMetadata != null) {
+		    addedDTO.setCollapsed(plannerMetadata.getCollapsed());
+		    addedDTO.setExpanded(plannerMetadata.getExpanded());
+		    addedDTO.setHidden(plannerMetadata.getHidden());
+		    addedDTO.setEditingAdvice(plannerMetadata.getEditingAdvice());
+		}
+	    }
+	    activities.add(addedDTO);
+	} else if (activity.isGroupingActivity()) {
+	    // grouping is managed by this action class;
+	    GroupingActivity groupingActivity = (GroupingActivity) activity;
+	    String pedagogicalPlannerUrl = WebUtil.appendParameterToURL(
+		    groupingActivity.getSystemTool().getPedagogicalPlannerUrl(), AttributeNames.PARAM_TOOL_CONTENT_ID,
+		    groupingActivity.getCreateGrouping().getGroupingId().toString());
+	    addedDTO = new PedagogicalPlannerActivityDTO(true, pedagogicalPlannerUrl);
+	    addedDTO.setTitle(activity.getTitle());
+	    addedDTO.setToolIconUrl(PedagogicalPlannerController.IMAGE_PATH_GROUPING);
+	    activities.add(addedDTO);
+	} else if (activity.isGateActivity()) {
+	    // gate is not supported, but takes its image from a differen spot
+	    addedDTO = new PedagogicalPlannerActivityDTO(false,
+		    PedagogicalPlannerController.PATH_ACTIVITY_NO_PLANNER_SUPPORT);
+	    addedDTO.setTitle(activity.getTitle());
+	    addedDTO.setToolIconUrl(PedagogicalPlannerController.IMAGE_PATH_GATE);
+	    activities.add(addedDTO);
+	} else if (activity.isBranchingActivity()) {
+	    // Planner does not support branching inside branching/options
+	    if (isNested) {
+		throw new ServletException(PedagogicalPlannerController.ERROR_NESTED_BRANCHING);
+	    }
+	    BranchingActivity branchingActivity = (BranchingActivity) activity;
+	    SequenceActivity defaultSequence = (SequenceActivity) branchingActivity.getDefaultActivity();
+	    Set<SequenceActivity> sequenceActivities = branchingActivity.getActivities();
+	    short branch = 1;
+	    for (SequenceActivity sequenceActivity : sequenceActivities) {
+		// Currently Planner supports only 4 branches, but there is no logical reason for that; just add colours
+		// in CSS and change this value for additional branches
+		if (branch > CentralConstants.PLANNER_MAX_BRANCHES) {
+		    throw new ServletException(PedagogicalPlannerController.ERROR_TOO_MANY_BRANCHES);
+		}
+		Activity nestedActivity = sequenceActivity.getDefaultActivity();
+		boolean defaultBranch = sequenceActivity.equals(defaultSequence);
+
+		if (nestedActivity == null) {
+		    // Empty sequence
+		    String path = WebUtil.appendParameterToURL(
+			    PedagogicalPlannerController.PATH_ACTIVITY_NO_PLANNER_SUPPORT,
+			    CentralConstants.PARAM_FORM_MESSAGE,
+			    messageService.getMessage(CentralConstants.RESOURCE_KEY_BRANCH_EMPTY));
+		    addedDTO = new PedagogicalPlannerActivityDTO(false, path);
+		    addedDTO.setParentActivityTitle(activity.getTitle());
+		    addedDTO.setGroup(branch);
+		    addedDTO.setDefaultBranch(defaultBranch);
+		    addedDTO.setComplexActivityType(PedagogicalPlannerActivityDTO.TYPE_BRANCHING_ACTIVITY);
+		    activities.add(addedDTO);
+		} else {
+		    // Iterate through all the activities from the sequence, adding them to Planner activity set
+		    do {
+			addedDTO = addActivityToPlanner(learningDesign, activities, nestedActivity);
+			Transition transitionFrom = nestedActivity.getTransitionFrom();
+			if (transitionFrom == null) {
+			    nestedActivity = null;
+			} else {
+			    nestedActivity = transitionFrom.getToActivity();
+			}
+			addedDTO.setParentActivityTitle(activity.getTitle());
+			addedDTO.setGroup(branch);
+			addedDTO.setDefaultBranch(defaultBranch);
+			addedDTO.setComplexActivityType(PedagogicalPlannerActivityDTO.TYPE_BRANCHING_ACTIVITY);
+		    } while (nestedActivity != null);
+		}
+		branch++;
+	    }
+	    addedDTO.setLastNestedActivity(true);
+	} else if (activity.isOptionsActivity()) {
+	    // Planner does not support branching inside branching/options
+	    if (isNested) {
+		throw new ServletException(PedagogicalPlannerController.ERROR_NESTED_OPTIONS);
+	    }
+	    OptionsActivity optionsActivity = (OptionsActivity) activity;
+	    Set<Activity> nestedActivities = optionsActivity.getActivities();
+	    short option = 1;
+	    for (Activity nestedActivity : nestedActivities) {
+		// Currently Planner supports only 4 options, but there is no logical reason for that; just add
+		// colours
+		// in CSS and change this value for additional options
+		if (option > CentralConstants.PLANNER_MAX_OPTIONS) {
+		    throw new ServletException(PedagogicalPlannerController.ERROR_TOO_MANY_OPTIONS);
+		}
+		// There are two types of options: sequence and activity; if sequence, iterate through them to get all
+		// the nested activities, same as in branching
+		if (nestedActivity.isSequenceActivity()) {
+		    nestedActivity = ((SequenceActivity) nestedActivity).getDefaultActivity();
+		    do {
+			addedDTO = addActivityToPlanner(learningDesign, activities, nestedActivity);
+			Transition transitionTo = nestedActivity.getTransitionTo();
+			if (transitionTo == null) {
+			    nestedActivity = null;
+			} else {
+			    nestedActivity = transitionTo.getToActivity();
+			}
+			addedDTO.setParentActivityTitle(activity.getTitle());
+			addedDTO.setGroup(option);
+			addedDTO.setComplexActivityType(PedagogicalPlannerActivityDTO.TYPE_OPTIONAL_ACTIVITY);
+		    } while (nestedActivity != null);
+		} else {
+		    addedDTO = addActivityToPlanner(learningDesign, activities, nestedActivity);
+		    addedDTO.setParentActivityTitle(activity.getTitle());
+		    addedDTO.setGroup(option);
+		    addedDTO.setComplexActivityType(PedagogicalPlannerActivityDTO.TYPE_OPTIONAL_ACTIVITY);
+		}
+		option++;
+	    }
+	    addedDTO.setLastNestedActivity(true);
+	} else if (activity.isParallelActivity()) {
+	    if (isNested) {
+		throw new ServletException(PedagogicalPlannerController.ERROR_NESTED_PARALLEL);
+	    }
+	    ParallelActivity parallelActivity = (ParallelActivity) activity;
+	    Set<Activity> nestedActivities = parallelActivity.getActivities();
+	    short option = 1;
+	    for (Activity nestedActivity : nestedActivities) {
+		// Currently Planner supports only parallel activities, but there is no logical reason for that;
+		// just add colours in CSS and change this value for additional options
+		if (option > CentralConstants.PLANNER_MAX_PARALLEL_ACTIVITIES) {
+		    throw new ServletException(PedagogicalPlannerController.ERROR_TOO_MANY_PARALLEL_ACTIVITIES);
+		}
+
+		addedDTO = addActivityToPlanner(learningDesign, activities, nestedActivity);
+		addedDTO.setParentActivityTitle(activity.getTitle());
+		addedDTO.setGroup(option);
+		addedDTO.setComplexActivityType(PedagogicalPlannerActivityDTO.TYPE_PARALLEL_ACTIVITY);
+		option++;
+	    }
+	    addedDTO.setLastNestedActivity(true);
+	} else {
+	    // If unknown/unsupported activity
+	    addedDTO = new PedagogicalPlannerActivityDTO(false,
+		    PedagogicalPlannerController.PATH_ACTIVITY_NO_PLANNER_SUPPORT);
+	    addedDTO.setTitle(activity.getTitle());
+	    addedDTO.setToolIconUrl(activity.getLibraryActivityUiImage());
+	    activities.add(addedDTO);
+	}
+	return addedDTO;
+    }
+
+    /**
+     * Starts a lesson preview, both in sequence chooser and in template base.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+    @RequestMapping("/startPreview")
+    public String startPreview(HttpServletRequest request) throws ServletException {
+	// TODO: shall we make a copy for preview???
+	// either get the design ID or we don't know it and need to extract it from the node
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true);
+	Long learningDesignId = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID, true);
+	if ((learningDesignId == null) && (nodeUid != null)) {
+	    PedagogicalPlannerSequenceNode node = pedagogicalPlannerDAO.getByUid(nodeUid);
+	    learningDesignId = node.getLearningDesignId();
+	}
+
+	HttpSession session = SessionManager.getSession();
+	UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
+
+	// Start preview the same way as in authoring
+	PedagogicalPlannerController.log.debug("Opening preview for learnind design id: " + learningDesignId);
+	Lesson lesson = monitoringService.initializeLessonForPreview("Preview", null, learningDesignId,
+		userDto.getUserID(), null, false, false, false);
+	monitoringService.createPreviewClassForLesson(userDto.getUserID(), lesson.getLessonId());
+
+	monitoringService.startLesson(lesson.getLessonId(), userDto.getUserID());
+	String redirectURL = "redirect:/home/learner.do";
+	redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_LESSON_ID,
+		lesson.getLessonId().toString());
+	redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_MODE, "preview");
+	return redirectURL;
+    }
+
+    /**
+     * Reads UID of the node and goes straight to
+     * {@link #openSequenceNode(ActionMapping, ActionForm, HttpServletRequest, Long)}
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     * @throws ServletException
+     */
+    @RequestMapping("/openSequenceNode")
+    public String openSequenceNode(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm,
+	    HttpServletRequest request) throws IOException, ServletException {
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true);
+	return openSequenceNode(nodeForm, request, nodeUid);
+    }
+
+    /**
+     * Opens a sequence node and fill the necessary data into DTO and form.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param nodeUid
+     * @return
+     * @throws ServletException
+     */
+    public String openSequenceNode(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm,
+	    HttpServletRequest request, Long nodeUid) throws ServletException {
+	String filterText = WebUtil.readStrParam(request, CentralConstants.PARAM_FILTER_TEXT, true);
+	// Do we display the root (top) node or an existing one
+	PedagogicalPlannerSequenceNode node = null;
+	if (nodeUid == null) {
+	    node = pedagogicalPlannerDAO.getRootNode();
+	} else {
+	    node = pedagogicalPlannerDAO.getByUid(nodeUid);
+	}
+	PedagogicalPlannerController.log.debug("Opening sequence node with UID: " + nodeUid);
+
+	// Only certain roles can open the editor
+	boolean isSysAdmin = request.isUserInRole(Role.SYSADMIN);
+	boolean canEdit = canEditNode(request, nodeUid);
+	Boolean edit = WebUtil.readBooleanParam(request, CentralConstants.PARAM_EDIT, false);
+	edit &= canEdit;
+
+	// No filtering or something went wrong in filtering
+	PedagogicalPlannerSequenceNodeDTO dto = new PedagogicalPlannerSequenceNodeDTO(node, node.getSubnodes(),
+		isSysAdmin, pedagogicalPlannerDAO);
+	if (nodeUid == null) {
+	    dto.setRecentlyModifiedNodes(getRecentlyModifiedLearnindDesignsAsNodes());
+	}
+
+	// Additional DTO parameters
+	List<String[]> titlePath = pedagogicalPlannerDAO.getTitlePath(nodeUid);
+	Boolean createSubnode = WebUtil.readBooleanParam(request, CentralConstants.PARAM_CREATE_SUBNODE, false);
+	Boolean importNode = WebUtil.readBooleanParam(request, CentralConstants.PARAM_IMPORT_NODE, false);
+	dto.setCreateSubnode(createSubnode);
+	dto.setEdit(edit);
+	dto.setIsEditor(canEdit);
+	dto.setImportNode(importNode);
+	dto.setTitlePath(titlePath);
+	request.setAttribute(CentralConstants.ATTR_NODE, dto);
+
+	// Set doNotShowAgain parameter
+	HttpSession session = SessionManager.getSession();
+	UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
+	boolean doNotShowAgain = (userDto.getPagesWithDisabledTutorials() != null) && userDto
+		.getPagesWithDisabledTutorials().contains(PedagogicalPlannerController.PAGE_STRING_START_PLANNER);
+	request.setAttribute(AttributeNames.ATTR_DO_NOT_SHOW_AGAIN, doNotShowAgain);
+	request.setAttribute(AttributeNames.ATTR_PAGE_STR, PedagogicalPlannerController.PAGE_STRING_START_PLANNER);
+
+	if (edit) {
+	    // If we are in edit mode, the node form is displayed, requiring additional parameters
+
+	    if (createSubnode) {
+		// We create a new node, rather than edit the existing one
+		if (node.getContentFolderId() == null) {
+		    // If it's a new top level node, we create an uniuqe ID
+		    String contentFolderId = FileUtil.generateUniqueContentFolderID();
+		    nodeForm.setContentFolderId(contentFolderId);
+		} else {
+		    // Whole node tree share the same content folder ID
+		    nodeForm.setContentFolderId(node.getContentFolderId());
+		}
+		// set the default permissions
+		nodeForm.setPermissions(null);
+	    } else if (!importNode) {
+		// We fill the form with necessary data
+		nodeForm.setNodeType(
+			node.getLearningDesignId() == null ? PedagogicalPlannerSequenceNodeForm.NODE_TYPE_SUBNODES
+				: PedagogicalPlannerSequenceNodeForm.NODE_TYPE_TEMPLATE);
+		nodeForm.setRemoveTemplate(false);
+		nodeForm.setTitle(dto.getTitle());
+		nodeForm.setBriefDescription(dto.getBriefDescription());
+		nodeForm.setFullDescription(dto.getFullDescription());
+		nodeForm.setPermissions(node.getPermissions());
+	    }
+	}
+	return "pedagogical_planner/sequenceChooser";
+    }
+
+    /**
+     * Saves the created/edited sequence node.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     * @throws ServletException
+     */
+    @RequestMapping(path = "/saveSequenceNode", method = RequestMethod.POST)
+    public String saveSequenceNode(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm,
+	    HttpServletRequest request) throws IOException, ServletException {
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true);
+	PedagogicalPlannerSequenceNode node = null;
+
+	boolean newRootNode = false;
+	Long parentUid = null;
+	if (nodeUid == null) {
+	    // It's a new subnode
+	    node = new PedagogicalPlannerSequenceNode();
+	    parentUid = nodeForm.getParentUid() == 0 ? null : nodeForm.getParentUid();
+	    if (parentUid != null) {
+		PedagogicalPlannerSequenceNode parent = pedagogicalPlannerDAO.getByUid(parentUid);
+		node.setParent(parent);
+	    } else {
+		newRootNode = true;
+	    }
+	    node.setOrder(pedagogicalPlannerDAO.getNextOrderId(parentUid));
+	    node.setUser(getUser());
+	} else {
+	    // It's an existing node
+	    node = pedagogicalPlannerDAO.getByUid(nodeUid);
+	    nodeUid = node.getUid();
+	}
+
+	// either user can edit current node or he is creating a subnode,
+	// so he needs permissions for the parent node
+	if (nodeUid == null ? (parentUid == null ? !canEditNode(request, nodeUid) : !canEditNode(request, parentUid))
+		: !canEditNode(request, nodeUid)) {
+	    PedagogicalPlannerController.log.debug("Unauthorised attempt to saveSequenceNode");
+	    throw new UserAccessDeniedException();
+	}
+	PedagogicalPlannerController.log.debug("Saving sequence node with UID: " + nodeUid);
+
+	// If anything goes wrong, we need to put back these values
+	String title = nodeForm.getTitle();
+	String briefDescription = nodeForm.getBriefDescription();
+	String fullDescription = nodeForm.getFullDescription();
+	String nodeType = nodeForm.getNodeType();
+	int nodePermissions = nodeForm.getPermissions();
+
+	MultiValueMap<String, String> errorMap = validateNodeForm(node, nodeForm);
+	if (errorMap.isEmpty()) {
+
+	    node.setTitle(title);
+	    node.setBriefDescription(briefDescription);
+	    node.setFullDescription(fullDescription);
+	    node.setContentFolderId(nodeForm.getContentFolderId());
+	    node.setPermissions(nodePermissions);
+
+	    // Different properties are set, depending on node type: with subnodes or template
+	    if (PedagogicalPlannerSequenceNodeForm.NODE_TYPE_SUBNODES.equals(nodeForm.getNodeType())
+		    || Boolean.TRUE.equals(nodeForm.getRemoveTemplate())) {
+		/*
+		 * LearningDesign learningDesign = authoringService.getLearningDesign(node.getLearningDesignId());
+		 * authoringService.deleteLearningDesign(learningDesign);
+		 */
+		node.setLearningDesignId(null);
+		node.setLearningDesignTitle(null);
+		node.setPermissions(PedagogicalPlannerSequenceNode.PERMISSION_DEFAULT_SETTING);
+	    } else if ((nodeForm.getFile() != null) && (nodeForm.getFile().getFileSize() > 0)) {
+		// file has been uploaded, so copy it to file system and import LD
+		FormFile file = nodeForm.getFile();
+		InputStream inputStream = file.getInputStream();
+		File sourceFile = new File(FileUtil.getTempDir(), file.getFileName());
+
+		try {
+		    FileUtils.copyInputStreamToFile(inputStream, sourceFile);
+		} catch (Exception e) {
+		    PedagogicalPlannerController.log.error(e, e);
+		    errorMap.add("GLOBAL", messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_FILE_OPEN));
+		}
+		if (!sourceFile.exists() || sourceFile.isDirectory()) {
+		    PedagogicalPlannerController.log.error(PedagogicalPlannerController.ERROR_NOT_PROPER_FILE);
+		    errorMap.add("GLOBAL", messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_FILE_OPEN));
+		}
+		if (errorMap.isEmpty()) {
+		    LearningDesign learningDesign = importLearningDesign(sourceFile, errorMap);
+		    if (errorMap.isEmpty()) {
+			updateRecentLearningDesignList(learningDesign.getLearningDesignId());
+
+			node.setLearningDesignId(learningDesign.getLearningDesignId());
+			node.setLearningDesignTitle(learningDesign.getTitle());
+
+			// If there were subnodes, we delete them now
+			Iterator<PedagogicalPlannerSequenceNode> subnodeIter = node.getSubnodes().iterator();
+			while (subnodeIter.hasNext()) {
+			    PedagogicalPlannerSequenceNode subnode = subnodeIter.next();
+			    subnodeIter.remove();
+			    pedagogicalPlannerDAO.removeNode(subnode);
+			}
+		    }
+		}
+	    }
+
+	    pedagogicalPlannerDAO.saveOrUpdateNode(node);
+	    // If it was a new subnode, we need to retrieved the assigned UID
+	    nodeUid = node.getUid();
+	    // If it was a new root node, add creator's role
+	    if (newRootNode) {
+		try {
+		    HttpSession s = SessionManager.getSession();
+		    UserDTO u = (UserDTO) s.getAttribute(AttributeNames.USER);
+		    pedagogicalPlannerDAO.saveNodeRole(u.getUserID(), nodeUid, Role.ROLE_SYSADMIN);
+		} catch (Exception e) {
+		    PedagogicalPlannerController.log
+			    .error("Error saving role for newly created root node: " + e.getMessage());
+		    e.printStackTrace();
+		}
+	    }
+	}
+
+	// If something went wrong and the new subnode was not saved,
+	// we need to inform the following method of that fact
+	boolean createSubnode = false;
+	if (nodeUid == null) {
+	    nodeUid = node.getParent() == null ? null : node.getParent().getUid();
+	    createSubnode = true;
+	}
+	// Set the parameters, but do not return yet
+	openSequenceNode(nodeForm, request, nodeUid);
+
+	if (!errorMap.isEmpty()) {
+	    request.setAttribute("errorMap", errorMap);
+	    nodeForm.setTitle(title);
+	    nodeForm.setBriefDescription(briefDescription);
+	    nodeForm.setFullDescription(fullDescription);
+	    nodeForm.setNodeType(nodeType);
+	    nodeForm.setPermissions(nodePermissions);
+	    if (createSubnode) {
+		PedagogicalPlannerSequenceNodeDTO dto = (PedagogicalPlannerSequenceNodeDTO) request
+			.getAttribute(CentralConstants.ATTR_NODE);
+		dto.setCreateSubnode(true);
+	    }
+	}
+	return "pedagogical_planner/sequenceChooser";
+    }
+
+    /**
+     * Validates node form fields.
+     *
+     * @param node
+     * @param form
+     * @return
+     */
+    private MultiValueMap<String, String> validateNodeForm(PedagogicalPlannerSequenceNode node,
+	    PedagogicalPlannerSequenceNodeForm form) {
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	// Title must not be blank
+	if (StringUtils.isEmpty(form.getTitle())) {
+	    errorMap.add("GLOBAL", messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_NODE_TITLE_BLANK));
+	}
+	// Template must a proper file
+	if (PedagogicalPlannerSequenceNodeForm.NODE_TYPE_TEMPLATE.equals(form.getNodeType())
+		&& (node.getLearningDesignTitle() == null)) {
+	    errorMap.putAll(validateFormFile(form));
+	}
+	return errorMap;
+    }
+
+    /**
+     * Validates form file. Used both for templates and exported nodes.
+     *
+     * @param form
+     * @return
+     */
+    private MultiValueMap<String, String> validateFormFile(PedagogicalPlannerSequenceNodeForm form) {
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	if ((form.getFile() == null) || (form.getFile().getFileSize() == 0)) {
+	    errorMap.add("GLOBAL", messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_FILE_EMPTY));
+	} else {
+	    String fileName = form.getFile().getFileName();
+	    boolean badExtension = false;
+	    if (fileName.length() >= 4) {
+		String extension = fileName.substring(fileName.length() - 4);
+		if (!(extension.equalsIgnoreCase(PedagogicalPlannerController.FILE_EXTENSION_LAS)
+			|| extension.equalsIgnoreCase(PedagogicalPlannerController.FILE_EXTENSION_ZIP))) {
+		    badExtension = true;
+		}
+	    } else {
+		badExtension = true;
+	    }
+	    if (badExtension) {
+		errorMap.add("GLOBAL",
+			messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_FILE_BAD_EXTENSION));
+	    }
+	}
+	return errorMap;
+    }
+
+    /**
+     * Removes the selected node and all of its subnodes
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     * @throws ServletException
+     * @throws UserAccessDeniedException
+     */
+    @RequestMapping("/removeSequenceNode")
+    public String removeSequenceNode(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm,
+	    HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException, UserAccessDeniedException {
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID);
+	PedagogicalPlannerSequenceNode node = pedagogicalPlannerDAO.getByUid(nodeUid);
+	Long parentUid = node.getParent() == null ? null : node.getParent().getUid();
+	if (canRemoveSubtree(request, nodeUid)) {
+	    PedagogicalPlannerController.log.debug("Removing sequence node with UID" + nodeUid);
+	    pedagogicalPlannerDAO.removeNode(node);
+
+	} else {
+	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	    errorMap.add("GLOBAL", messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_REMOVE_NODE_TREE));
+	    request.setAttribute("errorMap", errorMap);
+	    ;
+	    PedagogicalPlannerController.log.debug("Unauthorised attempt to removeSequenceNode");
+	}
+	return openSequenceNode(nodeForm, request, parentUid);
+    }
+
+    @RequestMapping("/moveNodeUp")
+    public String moveNodeUp(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	return moveNode(nodeForm, request, -1);
+    }
+
+    @RequestMapping("/moveNodeDown")
+    public String moveNodeDown(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	return moveNode(nodeForm, request, 1);
+    }
+
+    private String moveNode(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm, HttpServletRequest request,
+	    Integer orderDelta) throws IOException, ServletException {
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID);
+	PedagogicalPlannerSequenceNode node = pedagogicalPlannerDAO.getByUid(nodeUid);
+	Long parentUid = node.getParent() == null ? null : node.getParent().getUid();
+	PedagogicalPlannerSequenceNode neighbourNode = pedagogicalPlannerDAO.getNeighbourNode(node, orderDelta);
+
+	neighbourNode.setOrder(0);
+	pedagogicalPlannerDAO.saveOrUpdateNode(neighbourNode);
+	node.setOrder(node.getOrder() + orderDelta);
+	pedagogicalPlannerDAO.saveOrUpdateNode(node);
+	neighbourNode.setOrder(node.getOrder() - orderDelta);
+	pedagogicalPlannerDAO.saveOrUpdateNode(neighbourNode);
+
+	return openSequenceNode(nodeForm, request, parentUid);
+    }
+
+    /**
+     * Exports the selected node to a ZIP file. Method is based on a similar one for exporting learning designs.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     * @throws IOException
+     */
+
+    @RequestMapping("/exportNodezip")
+    public String exportNode(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException, IOException {
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID);
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+
+	PedagogicalPlannerController.log.debug("Exporting sequence node with UID" + nodeUid);
+	String zipFilePath = null;
+	// Different browsers handle stream downloads differently LDEV-1243
+	String filename = null;
+	try {
+	    zipFilePath = exportNode(nodeUid);
+
+	    // get only filename
+	    String zipfile = FileUtil.getFileName(zipFilePath);
+
+	    // replace spaces (" ") with underscores ("_")
+
+	    zipfile = zipfile.replaceAll(" ", "_");
+
+	    // write zip file as response stream.
+
+	    filename = FileUtil.encodeFilenameForDownload(request, zipfile);
+
+	    PedagogicalPlannerController.log.debug("Final filename to export: " + filename);
+
+	    response.setContentType(CentralConstants.RESPONSE_CONTENT_TYPE_DOWNLOAD);
+	    // response.setContentType("application/zip");
+	    response.setHeader(CentralConstants.HEADER_CONTENT_DISPOSITION, "attachment;filename=" + filename);
+	} catch (Exception e) {
+	    PedagogicalPlannerController.log.error(e, e);
+	    errorMap.add("GLOBAL", messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_EXPORT));
+	    request.setAttribute("errorMap", errorMap);
+	    ;
+	    return openSequenceNode(nodeForm, request, nodeUid);
+	}
+	FileUtils.copyFile(new File(zipFilePath), response.getOutputStream());
+	return null;
+    }
+
+    /**
+     * The proper method for exporting nodes.
+     *
+     * @param nodeUid
+     * @return
+     * @throws ZipFileUtilException
+     * @throws FileUtilException
+     * @throws IOException
+     * @throws RepositoryCheckedException
+     * @throws ExportToolContentException
+     */
+    @ResponseBody
+    @RequestMapping("/exportNode")
+    private String exportNode(Long nodeUid) throws ZipFileUtilException, FileUtilException, IOException,
+	    RepositoryCheckedException, ExportToolContentException {
+	if (nodeUid != null) {
+
+	    String rootDir = FileUtil.createTempDirectory(PedagogicalPlannerController.EXPORT_NODE_FOLDER_SUFFIX);
+	    String contentDir = FileUtil.getFullPath(rootDir, PedagogicalPlannerController.DIR_CONTENT);
+	    FileUtil.createDirectory(contentDir);
+
+	    String nodeFileName = FileUtil.getFullPath(contentDir, PedagogicalPlannerController.NODE_FILE_NAME);
+	    Writer nodeFile = new OutputStreamWriter(new FileOutputStream(nodeFileName),
+		    PedagogicalPlannerController.ENCODING_UTF_8);
+
+	    PedagogicalPlannerSequenceNode node = pedagogicalPlannerDAO.getByUid(nodeUid);
+	    // exporting XML
+	    XStream designXml = new XStream(new StaxDriver());
+	    designXml.addPermission(AnyTypePermission.ANY);
+	    // do not serialize node's owner
+	    designXml.omitField(PedagogicalPlannerSequenceNode.class, "user");
+	    designXml.toXML(node, nodeFile);
+	    nodeFile.close();
+
+	    PedagogicalPlannerController.log.debug("Node xml export success");
+
+	    // Copy templates' ZIP files from repository
+	    File templateDir = new File(contentDir, PedagogicalPlannerController.DIR_TEMPLATES);
+	    exportSubnodeTemplates(node, templateDir);
+
+	    // create zip file for fckeditor unique content folder
+	    String targetZipFileName = PedagogicalPlannerController.EXPORT_NODE_CONTENT_ZIP_PREFIX
+		    + node.getContentFolderId() + PedagogicalPlannerController.FILE_EXTENSION_ZIP;
+	    String secureDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator
+		    + FileUtil.LAMS_WWW_DIR + File.separator + FileUtil.LAMS_WWW_SECURE_DIR;
+	    String nodeContentDir = FileUtil.getFullPath(secureDir, node.getContentFolderId());
+
+	    if (!FileUtil.isEmptyDirectory(nodeContentDir, true)) {
+		PedagogicalPlannerController.log
+			.debug("Create export node content target zip file. File name is " + targetZipFileName);
+		ZipFileUtil.createZipFile(targetZipFileName, nodeContentDir, contentDir);
+	    } else {
+		PedagogicalPlannerController.log.debug("No such directory (or empty directory): " + nodeContentDir);
+	    }
+
+	    // zip file name with full path
+	    targetZipFileName = PedagogicalPlannerController.EXPORT_NODE_ZIP_PREFIX + node.getTitle()
+		    + PedagogicalPlannerController.FILE_EXTENSION_ZIP;
+	    ;
+	    PedagogicalPlannerController.log
+		    .debug("Create export node content zip file. File name is " + targetZipFileName);
+	    // create zip file and return zip full file name
+	    return ZipFileUtil.createZipFile(targetZipFileName, contentDir, rootDir);
+	}
+	return null;
+    }
+
+    /**
+     * Imports a zipped node. This method is based on a similar one for importing learning designs.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+    @RequestMapping("/importNode")
+    public String importNode(@ModelAttribute PedagogicalPlannerSequenceNodeForm nodeForm, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
+
+	if (!canEditNode(request, null)) {
+	    PedagogicalPlannerController.log.debug("Unauthorised access to importNode");
+	    throw new UserAccessDeniedException();
+	}
+
+	MultiValueMap<String, String> errorMap = validateFormFile(nodeForm);
+
+	if (errorMap.isEmpty()) {
+	    try {
+		String uploadPath = FileUtil.createTempDirectory(PedagogicalPlannerController.DIR_UPLOADED_NODE_SUFFIX);
+		String fileName = nodeForm.getFile().getFileName();
+		File importFile = new File(uploadPath + fileName);
+		PedagogicalPlannerController.log.debug("Importing a node from file: " + fileName);
+
+		// Copy the submitted file to the hard drive
+		InputStream inputStream = nodeForm.getFile().getInputStream();
+		FileUtils.copyInputStreamToFile(inputStream, importFile);
+
+		nodeForm.setFile(null);
+
+		String rootPath = ZipFileUtil.expandZip(new FileInputStream(importFile), fileName);
+		String nodeFilePath = FileUtil.getFullPath(rootPath, PedagogicalPlannerController.NODE_FILE_NAME);
+
+		PedagogicalPlannerSequenceNode node = (PedagogicalPlannerSequenceNode) FileUtil.getObjectFromXML(null,
+			nodeFilePath);
+
+		// begin fckeditor content folder import
+		String contentZipFileName = PedagogicalPlannerController.EXPORT_NODE_CONTENT_ZIP_PREFIX
+			+ node.getContentFolderId() + PedagogicalPlannerController.FILE_EXTENSION_ZIP;
+		String secureDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator
+			+ FileUtil.LAMS_WWW_DIR + File.separator + FileUtil.LAMS_WWW_SECURE_DIR + File.separator
+			+ node.getContentFolderId();
+		File contentZipFile = new File(FileUtil.getFullPath(rootPath, contentZipFileName));
+
+		// unzip file to target secure dir if exists
+		if (contentZipFile.exists()) {
+		    InputStream is = new FileInputStream(contentZipFile);
+		    ZipFileUtil.expandZipToFolder(is, secureDir);
+		}
+
+		// Upload the template files back into the repository
+		File templateDir = new File(rootPath, PedagogicalPlannerController.DIR_TEMPLATES);
+		importSubnodeTemplates(node, templateDir, errorMap);
+
+		// The imported node is added as the last one
+		Integer order = pedagogicalPlannerDAO.getNextOrderId(null);
+		node.setOrder(order);
+		pedagogicalPlannerDAO.saveOrUpdateNode(node);
+	    } catch (Exception e) {
+		PedagogicalPlannerController.log.error(e, e);
+		errorMap.add("GLOBAL", messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_IMPORT));
+	    }
+	}
+	if (!errorMap.isEmpty()) {
+	    request.setAttribute("errorMap", errorMap);
+	    ;
+	}
+	return openSequenceNode(nodeForm, request, (Long) null);
+    }
+
+    /**
+     * Imports a learning design to bind it with a certain node.
+     *
+     * @param fileUuid
+     * @param fileName
+     * @param errorMap
+     * @return
+     * @throws ServletException
+     */
+    @SuppressWarnings("unchecked")
+    private LearningDesign importLearningDesign(File sourceFile, MultiValueMap<String, String> errorMap)
+	    throws ServletException {
+	User user = getUser();
+	List<String> toolsErrorMsgs = new ArrayList<>();
+	Long learningDesignID = null;
+	LearningDesign learningDesign = null;
+	List<String> learningDesignErrorMsgs = new ArrayList<>();
+
+	Integer workspaceFolderId = null;
+
+	// getWorkspaceFolderId(user.getUserId());
+
+	// Extract the template
+	try {
+	    Object[] ldResults = exportService.importLearningDesign(sourceFile, user, workspaceFolderId, toolsErrorMsgs,
+		    "");
+	    sourceFile.delete();
+	    learningDesignID = (Long) ldResults[0];
+	    learningDesignErrorMsgs = (List<String>) ldResults[1];
+	    toolsErrorMsgs = (List<String>) ldResults[2];
+	    learningDesign = authoringService.getLearningDesign(learningDesignID);
+	} catch (ImportToolContentException e) {
+	    PedagogicalPlannerController.log.error(e, e);
+	    errorMap.add("GLOBAL", messageService
+		    .getMessage(PedagogicalPlannerController.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
+
+	}
+
+	if (((learningDesignID == null) || (learningDesignID.longValue() == -1))
+		&& (learningDesignErrorMsgs.size() == 0)) {
+	    errorMap.add("GLOBAL", messageService
+		    .getMessage(PedagogicalPlannerController.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
+	    return null;
+	}
+	if (learningDesignErrorMsgs.size() > 0) {
+	    for (String error : learningDesignErrorMsgs) {
+		PedagogicalPlannerController.log.error(error);
+	    }
+	    errorMap.add("GLOBAL", messageService
+		    .getMessage(PedagogicalPlannerController.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
+	    return null;
+	}
+	if (toolsErrorMsgs.size() > 0) {
+	    for (String error : toolsErrorMsgs) {
+		PedagogicalPlannerController.log.error(error);
+	    }
+	    errorMap.add("GLOBAL", messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_TOOL_ERRORS));
+	    return null;
+	}
+	return learningDesign;
+    }
+
+    /**
+     * Returns WorkspaceFolder where imported learning designs can be stored.
+     */
+    @SuppressWarnings("unchecked")
+    private WorkspaceFolder getCommonWorkspaceFolderId(Integer userID) {
+	String name = PedagogicalPlannerController.PLANNER_FOLDER_NAME;
+
+	WorkspaceFolder parentFolder = userManagementService.getRootOrganisation().getNormalFolder();
+	Integer workspaceFolderType = WorkspaceFolder.PUBLIC_SEQUENCES;
+
+	Map<String, Object> properties = new HashMap<>();
+	properties.put("name", name);
+	properties.put("parentWorkspaceFolder.workspaceFolderId", parentFolder.getWorkspaceFolderId());
+	properties.put("workspaceFolderType", workspaceFolderType);
+	List<WorkspaceFolder> workspaceFolderList = userManagementService.findByProperties(WorkspaceFolder.class,
+		properties);
+
+	WorkspaceFolder workspaceFolder = null;
+	if ((workspaceFolderList != null) && (workspaceFolderList.size() > 0)) {
+	    workspaceFolder = workspaceFolderList.get(0);
+	} else {
+	    workspaceFolder = new WorkspaceFolder(name, parentFolder, userID, new Date(), new Date(),
+		    WorkspaceFolder.PUBLIC_SEQUENCES);
+	    userManagementService.save(workspaceFolder);
+	}
+	return workspaceFolder;
+    }
+
+    /**
+     * Returns current user stored in session.
+     *
+     * @throws ServletException
+     */
+    private User getUser() throws ServletException {
+	HttpSession session = SessionManager.getSession();
+	UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
+	User user = (User) userManagementService.findById(User.class, userDto.getUserID());
+	if (user == null) {
+	    throw new ServletException(PedagogicalPlannerController.ERROR_USER_NOT_FOUND);
+	}
+	return user;
+    }
+
+    /**
+     * Export the subnodes' templates into the selected dir.
+     *
+     * @param node
+     * @param outputDir
+     * @throws ExportToolContentException
+     * @throws RepositoryCheckedException
+     * @throws IOException
+     */
+    private void exportSubnodeTemplates(PedagogicalPlannerSequenceNode node, File outputDir)
+	    throws IOException, RepositoryCheckedException, ExportToolContentException {
+	if (node != null) {
+	    if (node.getLearningDesignId() == null) {
+		if (node.getSubnodes() != null) {
+		    for (PedagogicalPlannerSequenceNode subnode : node.getSubnodes()) {
+			exportSubnodeTemplates(subnode, outputDir);
+		    }
+		}
+	    } else {
+
+		List<String> toolsErrorMsgs = new ArrayList<>();
+		String exportedLdFilePath = exportService.exportLearningDesign(node.getLearningDesignId(),
+			toolsErrorMsgs);
+		if (!toolsErrorMsgs.isEmpty()) {
+		    StringBuffer errorMessages = new StringBuffer();
+		    for (String error : toolsErrorMsgs) {
+			errorMessages.append(error);
+		    }
+		    throw new ExportToolContentException(errorMessages.toString());
+		}
+		FileInputStream inputStream = new FileInputStream(exportedLdFilePath);
+
+		File ldIdDir = new File(outputDir, node.getLearningDesignId().toString());
+		ldIdDir.mkdirs();
+		File targetFile = new File(ldIdDir,
+			node.getLearningDesignTitle() + PedagogicalPlannerController.FILE_EXTENSION_ZIP);
+
+		PedagogicalPlannerController.log
+			.debug("Preparing for zipping the template file: " + node.getLearningDesignTitle());
+		FileUtils.copyInputStreamToFile(inputStream, targetFile);
+	    }
+	}
+    }
+
+    /**
+     * Imports back the subnodes' templates. Also sets all the nodes' UIDs to NULL.
+     *
+     * @param node
+     * @param inputDir
+     * @throws ServletException
+     */
+    private void importSubnodeTemplates(PedagogicalPlannerSequenceNode node, File inputDir,
+	    MultiValueMap<String, String> errorMap) throws ServletException {
+	if (node != null) {
+	    node.setUid(null);
+	    User user = getUser();
+	    node.setUser(user);
+
+	    if (node.getLearningDesignId() == null) {
+		if (node.getSubnodes() != null) {
+		    for (PedagogicalPlannerSequenceNode subnode : node.getSubnodes()) {
+			importSubnodeTemplates(subnode, inputDir, errorMap);
+			subnode.setParent(node);
+		    }
+		}
+	    } else {
+		File ldIdDir = new File(inputDir, node.getLearningDesignId().toString());
+		String fileName = node.getLearningDesignTitle() + PedagogicalPlannerController.FILE_EXTENSION_ZIP;
+		File sourceFile = new File(ldIdDir, fileName);
+		PedagogicalPlannerController.log.debug("Importing a template file: " + fileName);
+		LearningDesign learningDesign = importLearningDesign(sourceFile, errorMap);
+
+		node.setLearningDesignId(learningDesign.getLearningDesignId());
+		node.setLearningDesignTitle(learningDesign.getTitle());
+	    }
+	}
+    }
+
+    /*----------------------- GROUPING METHODS -------------------------*/
+
+    /**
+     * Fill the grouping with initial data
+     */
+    @RequestMapping("/initGrouping")
+    public String initGrouping(@ModelAttribute PedagogicalPlannerGroupingForm plannerForm, HttpServletRequest request) {
+	Long groupingId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Grouping grouping = authoringService.getGroupingById(groupingId);
+	plannerForm.fillForm(grouping);
+	return "pedagogical_planner/grouping";
+    }
+
+    /**
+     * Saves parameters of the grouping form, depending on the grouping type.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(path = ("/saveOrUpdateGroupingForm"), method = RequestMethod.POST)
+    public String saveOrUpdateGroupingForm(@ModelAttribute PedagogicalPlannerGroupingForm plannerForm,
+	    HttpServletRequest request) {
+	PedagogicalPlannerController.log.debug("Saving grouping activity");
+	MultiValueMap<String, String> errorMap = plannerForm.validate();
+	if (errorMap.isEmpty()) {
+	    Grouping grouping = authoringService.getGroupingById(plannerForm.getToolContentID());
+	    if (grouping.isRandomGrouping()) {
+		RandomGrouping randomGrouping = (RandomGrouping) grouping;
+		Integer number = StringUtils.isEmpty(plannerForm.getNumberOfGroups()) ? null
+			: Integer.parseInt(plannerForm.getNumberOfGroups());
+		randomGrouping.setNumberOfGroups(number);
+
+		number = StringUtils.isEmpty(plannerForm.getLearnersPerGroup()) ? null
+			: Integer.parseInt(plannerForm.getLearnersPerGroup());
+		randomGrouping.setLearnersPerGroup(number);
+	    } else if (grouping.isLearnerChoiceGrouping()) {
+		LearnerChoiceGrouping learnerChoiceGrouping = (LearnerChoiceGrouping) grouping;
+		Integer number = StringUtils.isEmpty(plannerForm.getNumberOfGroups()) ? null
+			: Integer.parseInt(plannerForm.getNumberOfGroups());
+		learnerChoiceGrouping.setNumberOfGroups(number);
+
+		number = StringUtils.isEmpty(plannerForm.getLearnersPerGroup()) ? null
+			: Integer.parseInt(plannerForm.getLearnersPerGroup());
+		learnerChoiceGrouping.setLearnersPerGroup(number);
+		learnerChoiceGrouping.setEqualNumberOfLearnersPerGroup(plannerForm.getEqualGroupSizes());
+		learnerChoiceGrouping.setViewStudentsBeforeSelection(plannerForm.getViewStudentsBeforeSelection());
+	    } else {
+		Integer number = StringUtils.isEmpty(plannerForm.getNumberOfGroups()) ? null
+			: Integer.parseInt(plannerForm.getNumberOfGroups());
+		grouping.setMaxNumberOfGroups(number);
+	    }
+	} else {
+	    request.setAttribute("errorMap", errorMap);
+	    ;
+	}
+	return "pedagogical_planner/grouping";
+    }
+
+    private List<PedagogicalPlannerSequenceNodeDTO> getRecentlyModifiedLearnindDesignsAsNodes()
+	    throws ServletException {
+	// Add the recently modified learning design list, if it's the root node with no filtering
+	User user = getUser();
+	// the list is sorted most-recently-edited-on-top (so by the timestamp descending)
+	Set<Long> recentLDs = user.getRecentlyModifiedLearningDesigns();
+	List<PedagogicalPlannerSequenceNodeDTO> recentNodes = new LinkedList<>();
+	// create "dummy", almost empty nodes
+	for (Long learningDesignId : recentLDs) {
+	    LearningDesign learningDesign = authoringService.getLearningDesign(learningDesignId);
+
+	    PedagogicalPlannerSequenceNodeDTO node = new PedagogicalPlannerSequenceNodeDTO();
+	    node.setTitle(learningDesign.getTitle());
+	    node.setLearningDesignId(learningDesignId);
+
+	    recentNodes.add(node);
+	}
+	return recentNodes;
+    }
+
+    /**
+     * Adds the Learning Design to the list of recenlty edited sequences. It puts the selected LD on the top of the
+     * list.
+     *
+     * @param learningDesignId
+     */
+    private void updateRecentLearningDesignList(Long learningDesignId) throws ServletException {
+	User user = getUser();
+	// the list is sorted most-recently-edited-on-top (so by the timestamp descending)
+	Set<Long> recentLDs = user.getRecentlyModifiedLearningDesigns();
+	boolean ldFound = false;
+	// if LD is already in the list, remove it and add it again - it a way to refresh the timestamp in DB
+	Iterator<Long> iter = recentLDs.iterator();
+	while (iter.hasNext()) {
+	    Long recentLD = iter.next();
+	    if (recentLD.equals(learningDesignId)) {
+		iter.remove();
+		userManagementService.saveUser(user);
+		ldFound = true;
+		break;
+	    }
+	}
+	// if LD was not in the list, but the list is full, remove the last entry
+	if (!ldFound && (recentLDs.size() >= CentralConstants.PLANNER_RECENT_LD_MAX_COUNT)) {
+	    iter.remove();
+	}
+	recentLDs.add(learningDesignId);
+	userManagementService.save(user);
+    }
+
+    /*-------------------------- TEMPLATE BASE METHODS -----------------*/
+
+    /**
+     * Saves additional, non tool-bound template details - currently only the title.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     * @throws ServletException
+     */
+    @SuppressWarnings("unchecked")
+    @ResponseBody
+    @RequestMapping(path = "/saveSequenceDetails", method = RequestMethod.POST)
+    public String saveSequenceDetails(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException {
+	PedagogicalPlannerController.log.debug("Saving sequence title");
+	String sequenceTitle = WebUtil.readStrParam(request, CentralConstants.PARAM_SEQUENCE_TITLE, true);
+	Long learningDesignID = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID);
+	Integer callAttemptedID = WebUtil.readIntParam(request, CentralConstants.PARAM_CALL_ATTEMPTED_ID);
+	// We send a message in format "<response>&<call ID>"; it is then parsed in JavaScript
+	String responseSuffix = "&" + callAttemptedID;
+
+	if (StringUtils.isEmpty(sequenceTitle)) {
+	    String blankTitleError = messageService.getMessage(CentralConstants.ERROR_PLANNER_TITLE_BLANK);
+	    response.setContentType("text/html;charset=utf-8");
+	    return blankTitleError + responseSuffix;
+	} else {
+	    LearningDesign learningDesign = authoringService.getLearningDesign(learningDesignID);
+	    learningDesign.setTitle(sequenceTitle);
+
+	    // parse activity metadata, which is in form "activity<tool_content_id>.<field_name>=<value)&..."
+	    String activityMetadataString = WebUtil.readStrParam(request, CentralConstants.PARAM_ACTIVITY_METADATA,
+		    true);
+	    if (!StringUtils.isEmpty(activityMetadataString)) {
+		String[] activityMetadataEntries = activityMetadataString.split("&");
+		// creata a map of metadata objects, because we are filling them multiple times during this iteration
+		Map<Long, PedagogicalPlannerActivityMetadata> activitiesMetadata = new TreeMap<>();
+		for (String activityMetadataEntry : activityMetadataEntries) {
+		    String[] keyAndValue = activityMetadataEntry.split("=");
+		    String[] keyParts = keyAndValue[0].split("\\.");
+		    String toolContentIdString = keyParts[0]
+			    .substring(PedagogicalPlannerController.ACTIVITY_METADATA_PREFIX.length());
+		    Long toolContentId = Long.parseLong(toolContentIdString);
+
+		    PedagogicalPlannerActivityMetadata plannerMetadata = activitiesMetadata.get(toolContentId);
+		    if (plannerMetadata == null) {
+			plannerMetadata = new PedagogicalPlannerActivityMetadata();
+			activitiesMetadata.put(toolContentId, plannerMetadata);
+		    }
+
+		    String fieldName = keyParts[1];
+		    String value = keyAndValue[1];
+
+		    // recognise fields and set properties
+		    if (PedagogicalPlannerController.ACTIVITY_METADATA_COLLAPSED.equalsIgnoreCase(fieldName)) {
+			plannerMetadata.setCollapsed(Boolean.parseBoolean(value));
+		    } else if (PedagogicalPlannerController.ACTIVITY_METADATA_EXPANDED.equalsIgnoreCase(fieldName)) {
+			plannerMetadata.setExpanded(Boolean.parseBoolean(value));
+		    } else if (PedagogicalPlannerController.ACTIVITY_METADATA_HIDDEN.equalsIgnoreCase(fieldName)) {
+			plannerMetadata.setHidden(Boolean.parseBoolean(value));
+		    } else if (PedagogicalPlannerController.ACTIVITY_METADATA_EDITING_ADVICE
+			    .equalsIgnoreCase(fieldName)) {
+			plannerMetadata.setEditingAdvice(value);
+		    }
+		}
+
+		// assign metadata to activities
+		if (!activitiesMetadata.isEmpty()) {
+		    for (Activity activity : (Set<Activity>) learningDesign.getActivities()) {
+			if (activity.isToolActivity()) {
+			    activity = activityDAO.getActivityByActivityId(activity.getActivityId());
+			    ToolActivity toolActivity = (ToolActivity) activity;
+			    PedagogicalPlannerActivityMetadata plannerMetadata = activitiesMetadata
+				    .get(toolActivity.getToolContentId());
+			    if (plannerMetadata != null) {
+				PedagogicalPlannerActivityMetadata storedMetadata = toolActivity.getPlannerMetadata();
+				if (storedMetadata == null) {
+				    plannerMetadata.setActivity(toolActivity);
+				    toolActivity.setPlannerMetadata(plannerMetadata);
+				} else {
+				    storedMetadata.copyProperties(plannerMetadata);
+				}
+			    }
+			}
+		    }
+		}
+	    }
+
+	    learningDesign.setLastModifiedDateTime(new Date());
+	    String copyMode = WebUtil.readStrParam(request, CentralConstants.PARAM_COPY_MODE, true);
+	    if (PedagogicalPlannerController.COPY_MODE_MOVE_CURRRENT.equalsIgnoreCase(copyMode)) {
+		// if temporary copy (only for browsing) was edited and now saved,
+		// we move it to user's folder as a hard copy
+		User user = getUser();
+		WorkspaceFolder userFolder = user.getWorkspaceFolder();
+		learningDesign.setWorkspaceFolder(userFolder);
+	    }
+	    authoringService.saveLearningDesign(learningDesign);
+
+	    updateRecentLearningDesignList(learningDesignID);
+	    response.setContentType("text/html;charset=utf-8");
+	    return "OK" + responseSuffix;
+	}
+    }
+
+    @RequestMapping("/exportTemplate")
+    public String exportTemplate(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException {
+	Long learningDesignId = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID);
+
+	List<String> toolsErrorMsgs = new ArrayList<>();
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	String zipFilePath = null;
+	boolean valid = false;
+	try {
+	    zipFilePath = exportService.exportLearningDesign(learningDesignId, toolsErrorMsgs);
+	    if (toolsErrorMsgs.isEmpty()) {
+
+		// get only filename
+		String zipfile = FileUtil.getFileName(zipFilePath);
+
+		// replace spaces (" ") with underscores ("_")
+
+		zipfile = zipfile.replaceAll(" ", "_");
+
+		// write zip file as response stream.
+
+		// Different browsers handle stream downloads differently LDEV-1243
+		String filename = FileUtil.encodeFilenameForDownload(request, zipfile);
+		PedagogicalPlannerController.log.debug("Final filename to export: " + filename);
+
+		response.setContentType(CentralConstants.RESPONSE_CONTENT_TYPE_DOWNLOAD);
+		// response.setContentType("application/zip");
+		response.setHeader(CentralConstants.HEADER_CONTENT_DISPOSITION, "attachment;filename=" + filename);
+		valid = true;
+	    }
+
+	} catch (Exception e) {
+	    PedagogicalPlannerController.log.error(e, e);
+	}
+	if (!valid) {
+	    errorMap.add("GLOBAL", messageService.getMessage(PedagogicalPlannerController.ERROR_KEY_EXPORT_TEMPLATE));
+	    request.setAttribute("errorMap", errorMap);
+	    for (String error : toolsErrorMsgs) {
+		PedagogicalPlannerController.log.error(error);
+	    }
+	    LearningDesign learningDesign = authoringService.getLearningDesign(learningDesignId);
+	    errorMap = openTemplate(request, learningDesign);
+	    if (!errorMap.isEmpty()) {
+		throw new ServletException(messageService
+			.getMessage(PedagogicalPlannerController.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
+	    }
+	    return "pedagogical_planner/templateBase";
+	}
+
+	FileUtils.copyFile(new File(zipFilePath), response.getOutputStream());
+	return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    @RequestMapping("/addRemoveEditors")
+    public String addRemoveEditors(HttpServletRequest request) throws Exception {
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true);
+
+	if (canEditNode(request, nodeUid)) {
+	    List<User> existingUsers = pedagogicalPlannerDAO.getNodeUsers(nodeUid, Role.ROLE_SYSADMIN);
+
+	    Integer orgId = userManagementService.getRootOrganisation().getOrganisationId();
+	    Vector<User> potentialUsersVector = userManagementService.getUsersFromOrganisationByRole(orgId,
+		    Role.SYSADMIN, true);
+
+	    // list existing users (inherited role from parent nodes)
+	    Set<User> allInheritedUsers = pedagogicalPlannerDAO.getInheritedNodeUsers(nodeUid, Role.ROLE_SYSADMIN);
+	    ArrayList<User> filteredInheritedUsers = new ArrayList<>();
+	    for (Object o : allInheritedUsers) {
+		User u = (User) o;
+		// filter existing users of the actual node
+		if (existingUsers.contains(u)) {
+		    continue;
+		}
+		filteredInheritedUsers.add(u);
+	    }
+
+	    // filter existing users from list of potential users
+	    ArrayList<User> potentialUsers = new ArrayList<>();
+	    for (Object o : potentialUsersVector) {
+		User u = (User) o;
+		if (existingUsers.contains(u) || allInheritedUsers.contains(u)) {
+		    continue;
+		}
+		// filter self
+		if (StringUtils.equals(u.getLogin(), request.getRemoteUser())) {
+		    continue;
+		}
+		potentialUsers.add(u);
+	    }
+
+	    request.setAttribute("existingUsers", existingUsers);
+	    request.setAttribute("potentialUsers", potentialUsers);
+	    request.setAttribute("inheritedUsers", filteredInheritedUsers);
+
+	    return "pedagogical_planner/editAuthors";
+	} else {
+	    PedagogicalPlannerController.log.debug("Unauthorised attempt to access add/remove editors page.");
+	    throw new UserAccessDeniedException();
+	}
+    }
+
+    @ResponseBody
+    @RequestMapping("/addEditor")
+    public void addEditor(HttpServletRequest request) throws Exception {
+	Integer userId = WebUtil.readIntParam(request, CentralConstants.PARAM_USER_ID, false);
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true);
+
+	if (canEditNode(request, nodeUid)) {
+	    pedagogicalPlannerDAO.saveNodeRole(userId, nodeUid, Role.ROLE_SYSADMIN);
+	} else {
+	    PedagogicalPlannerController.log.debug("Unauthorised attempt to add editor to node.");
+	}
+
+    }
+
+    @ResponseBody
+    @RequestMapping("/removeEditor")
+    public void removeEditor(HttpServletRequest request) throws Exception {
+	Integer userId = WebUtil.readIntParam(request, CentralConstants.PARAM_USER_ID, false);
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, false);
+
+	if (canEditNode(request, nodeUid)) {
+	    pedagogicalPlannerDAO.removeNodeRole(userId, nodeUid, Role.ROLE_SYSADMIN);
+	} else {
+	    PedagogicalPlannerController.log.debug("Unauthorised attempt to remove editor from node.");
+	}
+
+    }
+
+    /*------------------------ COMMON METHODS --------------------*/
+
+    // only these roles can edit nodes and give this role on this node to others
+    private boolean canEditNode(HttpServletRequest request, Long nodeUid) {
+	return isNodeOwnerOrSuperuser(request, nodeUid) || isEditor(request, nodeUid);
+    }
+
+    private boolean isNodeOwnerOrSuperuser(HttpServletRequest request, Long nodeUid) {
+	if (request.isUserInRole(Role.SYSADMIN)) {
+	    // sysadmins have all permission
+	    return true;
+	} else {
+	    if (nodeUid == null) {
+		// all global author admins (GAA) can create and edit at the root level
+		return userManagementService.isUserSysAdmin();
+	    } else {
+		// at any other node, the user needs to be the node's owner
+		// or linked to that node or one of its parents
+		User user = userManagementService.getUserByLogin(request.getRemoteUser());
+		PedagogicalPlannerSequenceNode node = pedagogicalPlannerDAO.getByUid(nodeUid);
+		User nodeOwner = node.getUser();
+		return (nodeOwner != null) && user.equals(nodeOwner);
+	    }
+	}
+    }
+
+    private boolean isEditor(HttpServletRequest request, Long nodeUid) {
+	User user = userManagementService.getUserByLogin(request.getRemoteUser());
+	return pedagogicalPlannerDAO.isEditor(user.getUserId(), nodeUid, Role.ROLE_SYSADMIN);
+    }
+
+    private boolean canRemoveSubtree(HttpServletRequest request, Long nodeUid) {
+	if ((nodeUid == null) || request.isUserInRole(Role.SYSADMIN)) {
+	    return true;
+	}
+	boolean isOwner = isNodeOwnerOrSuperuser(request, nodeUid);
+	boolean isPlainEditor = isEditor(request, nodeUid);
+	if (isOwner || isPlainEditor) {
+	    PedagogicalPlannerSequenceNode node = pedagogicalPlannerDAO.getByUid(nodeUid);
+	    Integer nodePermissions = node.getPermissions();
+	    if (isOwner || (nodePermissions == null)
+		    || ((nodePermissions & PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_REMOVE) != 0)) {
+		Set<PedagogicalPlannerSequenceNode> subnodes = node.getSubnodes();
+		if ((subnodes != null) && !subnodes.isEmpty()) {
+		    for (PedagogicalPlannerSequenceNode subnode : subnodes) {
+			if (!canRemoveSubtree(request, subnode.getUid())) {
+			    return false;
+			}
+		    }
+		}
+		return true;
+	    }
+	}
+	return false;
+    }
+}
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java	(.../PedagogicalPlannerGroupingForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java	(.../PedagogicalPlannerGroupingForm.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -20,29 +20,33 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.web.planner;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.LearnerChoiceGrouping;
 import org.lamsfoundation.lams.learningdesign.RandomGrouping;
+import org.lamsfoundation.lams.util.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
 /**
  * Form for grouping activities in Pedagogical Planner.
  *
  * @author Marcin Cieslak
  *
  */
-public class PedagogicalPlannerGroupingForm extends PedagogicalPlannerActivityForm {
+public class PedagogicalPlannerGroupingForm extends PedagogicalPlannerActivitySpringForm {
     private Integer groupingTypeId;
     private String numberOfGroups;
     private String learnersPerGroup;
     private Boolean equalGroupSizes;
     private Boolean viewStudentsBeforeSelection;
 
+    @Autowired
+    MessageService messageService;
+
     public Integer getGroupingTypeId() {
 	return groupingTypeId;
     }
@@ -100,9 +104,9 @@
     /**
      * Checks if the provided group/learner number is a nonnegative integer.
      */
-    @Override
-    public ActionMessages validate() {
-	ActionMessages errors = new ActionMessages();
+
+    public MultiValueMap<String, String> validate() {
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	boolean valid = true;
 	boolean numberValid = true;
 
@@ -116,11 +120,11 @@
 	    numberValid = false;
 	}
 	if (!numberValid) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.planner.grouping.number.integer"));
+	    errorMap.add("Global", messageService.getMessage("error.planner.grouping.number.integer"));
 	    valid = false;
 	}
 	setValid(valid);
-	return errors;
+	return errorMap;
     }
 
     public String getLearnersPerGroup() {
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java	(.../PedagogicalPlannerSequenceNodeForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java	(.../PedagogicalPlannerSequenceNodeForm.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -20,14 +20,12 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.web.planner;
 
-import org.apache.struts.action.ActionForm;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode;
 
-public class PedagogicalPlannerSequenceNodeForm extends ActionForm {
+public class PedagogicalPlannerSequenceNodeForm {
     public final static String NODE_TYPE_SUBNODES = "subnodes";
     public final static String NODE_TYPE_TEMPLATE = "template";
 
@@ -87,25 +85,35 @@
     public int getPermissions() {
 	int permissions = 0;
 	permissions += Boolean.TRUE.equals(permitEditorViewTemplate)
-		? PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_VIEW : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_VIEW
+		: 0;
 	permissions += Boolean.TRUE.equals(permitEditorModifyTemplate)
-		? PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_MODIFY : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_MODIFY
+		: 0;
 	permissions += Boolean.TRUE.equals(permitEditorReplaceTemplate)
-		? PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_REPLACE : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_REPLACE
+		: 0;
 	permissions += Boolean.TRUE.equals(permitEditorRemoveNode)
-		? PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_REMOVE : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_EDITOR_REMOVE
+		: 0;
 	permissions += Boolean.TRUE.equals(permitTeacherViewTemplate)
-		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_VIEW : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_VIEW
+		: 0;
 	permissions += Boolean.TRUE.equals(permitTeacherEditCopy)
-		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_COPY : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_COPY
+		: 0;
 	permissions += Boolean.TRUE.equals(permitTeacherPreview)
-		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_PREVIEW : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_PREVIEW
+		: 0;
 	permissions += Boolean.TRUE.equals(permitTeacherViewCopyInFullAuthor)
-		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_VIEW_IN_FULL_AUTHOR : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_VIEW_IN_FULL_AUTHOR
+		: 0;
 	permissions += Boolean.TRUE.equals(permitTeacherExportCopy)
-		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_EXPORT : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_EXPORT
+		: 0;
 	permissions += Boolean.TRUE.equals(permitTeacherSaveCopy)
-		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_SAVE : 0;
+		? PedagogicalPlannerSequenceNode.PERMISSION_TEACHER_SAVE
+		: 0;
 	return permissions;
     }
 
Index: lams_central/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_central/web/WEB-INF/spring-servlet.xml	(revision 0)
+++ lams_central/web/WEB-INF/spring-servlet.xml	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+           				   http://www.springframework.org/schema/context 
+   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+	<!-- Spring MVC -->
+	<context:component-scan base-package="org.lamsfoundation.lams.web.controller" />
+	
+	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/" />
+		<property name="suffix" value=".jsp" />
+	</bean>
+</beans>
\ No newline at end of file
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -250,26 +250,10 @@
 	</servlet>
 	
 	<servlet>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<servlet-class>
-			org.apache.struts.action.ActionServlet
+			org.springframework.web.servlet.DispatcherServlet
 		</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>2</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
@@ -404,7 +388,7 @@
 	<!-- Optional Module Placeholder - do not remove -->
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
Index: lams_central/web/authoring/template/tool/assessmcq.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -1,8 +1,8 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ page import="org.lamsfoundation.lams.authoring.template.web.LdTemplateAction"%>
-<c:set var="maxOptionCount" value="<%= LdTemplateAction.MAX_OPTION_COUNT %>"/>
+<%@ page import="org.lamsfoundation.lams.authoring.template.web.LdTemplateController"%>
+<c:set var="maxOptionCount" value="<%=LdTemplateController.MAX_OPTION_COUNT%>"/>
 
 <c:set var="required">${questionNumber eq 1 ? "class=\"input required\"" : "class=\"input\""}</c:set>
 
Index: lams_central/web/authoring/template/tool/mcquestion.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_central/web/authoring/template/tool/mcquestion.jsp	(.../mcquestion.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/authoring/template/tool/mcquestion.jsp	(.../mcquestion.jsp)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -1,8 +1,8 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ page import="org.lamsfoundation.lams.authoring.template.web.LdTemplateAction"%>
-<c:set var="maxOptionCount" value="<%= LdTemplateAction.MAX_OPTION_COUNT %>"/>
+<%@ page import="org.lamsfoundation.lams.authoring.template.web.LdTemplateController"%>
+<c:set var="maxOptionCount" value="<%=LdTemplateController.MAX_OPTION_COUNT%>"/>
 <%-- Generic Q&A question page. Expects an input of questionNumber, contentFolderID, and creates a text field field question${questionNumber} and three options --%>
 
 <div class="panel panel-default">
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java	(.../AuthoringConditionController.java)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java	(.../AuthoringConditionController.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -60,7 +60,7 @@
  * <code>AuthoringAction</code> action.
  *
  * @author Marcin Cieslak
- * @see org.lamsfoundation.lams.tool.forum.web.controller.AuthoringAction
+ * @see org.lamsfoundation.lams.tool.forum.web.controller.AuthoringController
  */
 @Controller
 @RequestMapping("/authoringCondition")
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java
===================================================================
diff -u -r82bfa2d1d62378051c32cff20a826607fdf7a8e5 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 82bfa2d1d62378051c32cff20a826607fdf7a8e5)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -45,7 +45,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringAction;
+import org.lamsfoundation.lams.authoring.web.AuthoringController;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -86,7 +86,7 @@
 @Controller
 @RequestMapping("/authoring")
 public class AuthoringController {
-    private static Logger log = Logger.getLogger(AuthoringAction.class);
+    private static Logger log = Logger.getLogger(AuthoringController.class);
 
     @Autowired
     @Qualifier("forumService")
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java
===================================================================
diff -u -r69473b66bf1e9e304407c33f92791924ea9eefd2 -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java	(.../SubmitFilesPedagogicalPlannerController.java)	(revision 69473b66bf1e9e304407c33f92791924ea9eefd2)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java	(.../SubmitFilesPedagogicalPlannerController.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -30,7 +30,7 @@
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.web.form.SubmitFilesPedagogicalPlannerForm;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerAction;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerController;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -51,7 +51,7 @@
 @RequestMapping("/pedagogicalPlanner")
 public class SubmitFilesPedagogicalPlannerController {
 
-    private static Logger logger = Logger.getLogger(PedagogicalPlannerAction.class);
+    private static Logger logger = Logger.getLogger(PedagogicalPlannerController.class);
 
     @Autowired
     @Qualifier("submitFilesService")
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java
===================================================================
diff -u -rada9f9222f66994c94c2989aea922429377f06ed -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java	(.../PedagogicalPlannerController.java)	(revision ada9f9222f66994c94c2989aea922429377f06ed)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java	(.../PedagogicalPlannerController.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
@@ -33,7 +33,7 @@
 import org.lamsfoundation.lams.tool.wiki.service.IWikiService;
 import org.lamsfoundation.lams.tool.wiki.web.forms.WikiPedagogicalPlannerForm;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerAction;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerController;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -53,7 +53,7 @@
 @RequestMapping("/pedagogicalPlanner")
 public class PedagogicalPlannerController {
 
-    private static Logger logger = Logger.getLogger(PedagogicalPlannerAction.class);
+    private static Logger logger = Logger.getLogger(PedagogicalPlannerController.class);
 
     @Autowired
     @Qualifier("wikiService")