Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r00a6e145b37916eb1561ea5c68319b0fc691681b
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r00a6e145b37916eb1561ea5c68319b0fc691681b
Binary files differ
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rc938db99e80a21d9099839105f58e9c7537fe0d5 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c938db99e80a21d9099839105f58e9c7537fe0d5)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -256,5 +256,19 @@
 label.planner.branch.default=(default)
 label.planner.option=Option
 
+button.planner.editor.open=Open editor
+msg.planner.node.locked=This node is locked. You can not edit it.
+button.planner.save.node=Save node
+label.planner.create.subnode=Create subnode
+label.planner.edit.node=Edit node
+label.planner.root.node=Root
+msg.planner.open.template=This node opens planner template.
+msg.planner.remove.node=Remove node
+label.planner.empty.subnode=There are no subnodes defined.
+label.planner.description.brief=Brief description (for parent node)
+label.planner.description.full=Full description (for self)
+label.planner.root.choose=Choose a planner from one of the following activity categories:
+msg.planner.remove.warning=Are you sure you want to remove this node and all of its subnodes?
+
 public.folder=Public Folder
 #======= End labels: Exported 222 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rc938db99e80a21d9099839105f58e9c7537fe0d5 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision c938db99e80a21d9099839105f58e9c7537fe0d5)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -256,5 +256,19 @@
 label.planner.branch.default=(default)
 label.planner.option=Option
 
+button.planner.editor.open=Open editor
+msg.planner.node.locked=This node is locked. You can not edit it.
+button.planner.save.node=Save node
+label.planner.create.subnode=Create subnode
+label.planner.edit.node=Edit node
+label.planner.root.node=Root
+msg.planner.open.template=This node opens planner template.
+msg.planner.remove.node=Remove node
+label.planner.empty.subnode=There are no subnodes defined.
+label.planner.description.brief=Brief description (for parent node)
+label.planner.description.full=Full description (for self)
+label.planner.root.choose=Choose a planner from one of the following activity categories:
+msg.planner.remove.warning=Are you sure you want to remove this node and all of its subnodes?
+
 public.folder=Public Folder
 #======= End labels: Exported 222 labels for en AU =====
Index: lams_central/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -rc234c64ad9ff9d713f6d8e3331d0c20075e49303 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_central/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision c234c64ad9ff9d713f6d8e3331d0c20075e49303)
+++ lams_central/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -1,7 +1,11 @@
 <form-bean
-  name="GroupingPedagogicalPlannerForm"
-  type="org.lamsfoundation.lams.web.planner.GroupingPedagogicalPlannerForm"
+  name="PedagogicalPlannerGroupingForm"
+  type="org.lamsfoundation.lams.web.planner.PedagogicalPlannerGroupingForm"
 />
+<form-bean
+  name="PedagogicalPlannerSequenceNodeForm"
+  type="org.lamsfoundation.lams.web.planner.PedagogicalPlannerSequenceNodeForm"
+/>
 
 <form-bean
   name="lamsCommunityLoginForm"
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
===================================================================
diff -u -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -51,6 +51,7 @@
 		<property name="competenceDAO"><ref bean="competenceDAO"/></property>
 		<property name="competenceMappingDAO"><ref bean="competenceMappingDAO"/></property>
 		<property name="licenseDAO"><ref bean="licenseDAO"/></property>
+		<property name="pedagogicalPlannerDAO"><ref bean="pedagogicalPlannerDAO"/></property>
 		<property name="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>			
 		<property name="contentIDGenerator"><ref bean="toolContentIDGenerator"/></property>
 		<property name="messageService"><ref bean="authoringMessageService"/></property>
Fisheye: Tag 00a6e145b37916eb1561ea5c68319b0fc691681b refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/authoring/dto/PedagogicalPlannerActivityDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 00a6e145b37916eb1561ea5c68319b0fc691681b refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/authoring/dto/PedagogicalPlannerDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -rf4eb719e023dc891dc5fcf0dff63e0fe274e289e -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision f4eb719e023dc891dc5fcf0dff63e0fe274e289e)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -78,6 +78,7 @@
 import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
 import org.lamsfoundation.lams.monitoring.service.MonitoringServiceException;
+import org.lamsfoundation.lams.planner.dao.PedagogicalPlannerDAO;
 import org.lamsfoundation.lams.tool.SystemTool;
 import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolContentIDGenerator;
@@ -140,6 +141,8 @@
 
     protected SystemToolDAO systemToolDAO;
 
+    protected PedagogicalPlannerDAO pedagogicalPlannerDAO;
+
     protected ILamsCoreToolService lamsCoreToolService;
 
     protected ILearningDesignService learningDesignService;
@@ -161,6 +164,14 @@
 
     }
 
+    public PedagogicalPlannerDAO getPedagogicalPlannerDAO() {
+	return pedagogicalPlannerDAO;
+    }
+
+    public void setPedagogicalPlannerDAO(PedagogicalPlannerDAO pedagogicalPlannerDAO) {
+	this.pedagogicalPlannerDAO = pedagogicalPlannerDAO;
+    }
+
     /*******************************************************************************************************************
      * Setter Methods
      ******************************************************************************************************************/
@@ -527,8 +538,8 @@
 	}
 
 	if (design != null) { /*
-	 * only the user who is editing the design may unlock it
-	 */
+				 * only the user who is editing the design may unlock it
+				 */
 	    if (design.getEditOverrideUser().equals(user)) {
 		design.setEditOverrideLock(false);
 		design.setEditOverrideUser(null);
@@ -1109,11 +1120,11 @@
 	if (oldParentActivities != null) {
 	    Iterator iterator = oldParentActivities.iterator();
 	    while (iterator.hasNext()) {
-	    	processActivity((Activity) iterator.next(), newLearningDesign, newActivities, newGroupings, null,
-	    			originalLearningDesign.getLearningDesignId(), uiidOffset, customCSV);
+		processActivity((Activity) iterator.next(), newLearningDesign, newActivities, newGroupings, null,
+			originalLearningDesign.getLearningDesignId(), uiidOffset, customCSV);
 	    }
 	}
-	
+
 	Collection<Activity> activities = newActivities.values();
 
 	// Go back and find all the grouped activities and assign them the new
@@ -1131,68 +1142,68 @@
 	// and fix any branch mappings
 	for (Activity activity : activities) {
 	    if (activity.isComplexActivity()) {
-	    	ComplexActivity newComplex = (ComplexActivity) activity;
-	    	Activity oldDefaultActivity = newComplex.getDefaultActivity();
-			if (oldDefaultActivity != null) {
-			    Activity newDefaultActivity = newActivities.get(LearningDesign.addOffset(oldDefaultActivity
-				    .getActivityUIID(), uiidOffset));
-			    newComplex.setDefaultActivity(newDefaultActivity);
-			}
+		ComplexActivity newComplex = (ComplexActivity) activity;
+		Activity oldDefaultActivity = newComplex.getDefaultActivity();
+		if (oldDefaultActivity != null) {
+		    Activity newDefaultActivity = newActivities.get(LearningDesign.addOffset(oldDefaultActivity
+			    .getActivityUIID(), uiidOffset));
+		    newComplex.setDefaultActivity(newDefaultActivity);
+		}
 	    }
 
 	    if (activity.isSequenceActivity()) {
-			SequenceActivity newSequenceActivity = (SequenceActivity) activity;
-			// Need to check if the sets are not null as these are new
-			// objects and Hibernate may not have backed them with
-			// collections yet.
-			if (newSequenceActivity.getBranchEntries() != null && newSequenceActivity.getBranchEntries().size() > 0) {
-	
-			    Activity parentActivity = newSequenceActivity.getParentActivity();
-			    if (parentActivity.isChosenBranchingActivity() || parentActivity.isGroupBranchingActivity()
-				    && parentActivity.getDefineLater() != null
-				    && parentActivity.getDefineLater().booleanValue()) {
-					// Don't have any preset up entries for a teacher chosen
-					// or a define later group based branching.
-					// Must be copying a design that was run previously.
-					newSequenceActivity.getBranchEntries().clear();
-	
-			    } else {
-					Iterator beIter = newSequenceActivity.getBranchEntries().iterator();
-					while (beIter.hasNext()) {
-					    // sequence activity will be correct but the
-					    // branching activity and the grouping will be wrong
-					    // the condition was copied by the sequence activity
-					    // copy
-					    BranchActivityEntry entry = (BranchActivityEntry) beIter.next();
-					    BranchingActivity oldBranchingActivity = (BranchingActivity) entry.getBranchingActivity();
-					    entry.setBranchingActivity(newActivities.get(LearningDesign.addOffset(oldBranchingActivity
-						    .getActivityUIID(), uiidOffset)));
-					    Group oldGroup = entry.getGroup();
-					    if (oldGroup != null) {
-						Grouping oldGrouping = oldGroup.getGrouping();
-						Grouping newGrouping = newGroupings.get(LearningDesign.addOffset(oldGrouping
-							.getGroupingUIID(), uiidOffset));
-						if (newGrouping != null) {
-						    entry.setGroup(newGrouping.getGroup(LearningDesign.addOffset(oldGroup
-							    .getGroupUIID(), uiidOffset)));
-						}
-					    }
-					}
-	
+		SequenceActivity newSequenceActivity = (SequenceActivity) activity;
+		// Need to check if the sets are not null as these are new
+		// objects and Hibernate may not have backed them with
+		// collections yet.
+		if (newSequenceActivity.getBranchEntries() != null && newSequenceActivity.getBranchEntries().size() > 0) {
+
+		    Activity parentActivity = newSequenceActivity.getParentActivity();
+		    if (parentActivity.isChosenBranchingActivity() || parentActivity.isGroupBranchingActivity()
+			    && parentActivity.getDefineLater() != null
+			    && parentActivity.getDefineLater().booleanValue()) {
+			// Don't have any preset up entries for a teacher chosen
+			// or a define later group based branching.
+			// Must be copying a design that was run previously.
+			newSequenceActivity.getBranchEntries().clear();
+
+		    } else {
+			Iterator beIter = newSequenceActivity.getBranchEntries().iterator();
+			while (beIter.hasNext()) {
+			    // sequence activity will be correct but the
+			    // branching activity and the grouping will be wrong
+			    // the condition was copied by the sequence activity
+			    // copy
+			    BranchActivityEntry entry = (BranchActivityEntry) beIter.next();
+			    BranchingActivity oldBranchingActivity = (BranchingActivity) entry.getBranchingActivity();
+			    entry.setBranchingActivity(newActivities.get(LearningDesign.addOffset(oldBranchingActivity
+				    .getActivityUIID(), uiidOffset)));
+			    Group oldGroup = entry.getGroup();
+			    if (oldGroup != null) {
+				Grouping oldGrouping = oldGroup.getGrouping();
+				Grouping newGrouping = newGroupings.get(LearningDesign.addOffset(oldGrouping
+					.getGroupingUIID(), uiidOffset));
+				if (newGrouping != null) {
+				    entry.setGroup(newGrouping.getGroup(LearningDesign.addOffset(oldGroup
+					    .getGroupUIID(), uiidOffset)));
+				}
 			    }
 			}
+
+		    }
+		}
 	    }
 
 	    if (activity.getInputActivities() != null && activity.getInputActivities().size() > 0) {
-			Set<Activity> newInputActivities = new HashSet<Activity>();
-			Iterator inputIter = activity.getInputActivities().iterator();
-			while (inputIter.hasNext()) {
-			    Activity elem = (Activity) inputIter.next();
-			    newInputActivities.add(newActivities.get(LearningDesign.addOffset(elem.getActivityUIID(),
-				    uiidOffset)));
-			}
-			activity.getInputActivities().clear();
-			activity.getInputActivities().addAll(newInputActivities);
+		Set<Activity> newInputActivities = new HashSet<Activity>();
+		Iterator inputIter = activity.getInputActivities().iterator();
+		while (inputIter.hasNext()) {
+		    Activity elem = (Activity) inputIter.next();
+		    newInputActivities.add(newActivities.get(LearningDesign.addOffset(elem.getActivityUIID(),
+			    uiidOffset)));
+		}
+		activity.getInputActivities().clear();
+		activity.getInputActivities().addAll(newInputActivities);
 	    }
 	}
 
@@ -1253,10 +1264,11 @@
 	    newActivity.setParentActivity(parentActivity);
 	    newActivity.setParentUIID(parentActivity.getActivityUIID());
 	}
-	
-	if(!(newActivity.isFloatingActivity() && newLearningDesign.getFloatingActivity() != null))
-		newActivities.put(newActivity.getActivityUIID(), newActivity);
 
+	if (!(newActivity.isFloatingActivity() && newLearningDesign.getFloatingActivity() != null)) {
+	    newActivities.put(newActivity.getActivityUIID(), newActivity);
+	}
+
 	if (newActivity.isToolActivity()) {
 	    copyActivityToolContent(newActivity, newLearningDesign.getCopyTypeID(), originalLearningDesignId, customCSV);
 	}
@@ -1265,28 +1277,30 @@
 	if (oldChildActivities != null) {
 	    Iterator childIterator = oldChildActivities.iterator();
 	    while (childIterator.hasNext()) {
-	    	Activity childActivity = (Activity) childIterator.next();
-	    	
-	    	// If Floating Activity(s) exist in BOTH designs then we:
-	        // Transfer the floating activities from the main design to the one that is to be imported. 
-	        // Number of activities may overflow the max limit for the container - to be handled in flash 
-	        // when design is opened.
-	    	FloatingActivity fParentActivity = null;
-	    	Activity refParentActivity = null;
-	    	
-	    	if(childActivity.isFloating() && newLearningDesign.getFloatingActivity() != null)
-	    		fParentActivity = newLearningDesign.getFloatingActivity();
-	    	else 
-	    		refParentActivity = newActivity;
-	    	
-	    	if(childActivity.isFloating() && fParentActivity != null)
-				childActivity.setOrderId(fParentActivity.getActivities().size()+childActivity.getOrderId()+1);
-	    	
-			Activity pActivity = (fParentActivity != null) ? (Activity) fParentActivity : refParentActivity;
-			processActivity(childActivity, newLearningDesign, newActivities, newGroupings,
-				pActivity, originalLearningDesignId, uiidOffset, customCSV);
-			
+		Activity childActivity = (Activity) childIterator.next();
+
+		// If Floating Activity(s) exist in BOTH designs then we:
+		// Transfer the floating activities from the main design to the one that is to be imported.
+		// Number of activities may overflow the max limit for the container - to be handled in flash
+		// when design is opened.
+		FloatingActivity fParentActivity = null;
+		Activity refParentActivity = null;
+
+		if (childActivity.isFloating() && newLearningDesign.getFloatingActivity() != null) {
+		    fParentActivity = newLearningDesign.getFloatingActivity();
+		} else {
+		    refParentActivity = newActivity;
 		}
+
+		if (childActivity.isFloating() && fParentActivity != null) {
+		    childActivity.setOrderId(fParentActivity.getActivities().size() + childActivity.getOrderId() + 1);
+		}
+
+		Activity pActivity = fParentActivity != null ? (Activity) fParentActivity : refParentActivity;
+		processActivity(childActivity, newLearningDesign, newActivities, newGroupings, pActivity,
+			originalLearningDesignId, uiidOffset, customCSV);
+
+	    }
 	}
     }
 
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java	(.../IAuthoringService.java)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java	(.../IAuthoringService.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -34,6 +34,7 @@
 import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO;
 import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO;
 import org.lamsfoundation.lams.learningdesign.exception.LearningDesignException;
+import org.lamsfoundation.lams.planner.dao.PedagogicalPlannerDAO;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.usermanagement.exception.UserException;
@@ -389,4 +390,6 @@
 
     public Grouping getGroupingById(Long groupingID);
 
+    public PedagogicalPlannerDAO getPedagogicalPlannerDAO();
+
 }
Index: lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
===================================================================
diff -u -rc938db99e80a21d9099839105f58e9c7537fe0d5 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java	(.../CentralConstants.java)	(revision c938db99e80a21d9099839105f58e9c7537fe0d5)
+++ lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java	(.../CentralConstants.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -139,7 +139,7 @@
 
     public static final String ERROR_PLANNER_TITLE_BLANK = "error.planner.title.blank";
 
-    public static final String PATH_ACTIVITY_NO_PLANNER_SUPPORT = "/pedagogical_planner/defaultForm.jsp";
+    public static final String PATH_ACTIVITY_NO_PLANNER_SUPPORT = "/pedagogical_planner/defaultActivityForm.jsp";
 
     public static final String TEMPLATE_FILE_NAME = "LAMS_Pedagogical_Planner_Template.zip";
 
Fisheye: Tag 00a6e145b37916eb1561ea5c68319b0fc691681b refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/planner/GroupingPedagogicalPlannerForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
===================================================================
diff -u -rc938db99e80a21d9099839105f58e9c7537fe0d5 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision c938db99e80a21d9099839105f58e9c7537fe0d5)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -40,8 +40,6 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessages;
-import org.lamsfoundation.lams.authoring.dto.PedagogicalPlannerActivityDTO;
-import org.lamsfoundation.lams.authoring.dto.PedagogicalPlannerDTO;
 import org.lamsfoundation.lams.authoring.service.IAuthoringService;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.BranchingActivity;
@@ -58,6 +56,11 @@
 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.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.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -77,12 +80,14 @@
  * @author Marcin Cieslak
  * 
  * @struts:action path="/pedagogicalPlanner" scope="request" parameter="method"
- * @struts:action-forward name="success" path="/pedagogical_planner/base.jsp"
+ *                name="PedagogicalPlannerSequenceNodeForm"
+ * @struts:action-forward name="template" path="/pedagogical_planner/templateBase.jsp"
  * 
- * @struts:action path="/pedagogicalPlanner/grouping" scope="request" name="GroupingPedagogicalPlannerForm"
+ * @struts:action path="/pedagogicalPlanner/grouping" scope="request" name="PedagogicalPlannerGroupingForm"
  *                validate="false" parameter="method"
  * @struts:action-forward name="grouping" path="/pedagogical_planner/grouping.jsp"
  * @struts:action-forward name="preview" path="/home.do?method=learner"
+ * @struts:action-forward name="sequenceChooser" path="/pedagogical_planner/sequenceChooser.jsp"
  */
 public class PedagogicalPlannerAction extends LamsDispatchAction {
 
@@ -98,6 +103,7 @@
     private static IAuthoringService authoringService;
     private static IMonitoringService monitoringService;
     private static MessageService messageService;
+    private static PedagogicalPlannerDAO pedagogicalPlannerDAO;
 
     // Error messages used in class
     private static final String ERROR_TOOL_ERRORS = "There were tool errors.";
@@ -119,7 +125,7 @@
      */
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
-	return start(mapping, form, request, response);
+	return openSequenceNode(mapping, form, request, response);
     }
 
     /**
@@ -133,8 +139,8 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+    private ActionForward openTemplate(ActionMapping mapping, HttpServletRequest request, String filePath)
+	    throws IOException, ServletException {
 	// Get the learning design template zip file
 	String designFilePath = "pedagogical_planner" + File.separator + "1" + File.separator + "1" + File.separator
 		+ "1";
@@ -203,7 +209,7 @@
 	    }
 	}
 	// create DTO for the whole design
-	PedagogicalPlannerDTO planner = new PedagogicalPlannerDTO();
+	PedagogicalPlannerTemplateDTO planner = new PedagogicalPlannerTemplateDTO();
 	planner.setActivitySupportingPlannerCount(activitySupportingPlannerCount);
 	planner.setSequenceTitle(learningDesign.getTitle());
 	planner.setActivities(activities);
@@ -215,7 +221,7 @@
 	planner.setActivitiesInPortion(2);
 
 	request.setAttribute(CentralConstants.ATTR_PLANNER, planner);
-	return mapping.findForward("success");
+	return mapping.findForward("template");
     }
 
     private IExportToolContentService getExportService() {
@@ -297,7 +303,7 @@
 
     public ActionForward initGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-	GroupingPedagogicalPlannerForm plannerForm = (GroupingPedagogicalPlannerForm) form;
+	PedagogicalPlannerGroupingForm plannerForm = (PedagogicalPlannerGroupingForm) form;
 	Long groupingId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Grouping grouping = getAuthoringService().getGroupingById(groupingId);
 	plannerForm.fillForm(grouping);
@@ -306,7 +312,7 @@
 
     public ActionForward saveOrUpdateGroupingForm(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-	GroupingPedagogicalPlannerForm plannerForm = (GroupingPedagogicalPlannerForm) form;
+	PedagogicalPlannerGroupingForm plannerForm = (PedagogicalPlannerGroupingForm) form;
 	ActionMessages errors = plannerForm.validate();
 	if (errors.isEmpty()) {
 	    Grouping grouping = getAuthoringService().getGroupingById(plannerForm.getToolContentID());
@@ -481,7 +487,7 @@
 	    short option = 1;
 	    for (Activity nestedActivity : nestedActivities) {
 		// Currently Planner supports only 4 options, but there is no logical reason for that; just add
-		    // colours
+		// colours
 		// in CSS and change this value for additional options
 		if (option > CentralConstants.PLANNER_MAX_OPTIONS) {
 		    throw new ServletException(PedagogicalPlannerAction.ERROR_TOO_MANY_OPTIONS);
@@ -518,4 +524,77 @@
 	}
 	return addedDTO;
     }
+
+    public ActionForward openSequenceNode(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	Long nodeUid = WebUtil.readLongParam(request, "uid", true);
+	return openSequenceNode(mapping, request, nodeUid);
+    }
+
+    public ActionForward openSequenceNode(ActionMapping mapping, HttpServletRequest request, Long nodeUid)
+	    throws IOException, ServletException {
+
+	PedagogicalPlannerSequenceNode node = null;
+	if (nodeUid == null) {
+	    node = getPedagogicalPlannerDAO().getRootNode();
+	} else {
+	    node = getPedagogicalPlannerDAO().getByUid(nodeUid);
+	    if (node.getFileName() != null) {
+		String filePath = getPedagogicalPlannerDAO().getFilePath(node);
+		return openTemplate(mapping, request, filePath);
+	    }
+	}
+	List<String[]> titlePath = getPedagogicalPlannerDAO().getTitlePath(node);
+	PedagogicalPlannerSequenceNodeDTO dto = new PedagogicalPlannerSequenceNodeDTO(node, titlePath);
+
+	Boolean edit = WebUtil.readBooleanParam(request, "edit", false);
+	dto.setEdit(edit);
+
+	Boolean createSubnode = WebUtil.readBooleanParam(request, "createSubnode", false);
+	dto.setCreateSubnode(createSubnode);
+
+	request.setAttribute("node", dto);
+	return mapping.findForward("sequenceChooser");
+    }
+
+    public ActionForward saveSequenceNode(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	Long nodeUid = WebUtil.readLongParam(request, "uid", true);
+	PedagogicalPlannerSequenceNode node = null;
+	PedagogicalPlannerSequenceNodeForm nodeForm = (PedagogicalPlannerSequenceNodeForm) form;
+	if (nodeUid == null) {
+	    node = new PedagogicalPlannerSequenceNode();
+	    if (nodeForm.getParentUid() != null) {
+		PedagogicalPlannerSequenceNode parent = getPedagogicalPlannerDAO().getByUid(nodeForm.getParentUid());
+		node.setParent(parent);
+	    }
+	    node.setSubdir(getPedagogicalPlannerDAO().getNextSubdir(nodeForm.getParentUid()));
+	} else {
+	    node = getPedagogicalPlannerDAO().getByUid(nodeUid);
+	}
+
+	node.setTitle(nodeForm.getTitle());
+	node.setBriefDescription(nodeForm.getBriefDescription());
+	node.setFullDescription(nodeForm.getFullDescription());
+	getPedagogicalPlannerDAO().saveOrUpdateNode(node);
+
+	nodeUid = node.getUid();
+	return openSequenceNode(mapping, request, nodeUid);
+    }
+
+    public ActionForward removeSequenceNode(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	Long nodeUid = WebUtil.readLongParam(request, "uid");
+	PedagogicalPlannerSequenceNode node = getPedagogicalPlannerDAO().getByUid(nodeUid);
+	Long parentUid = node.getParent() == null ? null : node.getParent().getUid();
+	getPedagogicalPlannerDAO().removeNode(node);
+	return openSequenceNode(mapping, request, parentUid);
+    }
+
+    public PedagogicalPlannerDAO getPedagogicalPlannerDAO() {
+	if (PedagogicalPlannerAction.pedagogicalPlannerDAO == null) {
+	    PedagogicalPlannerAction.pedagogicalPlannerDAO = getAuthoringService().getPedagogicalPlannerDAO();
+	}
+	return PedagogicalPlannerAction.pedagogicalPlannerDAO;
+    }
 }
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,102 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.web.planner;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessages;
+
+/**
+ * The base for any Pedagogical Planner Action Forms that other activities. All Java forms need to inherit from this
+ * class and forms on JSP pages need to have these properties declared as hidden elements.
+ * 
+ * @author Marcin Cieslak
+ * 
+ */
+public abstract class PedagogicalPlannerActivityForm extends ActionForm {
+    /**
+     * Set when opening a Learning Design.
+     */
+    private Integer activityOrderNumber;
+    private Long toolContentID;
+    /**
+     * Set in {@link #validate()} method.
+     */
+    private Boolean valid = true;
+    /**
+     * Set when submitting form in base.jsp page.
+     */
+    private Integer callID;
+
+    public Long getToolContentID() {
+	return toolContentID;
+    }
+
+    public void setToolContentID(Long toolContentID) {
+	this.toolContentID = toolContentID;
+    }
+
+    public Boolean getValid() {
+	return valid;
+    }
+
+    public void setValid(Boolean valid) {
+	this.valid = valid;
+    }
+
+    public Integer getCallID() {
+	return callID;
+    }
+
+    public void setCallID(Integer callID) {
+	this.callID = callID;
+    }
+
+    @Override
+    public void reset(ActionMapping mapping, HttpServletRequest request) {
+	super.reset(mapping, request);
+	setValid(true);
+    }
+
+    /**
+     * Validates form. Must set {@link #valid} property. Can be overriden by inheriting classes, although call to this
+     * method is only in activities themselves (and not on a higher level like lams_central).
+     * 
+     * @return
+     */
+    public ActionMessages validate() {
+	setValid(true);
+	return new ActionMessages();
+    }
+
+    public Integer getActivityOrderNumber() {
+	return activityOrderNumber;
+    }
+
+    public void setActivityOrderNumber(Integer activityOrderNumber) {
+	this.activityOrderNumber = activityOrderNumber;
+    }
+}
\ No newline at end of file
Fisheye: Tag 00a6e145b37916eb1561ea5c68319b0fc691681b refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,139 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/* $Id$ */
+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;
+
+/**
+ * Form for grouping activities in Pedagogical Planner.
+ * 
+ * @author Marcin Cieslak
+ * 
+ */
+public class PedagogicalPlannerGroupingForm extends PedagogicalPlannerActivityForm {
+    private Integer groupingTypeId;
+    private String numberOfGroups;
+    private String learnersPerGroup;
+    private Boolean equalGroupSizes;
+
+    public Integer getGroupingTypeId() {
+	return groupingTypeId;
+    }
+
+    public void setGroupingTypeId(Integer groupingTypeId) {
+	this.groupingTypeId = groupingTypeId;
+    }
+
+    public String getNumberOfGroups() {
+	return numberOfGroups;
+    }
+
+    public void setNumberOfGroups(String numberOfGroups) {
+	this.numberOfGroups = numberOfGroups;
+    }
+
+    /**
+     * Fills the form properties with existing grouping object.
+     * 
+     * @param grouping
+     *                persistent object to use
+     */
+    public void fillForm(Grouping grouping) {
+	if (grouping != null) {
+	    setGroupingTypeId(grouping.getGroupingTypeId());
+	    if (grouping.isRandomGrouping()) {
+		RandomGrouping randomGrouping = (RandomGrouping) grouping;
+		String number = randomGrouping.getNumberOfGroups() == null ? null : String.valueOf(randomGrouping
+			.getNumberOfGroups());
+		setNumberOfGroups(number);
+
+		number = randomGrouping.getLearnersPerGroup() == null ? null : String.valueOf(randomGrouping
+			.getLearnersPerGroup());
+		setLearnersPerGroup(number);
+	    } else if (grouping.isLearnerChoiceGrouping()) {
+		LearnerChoiceGrouping learnerChoiceGrouping = (LearnerChoiceGrouping) grouping;
+		String number = learnerChoiceGrouping.getNumberOfGroups() == null ? null : String
+			.valueOf(learnerChoiceGrouping.getNumberOfGroups());
+		setNumberOfGroups(number);
+
+		number = learnerChoiceGrouping.getLearnersPerGroup() == null ? null : String
+			.valueOf(learnerChoiceGrouping.getLearnersPerGroup());
+		setLearnersPerGroup(number);
+
+		setEqualGroupSizes(learnerChoiceGrouping.getEqualNumberOfLearnersPerGroup());
+	    } else {
+		String numberOfGroups = grouping.getMaxNumberOfGroups() == null ? null : String.valueOf(grouping
+			.getMaxNumberOfGroups());
+		setNumberOfGroups(numberOfGroups);
+	    }
+	}
+    }
+
+    /**
+     * Checks if the provided group/learner number is a nonnegative integer.
+     */
+    @Override
+    public ActionMessages validate() {
+	ActionMessages errors = new ActionMessages();
+	boolean valid = true;
+	boolean numberValid = true;
+
+	String numberToParse = StringUtils.isEmpty(getNumberOfGroups()) ? getLearnersPerGroup() : getNumberOfGroups();
+	try {
+	    int number = Integer.parseInt(numberToParse);
+	    if (number < 0) {
+		numberValid = false;
+	    }
+	} catch (Exception e) {
+	    numberValid = false;
+	}
+	if (!numberValid) {
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.planner.grouping.number.integer"));
+	    valid = false;
+	}
+	setValid(valid);
+	return errors;
+    }
+
+    public String getLearnersPerGroup() {
+	return learnersPerGroup;
+    }
+
+    public void setLearnersPerGroup(String numberOfLearners) {
+	learnersPerGroup = numberOfLearners;
+    }
+
+    public Boolean getEqualGroupSizes() {
+	return equalGroupSizes;
+    }
+
+    public void setEqualGroupSizes(Boolean equalGroupsSizes) {
+	equalGroupSizes = equalGroupsSizes;
+    }
+}
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,74 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.web.planner;
+
+import org.apache.struts.action.ActionForm;
+
+public class PedagogicalPlannerSequenceNodeForm extends ActionForm {
+    private Long uid;
+    private Long parentUid;
+    private String title;
+    private String briefDescription;
+    private String fullDescription;
+
+    public Long getUid() {
+	return uid;
+    }
+
+    public void setUid(Long uid) {
+	this.uid = uid;
+    }
+
+    public String getTitle() {
+	return title;
+    }
+
+    public void setTitle(String title) {
+	this.title = title;
+    }
+
+    public String getBriefDescription() {
+	return briefDescription;
+    }
+
+    public void setBriefDescription(String briefDescription) {
+	this.briefDescription = briefDescription;
+    }
+
+    public String getFullDescription() {
+	return fullDescription;
+    }
+
+    public void setFullDescription(String fullDescription) {
+	this.fullDescription = fullDescription;
+    }
+
+    public Long getParentUid() {
+	return parentUid;
+    }
+
+    public void setParentUid(Long parentUid) {
+	this.parentUid = parentUid;
+    }
+}
\ No newline at end of file
Index: lams_central/web/includes/javascript/pedagogicalPlanner.js
===================================================================
diff -u -ra301da49ef54944c21a4c78c60a2637959be30b5 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision a301da49ef54944c21a4c78c60a2637959be30b5)
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -155,7 +155,26 @@
   }
   
   function closePlanner(text){
- 	 if (confirm(text)){
-  		window.close();
+	 if (text==null || confirm(text)){
+	 	window.close();
   	 }
+  }
+  
+  function leaveNodeEditor(text,url){
+	 	if (!isNodeChanged() || text==null || confirm(text)){
+  			document.location.href=url;
+  		}
+  	 }
+  	 
+  function removeNode(text,url){
+  		if (text==null || confirm(text)){
+  			document.location.href=url;
+  		}
+  }
+  
+  function isNodeChanged(){
+  	return false;
+  	//title!=$("#title").val() 
+  	//|| briefDescription!=$("#briefDescription").val() 
+  	//|| fullDescription!=$("#fullDescription").val();
   }
\ No newline at end of file
Fisheye: Tag 00a6e145b37916eb1561ea5c68319b0fc691681b refers to a dead (removed) revision in file `lams_central/web/pedagogical_planner/base.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/pedagogical_planner/defaultActivityForm.jsp
===================================================================
diff -u
--- lams_central/web/pedagogical_planner/defaultActivityForm.jsp	(revision 0)
+++ lams_central/web/pedagogical_planner/defaultActivityForm.jsp	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%-- Page that is displayed if activity does not support the pedagogical planner. --%>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<lams:html>
+<lams:head>
+	<lams:css style="core" />
+</lams:head>
+<body>	
+	<div style="width: 100%; margin-top: 55px; text-align: center; vertical-align: middle; font-weight: bold;">
+		<h3>
+			<c:choose>
+				<c:when test="${empty param.formMessage}">
+					<fmt:message key="label.planner.not.supported" />
+				</c:when>
+				<c:otherwise>
+					${param.formMessage}
+				</c:otherwise>
+			</c:choose>
+		</h3>
+	</div>
+</body>
+</lams:html>
\ No newline at end of file
Fisheye: Tag 00a6e145b37916eb1561ea5c68319b0fc691681b refers to a dead (removed) revision in file `lams_central/web/pedagogical_planner/defaultForm.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/pedagogical_planner/sequenceChooser.jsp
===================================================================
diff -u
--- lams_central/web/pedagogical_planner/sequenceChooser.jsp	(revision 0)
+++ lams_central/web/pedagogical_planner/sequenceChooser.jsp	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,215 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<lams:html>
+<lams:head>
+	  <title><fmt:message key="title.lams"/> :: <fmt:message key="planner.title" /></title>
+	  
+	  <c:if test="${node.edit}">
+	  	<script language="JavaScript" type="text/javascript">
+	  		var title = "<c:out value='${node.title}' escapeXml='true' />";
+	  		var briefDescription = "<c:out value='${node.briefDescription}' escapeXml='true' />";
+	  		var fullDescription = "<c:out value='${node.fullDescription}' escapeXml='true' />";
+	  	</script>
+	  </c:if>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/pedagogicalPlanner.js"></script>
+	  
+	  <lams:css style="main" />
+	  <link href="<lams:LAMSURL />css/pedagogicalPlanner.css" rel="stylesheet" type="text/css">
+</lams:head>
+<body class="stripes">
+<div id="page">
+<div id="content">
+	<h1 style="text-align: center" class="small-space-top"><fmt:message key="planner.title" /></h1>
+	<table>
+		<tr>
+			<td colspan="2">
+				<%-- This part creates path like "> Root > Some node > Some subnode" 
+					 with links to upper level nodes --%>
+				<c:url value="/pedagogicalPlanner.do" var="titleUrl">
+					<c:param name="method" value="openSequenceNode" />
+					<c:param name="edit" value="${node.edit}" />
+				</c:url>
+				<%-- Always add root node --%>
+				<a href="${titleUrl}"><fmt:message key="label.planner.root.node" /></a> &gt;
+				<%-- Iterate through subnodes, if any --%>
+				<c:forEach var="title" items="${node.titlePath}">
+					<c:url value="/pedagogicalPlanner.do" var="titleUrl">
+						<c:param name="method" value="openSequenceNode" />
+						<c:param name="uid" value="${title[0]}" />
+						<c:param name="edit" value="${node.edit}" />
+					</c:url>
+					<a href="${titleUrl}"><c:out value='${title[1]}' escapeXml='true' /></a> &gt;
+				</c:forEach>
+				<c:out value='${node.title}' escapeXml='true' />
+			
+				<%-- Title and full description of the node --%>
+				<c:set var="isRootNode" value="${empty node.uid and empty node.parentUid}" />
+				<c:choose>
+					<c:when test="${isRootNode}">
+						<div style="margin: 20px 0px 0px 10px"><fmt:message key="label.planner.root.choose" /></div>
+					</c:when>
+					<c:otherwise>
+						<h3 style="margin-top: 20px"><c:out value='${node.title}' escapeXml='true' /></h3>
+						<div style="margin-left: 10px"><c:out value='${node.fullDescription}' escapeXml='true' /></div>
+					</c:otherwise>
+				</c:choose>
+
+				
+			</td>
+		</tr>
+		<c:choose>
+			<c:when test="${empty node.subnodes}">
+				<tr>
+					<td colspan="2" style="text-align: center">
+						<h3><fmt:message key="label.planner.empty.subnode" /></h3>
+					</td>
+				</tr>
+			</c:when>
+			<c:otherwise>
+			<%-- Iterate through subnodes --%>
+				<c:forEach var="subnode" items="${node.subnodes}">
+					<tr>
+						<td style="width: 15px">
+							<%-- Cell with icons (info or actions like remove node)  --%>
+							<c:choose>
+							<c:when test="${node.edit}">
+								<c:url value="/pedagogicalPlanner.do" var="removeNodeUrl">
+									<c:param name="method" value="removeSequenceNode" />
+									<c:param name="edit" value="true" />
+									<c:param name="uid" value="${subnode.uid}" />
+								</c:url>
+								<img style="height: 15px; width: 15px; cursor: pointer;" src="<lams:LAMSURL/>images/cross.gif"
+									title="<fmt:message key="msg.planner.remove.node" />"
+									onclick="javascript:removeNode('<fmt:message key="msg.planner.remove.warning" />','${removeNodeUrl}')" />
+							</c:when>
+							<c:otherwise>
+								<c:if test="${not empty node.fileName}">
+									<img src="<lams:LAMSURL/>images/circle_filled.gif" alt="<fmt:message key="msg.planner.open.template" />" />
+								</c:if>
+							</c:otherwise>
+							</c:choose>
+						</td>
+						<td>
+							<%-- Link to node and its brief description  --%>
+							<c:url value="/pedagogicalPlanner.do" var="subnodeUrl">
+								<c:param name="method" value="openSequenceNode" />		
+								<c:param name="edit" value="${node.edit}" />
+								<c:param name="uid" value="${subnode.uid}" />
+							</c:url>
+							<a href="${subnodeUrl}"><c:out escapeXml='true' value='${subnode.title}' />
+								<c:if test="${node.edit and subnode.locked}">
+									(locked)
+								</c:if>
+							</a> 
+							- ${subnode.briefDescription}
+						</td>
+					</tr>
+				</c:forEach>
+			</c:otherwise>
+		</c:choose>
+	</table>
+	<c:choose>
+		<c:when test="${node.edit}">
+			<%-- Form for editing the node --%>
+			<hr style="margin: auto" />
+			
+			<%-- Do we edit the current node or create a subnode? --%>
+			<c:choose>
+				<c:when test="${not node.createSubnode and (isRootNode or node.locked)}">
+					<h3 style="text-align: center"><fmt:message key="msg.planner.node.locked"></fmt:message></h3>
+				</c:when>
+				<c:otherwise>
+					<h2 style="text-align: center">
+					<c:choose>
+						<c:when test="${node.createSubnode}">
+							<fmt:message key="label.planner.create.subnode" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.planner.edit.node" />
+						</c:otherwise>
+					</c:choose>
+					</h2>
+					<html:form styleId="nodeForm" style="margin-left: 20px" action="/pedagogicalPlanner" method="post" enctype="multipart/form-data">
+						<input type="hidden" id="method" name="method" value="saveSequenceNode" />
+						<input type="hidden" id="edit" name="edit" value="true" />
+						
+						<c:choose>
+							<c:when test="${node.createSubnode}">
+								<input type="hidden" id="parentUid" name="parentUid" value="${node.uid}" />
+							</c:when>
+							<c:otherwise>
+								<input type="hidden" id="uid" name="uid" value="${node.uid}" />
+							</c:otherwise>
+						</c:choose>
+						
+						<div class="field-name space-top"><fmt:message key="label.title" /></div>
+						<input type="text" id="title" name="title" size="80"
+							<c:if test="${not node.createSubnode}">
+								value="<c:out escapeXml='true' value='${node.title}' />"
+							</c:if>
+						 />
+						 
+						<c:set var="entry">
+							<c:if test="${not node.createSubnode}">
+								<c:out escapeXml='true' value='${node.briefDescription}' />
+							</c:if>
+						</c:set>
+						<div class="field-name space-top"><fmt:message key="label.planner.description.brief" /></div>
+						<textarea id="briefDescription" name="briefDescription" rows="3" cols="60">${fn:trim(entry)}</textarea>
+						
+						<c:set var="entry">
+							<c:if test="${not node.createSubnode}">
+								<c:out escapeXml='true' value='${node.fullDescription}' />
+							</c:if>
+						</c:set>
+						<div class="field-name space-top"><fmt:message key="label.planner.description.full" /></div>
+						<textarea id="fullDescription" name="fullDescription" rows="3" cols="60">${fn:trim(entry)}</textarea>
+					</html:form>
+				</c:otherwise>
+			</c:choose>
+			<div id="buttonArea" style="margin-top: 10px">
+				<c:url value="/pedagogicalPlanner.do" var="closeNodeEditorUrl">
+					<c:param name="method" value="openSequenceNode" />
+					<c:param name="edit" value="false" />
+					<c:param name="uid" value="${node.uid}" />
+				</c:url>
+				<a class="button pedagogicalPlannerButtons" href="javascript:leaveNodeEditor('<fmt:message key="msg.planner.not.saved" />','${closeNodeEditorUrl}');"><fmt:message key="button.close" /></a>
+				<c:if test="${not node.createSubnode}">
+					<c:url value="/pedagogicalPlanner.do" var="createSubnodeUrl">
+						<c:param name="method" value="openSequenceNode" />
+						<c:param name="edit" value="true" />
+						<c:param name="createSubnode" value="true" />
+						<c:param name="uid" value="${node.uid}" />
+					</c:url>
+					<a class="button pedagogicalPlannerButtons" href="javascript:leaveNodeEditor('<fmt:message key="msg.planner.not.saved" />','${createSubnodeUrl}');"><fmt:message key="label.planner.create.subnode" /></a>
+				</c:if>
+				<c:if test="${node.createSubnode or not isRootNode }">
+					<a class="button pedagogicalPlannerButtons" href="javascript:$('#nodeForm').submit()"><fmt:message key="button.planner.save.node" /></a>
+				</c:if>
+			</div>
+		</c:when>
+		<c:otherwise>
+			<c:url value="/pedagogicalPlanner.do" var="openEditorUrl">
+				<c:param name="method" value="openSequenceNode" />
+				<c:param name="edit" value="true" />
+				<c:param name="uid" value="${node.uid}" />
+			</c:url>
+			<div id="buttonArea">
+				<a class="button pedagogicalPlannerButtons" href="javascript:closePlanner();"><fmt:message key="button.close" /></a>
+				<a class="button pedagogicalPlannerButtons" href="${openEditorUrl}"><fmt:message key="button.planner.editor.open" /></a>
+			</div>
+		</c:otherwise>
+	</c:choose>
+</div>
+<div id="footer"></div>
+</div>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/pedagogical_planner/templateBase.jsp
===================================================================
diff -u
--- lams_central/web/pedagogical_planner/templateBase.jsp	(revision 0)
+++ lams_central/web/pedagogical_planner/templateBase.jsp	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,253 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<lams:html>
+<lams:head>
+	  <title><fmt:message key="title.lams"/> :: <fmt:message key="planner.title" /></title>
+	
+	  <script type="text/javascript">
+	   // Set some JavaScript constants so included scripts can use them
+	   var activityCount = ${fn:length(planner.activities)}; //How many activities are there in the sequence
+	   var activitySupportingPlannerCount = ${planner.activitySupportingPlannerCount}; //How many of activities support the planner (their data will be submitted)
+	   var sendInPortions = ${planner.sendInPortions}; //Should the forms be send all at once or rather in parts
+	   var activitiesInPortion =  ${planner.activitiesInPortion}; //After how many submitted forms the script should pause
+	   var submitDelay =  ${planner.submitDelay}; //How many miliseconds should the script wait before sending another portion of forms
+	   var saveDetailsUrl = "<c:url value='/pedagogicalPlanner.do'/>";
+	   var errorPlannerNotSaved = '<fmt:message key="planner.not.saved" />';
+	  </script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/getSysInfo.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>loadVars.jsp"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/openUrls.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.dimensions.pack.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.cluetip.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/pedagogicalPlanner.js"></script>
+	  <script language="JavaScript" type="text/javascript">
+	  /* Add tooltips for Editing advice. First we make a call to tool's Action and check if there is any Editing advice.
+	  	 If yes, we show the previously hidden link and add clueTip functionality to it. */
+	  	$(document).ready(function() {
+	  		var activityCount = ${fn:length(planner.activities)};
+	  		for (var activityIndex = 1;activityIndex<=activityCount;activityIndex++){
+	  			var editingAdviceLink = $('#editingAdvice'+activityIndex);
+	  			if (editingAdviceLink.length > 0){
+	  				var checkEditingAdviceUrl = $(editingAdviceLink).attr("rel");
+	  				//Ajax call to get the answer: do we show the Editing advice link or no
+	  				$.get(
+	  					checkEditingAdviceUrl,
+	  					function(responseText){
+	  						//After response we parse the message: <answer>&<activity index>
+	  						var responseParts = responseText.split("&");
+    						var activityInnerIndex = responseParts[1];
+    						var editingAdviceExists = responseParts[0]=="OK";
+	  						if (editingAdviceExists){
+	  							$('#editingAdvice'+activityInnerIndex).show().cluetip({
+	  								width: 480,
+									cluetipClass: 'jtip',
+									arrows: true,
+									dropShadow: false,
+						 			sticky: true,
+									waitImage: true,
+									closeText: '<fmt:message key="label.authoring.close" />',
+									closePosition: 'title',
+									attribute: 'href',
+									activation: 'click',
+									fx: {             
+                      					open: 'slideDown'
+    								}
+								});
+	  						}
+	  					},
+	  					"html"
+	  				);
+	  			}
+	  		}
+
+		});
+	  </script>
+	  
+	  <lams:css style="main" />
+	  <link href="<lams:LAMSURL />css/pedagogicalPlanner.css" rel="stylesheet" type="text/css">
+	  <link href="<lams:LAMSURL />css/jquery.cluetip.css" rel="stylesheet" type="text/css" />
+</lams:head>
+<body class="stripes">
+<div id="page">
+<div id="content">
+	<h1 style="text-align: center" class="small-space-top"><fmt:message key="planner.title" /></h1>
+	
+	<div class="shading-bg" style="width: 97%">
+		<!-- A small form for learning design title only (in Java code it's "design details") -->
+		<form id="sequenceDetailsForm">
+			<table cellspacing="0" cellpadding="0" class="pedagogicalPlannerTable">
+				<tr>
+					<td class="titleCell">
+						<span class="field-name"><fmt:message key="label.title" />:</span>
+					</td>
+					<td>
+						<input type="text" name="sequenceTitle" size="80" value="<c:out value='${planner.sequenceTitle}'/>" />
+					</td>
+				</tr>
+			</table>
+			<input type="hidden" id="callAttemptedID" name="callAttemptedID" />
+			<input type="hidden" name="ldId" value="${planner.learningDesignID}" />
+			<input type="hidden" name="method" value="saveSequenceDetails" />
+		</form>
+	</div>
+	
+	<!-- IFrames with activities. -->
+	<table cellspacing="0" cellpadding="0" class="pedagogicalPlannerTable">
+		<c:set var="lastParentActivityTitle" />
+		<c:set var="lastGroup" />
+		
+		<%-- Main loop for activities --%>
+		<c:forEach var="activity" varStatus="activityStatus" items="${planner.activities}">
+			<%-- Is it a simple, branching or options activity--%>
+			<c:choose>
+				<c:when test="${activity.complexActivityType eq 1}">
+					<c:set var="complexActivityType" value="branch" />
+				</c:when>
+				<c:when test="${activity.complexActivityType eq 2}">
+					<c:set var="complexActivityType" value="option" />
+				</c:when>
+			</c:choose>
+			
+			<%-- Small row with a down arrow --%>
+			<c:if test="${not activityStatus.first}">
+				<%-- If it's a break between two branches/options then don't draw neither an arrow nor colour --%>
+				<c:set var="drawArrow" value="${empty activity.group or previousActivity.group eq activity.group}" />
+				<tr>
+					<td class="titleCell
+					<c:if test="${not (empty previousActivity.group or previousActivity.lastNestedActivity)}">
+						${complexActivityType}
+						<c:if test="${drawArrow}">
+							group${activity.group}
+						</c:if>
+					</c:if>
+					"
+					<c:if test="${previousActivity.lastNestedActivity}">
+						style="padding-top: 10px;"
+					</c:if>
+					>
+						<c:if test="${drawArrow}">
+							<img src="<lams:LAMSURL/>images/pedag_down_arrow.gif" />
+						</c:if>
+					</td>
+					<td>
+					</td>
+				</tr>
+			</c:if>
+			
+			<%-- If it's a beginning of a complex activity, write the title. --%>
+			<c:if test="${not empty activity.complexActivityType and not (activity.parentActivityTitle eq lastParentActivityTitle)}">
+				<c:set var="lastParentActivityTitle" value="${activity.parentActivityTitle}" />
+				<tr>
+					<td colspan="2" class="${complexActivityType}FirstActivity">
+						<h2>${lastParentActivityTitle}</h2>
+					</td>
+				</tr>
+			</c:if>
+			<%-- Row with activity frame --%>
+			<tr>
+				<td class="titleCell
+				<c:if test="${not empty activity.group}">
+				${complexActivityType}	group${activity.group}
+				</c:if>
+				<c:if test="${activity.lastNestedActivity}">
+					${complexActivityType}LastActivity
+				</c:if>
+				">
+					<%-- Write out number of the branch/option if any --%>
+					<c:if test="${not empty activity.group and not (activity.group eq lastGroup)}">
+						<c:set var="lastGroup" value="${activity.group}" />
+						<h3 class="group${lastGroup}">
+							<c:choose>
+								<c:when test="${activity.complexActivityType eq 1}">
+									<fmt:message key="label.planner.branch" />${lastGroup}
+									<c:if test="${activity.defaultBranch}">
+										<br /><fmt:message key="label.planner.branch.default" />
+									</c:if>
+								</c:when>
+								<c:when test="${activity.complexActivityType eq 2}">
+									<fmt:message key="label.planner.option" />${lastGroup}
+								</c:when>
+							</c:choose>
+						</h3>
+					</c:if>
+					<%-- Activity type, icon and title --%>
+					<c:if test="${not empty activity.type}">
+						<span>${activity.type}<br /></span>
+					</c:if>
+					<c:choose>
+						<c:when test="${empty activity.toolIconUrl}">
+						</c:when>
+						<c:when test="${fn:endsWith(activity.toolIconUrl,'.swf')}">
+							<object width="35" height="35">
+								<param name="movie" value="<lams:LAMSURL/>${activity.toolIconUrl}" ></param>
+								<embed bgcolor="#ffffff" type="application/x-shockwave-flash" src="<lams:LAMSURL/>${activity.toolIconUrl}" width="35" height="35">
+								</embed>
+							</object>
+						</c:when>
+						<c:otherwise>
+							<img src="<lams:LAMSURL/>${activity.toolIconUrl}" />
+						</c:otherwise>
+					</c:choose>
+					<c:if test="${not empty activity.title}">
+						<h4>${activity.title}</h4>
+					</c:if>
+				</td>
+				<%-- Cell with activity form --%>
+				<td class="formCell
+				<c:if test="${activity.lastNestedActivity}">
+					${complexActivityType}LastActivity
+				</c:if>
+				">
+					<%-- To get the contents, an Ajax call is made to the tool --%>
+					<iframe frameborder="0" marginheight="0" marginwidth="0" name="activity${activityStatus.index+1}" id="activity${activityStatus.index+1}" class="toolFrame"
+						src="<lams:LAMSURL/>${activity.pedagogicalPlannerUrl}">
+					</iframe>
+					<%-- Editing advice link with URLs: one to check if it should be displayed (rel),
+						 another one to get the contents (href) --%>
+					<c:if test="${not empty activity.checkEditingAdviceUrl}">
+						<a href="<lams:LAMSURL/>${activity.editingAdviceUrl}" title=""
+							rel="<lams:LAMSURL/>${activity.checkEditingAdviceUrl}" 
+							class="editingAdvice"
+							id="editingAdvice${activityStatus.index+1}"><fmt:message key="label.planner.editing.advice" /></a>
+					</c:if>
+				</td>
+			</tr>
+			<c:set var="previousActivity" value="${activity}" />
+		</c:forEach>
+	</table>
+	
+	<%-- DIVs for messages from server, hidden by default --%>
+	<div id="pedagogicalPlannerErrorArea" style="display:none;" class="warning" >
+	</div>
+	
+	<div  id="pedagogicalPlannerInfoArea" style="display:none;" class="info" >
+		<fmt:message key="planner.saved" />
+	</div>
+	
+	<div id="pedagogicalPlannerBusy" style="display:none;">
+		<img src="<lams:LAMSURL />images/loadingAnimation.gif"  />
+	</div>
+	
+	<c:url var="startPreviewUrl" value="/pedagogicalPlanner.do">
+		<c:param name="method" value="startPreview" />
+		<c:param name="ldId" value="${planner.learningDesignID}" />
+	</c:url>
+	<div id="buttonArea">
+		<a class="button pedagogicalPlannerButtons" href="javascript:closePlanner('<fmt:message key="msg.planner.not.saved" />');"><fmt:message key="button.close" /></a>
+		<a class="button pedagogicalPlannerButtons" href="javascript:submitAll(ACTION_OPEN_AUTHOR,${planner.learningDesignID})"><fmt:message key="button.planner.view.full.author" /></a>
+		<a class="button pedagogicalPlannerButtons" href="javascript:submitAll(ACTION_PREVIEW,'${startPreviewUrl}')"><fmt:message key="button.planner.preview" /></a>
+		<a class="button pedagogicalPlannerButtons" href="javascript:submitAll(ACTION_DO_NOTHING,null)"><fmt:message key="button.planner.save" /></a>
+	</div>
+</div>
+<div id="footer"></div>
+</div>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_common/build.xml
===================================================================
diff -u -r28d293ccf980c6d523173bfe4f9d58e2b99a1865 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_common/build.xml	(.../build.xml)	(revision 28d293ccf980c6d523173bfe4f9d58e2b99a1865)
+++ lams_common/build.xml	(.../build.xml)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -400,9 +400,9 @@
 	</target>
 	
 	<!-- =================================================================== -->
-	<!-- Generate Event Notification hibernate xml files                             	 -->
+	<!-- Generate Event Notification and Pedagogical Planner hibernate xml files                             	 -->
 	<!-- =================================================================== -->
-	<target name="generate-event-notification-hbm-files" description="Generate the hibernate hbm.xml files from the Java source (using XDoclet)">
+	<target name="generate-additional-hbm-files" description="Generate the hibernate hbm.xml files from the Java source (using XDoclet)">
 
 		<taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="all-libs" />
 
@@ -412,6 +412,8 @@
 			<fileset dir="${src.java.dir}">
 				<include name="**/Event.java" />
 				<include name="**/Subscription.java" />
+				
+				<include name="**/PedagogicalPlannerSequenceNode.java" />
 			</fileset>
 			<hibernate version="3.0" />
 		</hibernatedoclet>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode"
+        table="lams_planner_nodes"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-PedagogicalPlannerSequenceNode.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <many-to-one
+            name="parent"
+            class="org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode"
+            cascade="save-update"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            foreign-key="FK_lams_planner_node_parent"
+            column="parent_uid"
+        />
+
+        <property
+            name="subdir"
+            type="java.lang.Integer"
+            update="true"
+            insert="true"
+            column="subdir"
+        />
+
+        <property
+            name="title"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="title"
+        />
+
+        <property
+            name="briefDescription"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="brief_desc"
+        />
+
+        <property
+            name="fullDescription"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="full_desc"
+        />
+
+        <property
+            name="fileName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="file_name"
+        />
+
+        <set
+            name="subnodes"
+            lazy="false"
+            cascade="all"
+            sort="unsorted"
+            order-by="subdir asc"
+        >
+
+            <key
+                column="parent_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode"
+            />
+
+        </set>
+
+        <property
+            name="locked"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="locked"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-PedagogicalPlannerSequenceNode.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -rc2d2a9b8036e4bb9f3ff18ce70610c59fc6602d3 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision c2d2a9b8036e4bb9f3ff18ce70610c59fc6602d3)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -1074,5 +1074,17 @@
      , PRIMARY KEY (uid)
 )TYPE=InnoDB;
 
-
- 
\ No newline at end of file
+CREATE TABLE lams_planner_nodes (
+	uid BIGINT(20) NOT NULL auto_increment,
+	parent_uid BIGINT(20),
+	subdir TINYINT UNSIGNED NOT NULL,
+	locked TINYINT(1) NOT NULL DEFAULT 0,
+	title VARCHAR(255) NOT NULL,
+	brief_desc TEXT,
+	full_desc TEXT,
+	file_name VARCHAR(255),
+	PRIMARY KEY (uid),
+	UNIQUE KEY (parent_uid, subdir),
+	CONSTRAINT FK_lams_planner_node_parent FOREIGN KEY (parent_uid)
+	               REFERENCES lams_planner_nodes(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB; 
\ No newline at end of file
Index: lams_common/db/sql/drop_lams_11_tables.sql
===================================================================
diff -u -r6e4ed3724bd76354c2ee43c88979385c4a162a0e -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_common/db/sql/drop_lams_11_tables.sql	(.../drop_lams_11_tables.sql)	(revision 6e4ed3724bd76354c2ee43c88979385c4a162a0e)
+++ lams_common/db/sql/drop_lams_11_tables.sql	(.../drop_lams_11_tables.sql)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -37,6 +37,7 @@
 DROP TABLE IF EXISTS lams_log_event_type;
 DROP TABLE IF EXISTS lams_organisation;
 DROP TABLE IF EXISTS lams_organisation_type;
+DROP TABLE IF EXISTS lams_planner_nodes;
 DROP TABLE IF EXISTS lams_progress_attempted;
 DROP TABLE IF EXISTS lams_progress_completed;
 DROP TABLE IF EXISTS lams_role;
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -re5b1ceeabd291a569c4ca65bcfd78e497d38f1b4 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision e5b1ceeabd291a569c4ca65bcfd78e497d38f1b4)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -14,7 +14,7 @@
 values ('DumpDir','C:/lams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('EARDir','C:/jboss-4.0.2/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
+values ('EARDir','D:/jboss-4.0.2/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0);
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r28d293ccf980c6d523173bfe4f9d58e2b99a1865 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 28d293ccf980c6d523173bfe4f9d58e2b99a1865)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -65,7 +65,7 @@
 				<!-- Core Notebook Service related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml</value>
 				
-				<!-- Event notification related mapping files-->
+				<!-- Event notification service related mapping files-->
 				<value>classpath:org/lamsfoundation/lams/events/Event.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/events/Subscription.hbm.xml</value>
 				
@@ -78,6 +78,9 @@
 				<value>classpath:org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml</value>
 				
+				<!-- Pedagogical Planner related mapping files-->
+				<value>classpath:org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml</value>
+				
 				<!-- Mapping files for tools with complex conditions -->
 
 				<value>classpath*:org/lamsfoundation/lams/tool/**/*.hbm.xml</value>
@@ -373,6 +376,11 @@
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 	
+	<!--  Pedagogical Planner related beans -->
+	<bean id="pedagogicalPlannerDAO" class="org.lamsfoundation.lams.planner.dao.hibernate.PedagogicalPlannerDAOHibernate">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
 	<!--  System Session bean -->
 	<bean id="SystemSession"
 	    class="org.lamsfoundation.lams.web.session.SessionManager"
Index: lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,133 @@
+package org.lamsfoundation.lams.planner;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * @hibernate.class table="lams_planner_nodes"
+ * @author Marcin Cieslak
+ * 
+ */
+public class PedagogicalPlannerSequenceNode {
+
+    // --------- persistent fields -------------
+    private Long uid;
+    private PedagogicalPlannerSequenceNode parent;
+    private Set<PedagogicalPlannerSequenceNode> subnodes = new LinkedHashSet<PedagogicalPlannerSequenceNode>();
+    private Integer subdir;
+    private String title;
+    private String briefDescription;
+    private String fullDescription;
+    private String fileName;
+    private Boolean locked = false;
+
+    /**
+     * @hibernate.id column="uid" generator-class="native" type="java.lang.Long"
+     */
+    public Long getUid() {
+	return uid;
+    }
+
+    /**
+     * @hibernate.many-to-one column="parent_uid" cascade="save-update" foreign-key="FK_lams_planner_node_parent"
+     * @return
+     */
+    public PedagogicalPlannerSequenceNode getParent() {
+	return parent;
+    }
+
+    public void setParent(PedagogicalPlannerSequenceNode parent) {
+	this.parent = parent;
+    }
+
+    /**
+     * @hibernate.property column="subdir"
+     * @return
+     */
+    public Integer getSubdir() {
+	return subdir;
+    }
+
+    public void setSubdir(Integer subdir) {
+	this.subdir = subdir;
+    }
+
+    /**
+     * @hibernate.property column="title"
+     * @return
+     */
+    public String getTitle() {
+	return title;
+    }
+
+    public void setTitle(String title) {
+	this.title = title;
+    }
+
+    /**
+     * @hibernate.property column="brief_desc"
+     * @return
+     */
+    public String getBriefDescription() {
+	return briefDescription;
+    }
+
+    public void setBriefDescription(String briefDescription) {
+	this.briefDescription = briefDescription;
+    }
+
+    /**
+     * @hibernate.property column="full_desc"
+     * @return
+     */
+    public String getFullDescription() {
+	return fullDescription;
+    }
+
+    public void setFullDescription(String fullDescription) {
+	this.fullDescription = fullDescription;
+    }
+
+    /**
+     * @hibernate.property column="file_name"
+     * @return
+     */
+    public String getFileName() {
+	return fileName;
+    }
+
+    public void setFileName(String fileName) {
+	this.fileName = fileName;
+    }
+
+    private void setUid(Long uid) {
+	this.uid = uid;
+    }
+
+    /**
+     * @hibernate.set cascade="all" order-by="subdir asc"
+     * @hibernate.collection-key column="parent_uid"
+     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode"
+     * @return
+     */
+    public Set<PedagogicalPlannerSequenceNode> getSubnodes() {
+	return subnodes;
+    }
+
+    public void setSubnodes(Set<PedagogicalPlannerSequenceNode> subnodes) {
+	this.subnodes = subnodes;
+    }
+
+    /**
+     * @hibernate.property column="locked"
+     * @return
+     */
+    public Boolean getLocked() {
+	return locked;
+    }
+
+    public void setLocked(Boolean locked) {
+	this.locked = locked;
+    }
+
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/planner/dao/PedagogicalPlannerDAO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/planner/dao/PedagogicalPlannerDAO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/dao/PedagogicalPlannerDAO.java	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,44 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.planner.dao;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode;
+
+public interface PedagogicalPlannerDAO {
+    PedagogicalPlannerSequenceNode getByUid(Long uid);
+
+    PedagogicalPlannerSequenceNode getRootNode();
+
+    void saveOrUpdateNode(PedagogicalPlannerSequenceNode node);
+
+    void removeNode(PedagogicalPlannerSequenceNode node);
+
+    List<String[]> getTitlePath(PedagogicalPlannerSequenceNode node);
+
+    String getFilePath(PedagogicalPlannerSequenceNode node);
+
+    Integer getNextSubdir(Long parentUid);
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,137 @@
+/****************************************************************
+ * 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 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
+ * ****************************************************************
+ */
+/* $$Id$$ */
+package org.lamsfoundation.lams.planner.dao.hibernate;
+
+import java.io.File;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode;
+import org.lamsfoundation.lams.planner.dao.PedagogicalPlannerDAO;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+
+/**
+ * 
+ * @author Marcin Cieslak
+ * 
+ * @version $Revision$
+ */
+public class PedagogicalPlannerDAOHibernate extends HibernateDaoSupport implements PedagogicalPlannerDAO {
+    private static final String FIND_ROOT_NODE = "FROM " + PedagogicalPlannerSequenceNode.class.getName()
+	    + " AS n WHERE n.parent=NULL";
+    private static final String FIND_PARENT_TITLE = "SELECT n.parent.uid, n.title FROM "
+	    + PedagogicalPlannerSequenceNode.class.getName() + " AS n WHERE n.uid=?";
+
+    private static final String FIND_PARENT_DIR = "SELECT n.parent.uid, n.subdir FROM "
+	    + PedagogicalPlannerSequenceNode.class.getName() + " AS n WHERE n.uid=?";
+
+    private static final String FIND_MAX_SUBDIR = "SELECT MAX(n.subdir) FROM "
+	    + PedagogicalPlannerSequenceNode.class.getName() + " AS n WHERE n.parent.uid=?";
+
+    public PedagogicalPlannerSequenceNode getByUid(Long uid) {
+	return (PedagogicalPlannerSequenceNode) getHibernateTemplate().get(PedagogicalPlannerSequenceNode.class, uid);
+    }
+
+    public String getFilePath(PedagogicalPlannerSequenceNode node) {
+	if (node.getParent() == null) {
+	    return null;
+	}
+	Long currentUid = node.getUid();
+	LinkedList<Integer> filePathParts = new LinkedList<Integer>();
+	List<Object[]> result;
+	Object[] row;
+	while (currentUid != null) {
+	    result = getHibernateTemplate().find(PedagogicalPlannerDAOHibernate.FIND_PARENT_DIR, currentUid);
+	    if (result.size() > 0) {
+		row = result.get(0);
+		Integer subdir = (Integer) row[1];
+		filePathParts.addFirst(subdir);
+		currentUid = (Long) row[0];
+	    } else {
+		return null;
+	    }
+	}
+	StringBuilder filePath = new StringBuilder();
+	for (Integer dir : filePathParts) {
+	    filePath.append(dir.toString() + File.separator);
+	}
+	filePath.append(node.getFileName());
+	return filePath.toString();
+    }
+
+    public PedagogicalPlannerSequenceNode getRootNode() {
+	List<PedagogicalPlannerSequenceNode> subnodeList = getHibernateTemplate().find(
+		PedagogicalPlannerDAOHibernate.FIND_ROOT_NODE);
+	PedagogicalPlannerSequenceNode rootNode = new PedagogicalPlannerSequenceNode();
+	rootNode.setLocked(true);
+	Set<PedagogicalPlannerSequenceNode> subnodeSet = new LinkedHashSet<PedagogicalPlannerSequenceNode>(subnodeList);
+	rootNode.setSubnodes(subnodeSet);
+	return rootNode;
+    }
+
+    public List<String[]> getTitlePath(PedagogicalPlannerSequenceNode node) {
+	if (node.getParent() == null) {
+	    return null;
+	}
+	Long currentUid = node.getUid();
+	LinkedList<String[]> titlePath = new LinkedList<String[]>();
+	List<Object[]> result;
+	Object[] row;
+	while (currentUid != null) {
+	    result = getHibernateTemplate().find(PedagogicalPlannerDAOHibernate.FIND_PARENT_TITLE, currentUid);
+	    if (result.size() > 0) {
+		row = result.get(0);
+		if (!currentUid.equals(node.getUid())) {
+		    String title = (String) row[1];
+		    titlePath.addFirst(new String[] { currentUid.toString(), title });
+		}
+		currentUid = (Long) row[0];
+	    } else {
+		return null;
+	    }
+	}
+
+	return titlePath;
+    }
+
+    public void removeNode(PedagogicalPlannerSequenceNode node) {
+	getHibernateTemplate().delete(node);
+	getHibernateTemplate().flush();
+    }
+
+    public void saveOrUpdateNode(PedagogicalPlannerSequenceNode node) {
+	getHibernateTemplate().saveOrUpdate(node);
+    }
+
+    public Integer getNextSubdir(Long parentUid) {
+	Integer maxSubdir = (Integer) getHibernateTemplate().find(PedagogicalPlannerDAOHibernate.FIND_MAX_SUBDIR,
+		parentUid).get(0);
+	if (maxSubdir == null) {
+	    maxSubdir = 0;
+	}
+	return maxSubdir + 1;
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,150 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.planner.dto;
+
+public class PedagogicalPlannerActivityDTO {
+    private String pedagogicalPlannerUrl;
+    private String toolIconUrl;
+    private String title;
+    private String type;
+    private String editingAdviceUrl;
+    private String checkEditingAdviceUrl;
+    private Boolean supportsPlanner;
+    private Short group;
+    private String parentActivityTitle;
+    private Boolean lastNestedActivity = false;
+    private Boolean defaultBranch = false;
+    private Short complexActivityType;
+
+    public static final short TYPE_BRANCHING_ACTIVITY = 1;
+    public static final short TYPE_OPTIONAL_ACTIVITY = 2;
+
+    public Boolean getSupportsPlanner() {
+	return supportsPlanner;
+    }
+
+    public void setSupportsPlanner(Boolean supportsPlanner) {
+	this.supportsPlanner = supportsPlanner;
+    }
+
+    public String getPedagogicalPlannerUrl() {
+	return pedagogicalPlannerUrl;
+    }
+
+    public void setPedagogicalPlannerUrl(String toolSignature) {
+	pedagogicalPlannerUrl = toolSignature;
+    }
+
+    public PedagogicalPlannerActivityDTO(String type, String title, Boolean supportsPlanner,
+	    String pedagogicalPlannerUrl, String toolIconUrl, String checkEditingAdviceUrl, String editingAdviceUrl) {
+	this.supportsPlanner = supportsPlanner;
+	this.pedagogicalPlannerUrl = pedagogicalPlannerUrl;
+	this.toolIconUrl = toolIconUrl;
+	this.checkEditingAdviceUrl = checkEditingAdviceUrl;
+	this.editingAdviceUrl = editingAdviceUrl;
+	this.title = title;
+	this.type = type;
+
+    }
+
+    public String getToolIconUrl() {
+	return toolIconUrl;
+    }
+
+    public void setToolIconUrl(String toolIconUrl) {
+	this.toolIconUrl = toolIconUrl;
+    }
+
+    public String getTitle() {
+	return title;
+    }
+
+    public void setTitle(String title) {
+	this.title = title;
+    }
+
+    public String getType() {
+	return type;
+    }
+
+    public void setType(String type) {
+	this.type = type;
+    }
+
+    public String getEditingAdviceUrl() {
+	return editingAdviceUrl;
+    }
+
+    public void setEditingAdviceUrl(String editingAdviceUrl) {
+	this.editingAdviceUrl = editingAdviceUrl;
+    }
+
+    public String getCheckEditingAdviceUrl() {
+	return checkEditingAdviceUrl;
+    }
+
+    public void setCheckEditingAdviceUrl(String checkEditingAdviceUrl) {
+	this.checkEditingAdviceUrl = checkEditingAdviceUrl;
+    }
+
+    public Short getGroup() {
+	return group;
+    }
+
+    public void setGroup(Short branch) {
+	this.group = branch;
+    }
+
+    public String getParentActivityTitle() {
+	return parentActivityTitle;
+    }
+
+    public void setParentActivityTitle(String branchingActivityTitle) {
+	parentActivityTitle = branchingActivityTitle;
+    }
+
+    public Boolean getLastNestedActivity() {
+	return lastNestedActivity;
+    }
+
+    public void setLastNestedActivity(Boolean lastNestedActivity) {
+	this.lastNestedActivity = lastNestedActivity;
+    }
+
+    public Boolean getDefaultBranch() {
+	return defaultBranch;
+    }
+
+    public void setDefaultBranch(Boolean defaultBranch) {
+	this.defaultBranch = defaultBranch;
+    }
+
+    public Short getComplexActivityType() {
+	return complexActivityType;
+    }
+
+    public void setComplexActivityType(Short complexActivityType) {
+	this.complexActivityType = complexActivityType;
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,158 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.planner.dto;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode;
+
+public class PedagogicalPlannerSequenceNodeDTO {
+    private Long uid;
+    private List<String[]> titlePath;
+    private String title;
+    private String briefDescription;
+    private String fullDescription;
+    private String fileName;
+    private Boolean locked;
+    private List<PedagogicalPlannerSequenceNodeDTO> subnodes;
+    private Long parentUid;
+    // Not node-bound variables, but simply attributes used in JSP page
+    private Boolean edit = false;
+    private Boolean createSubnode = false;
+
+    public PedagogicalPlannerSequenceNodeDTO() {
+    }
+
+    public PedagogicalPlannerSequenceNodeDTO(PedagogicalPlannerSequenceNode node, List<String[]> titlePath) {
+	uid = node.getUid();
+	title = node.getTitle();
+	briefDescription = node.getBriefDescription();
+	fullDescription = node.getFullDescription();
+	fileName = node.getFileName();
+	locked = node.getLocked();
+	this.titlePath = titlePath;
+	if (node.getParent() != null) {
+	    parentUid = node.getParent().getUid();
+	}
+	subnodes = new LinkedList<PedagogicalPlannerSequenceNodeDTO>();
+	for (PedagogicalPlannerSequenceNode subnode : node.getSubnodes()) {
+	    PedagogicalPlannerSequenceNodeDTO subnodeDTO = new PedagogicalPlannerSequenceNodeDTO();
+	    subnodeDTO.setTitle(subnode.getTitle());
+	    subnodeDTO.setBriefDescription(subnode.getBriefDescription());
+	    subnodeDTO.setLocked(subnode.getLocked());
+	    subnodeDTO.setFileName(subnode.getFileName());
+	    subnodeDTO.setUid(subnode.getUid());
+	    subnodes.add(subnodeDTO);
+	}
+    }
+
+    public List<String[]> getTitlePath() {
+	return titlePath;
+    }
+
+    public void setTitlePath(List<String[]> titlePath) {
+	this.titlePath = titlePath;
+    }
+
+    public String getTitle() {
+	return title;
+    }
+
+    public void setTitle(String title) {
+	this.title = title;
+    }
+
+    public String getBriefDescription() {
+	return briefDescription;
+    }
+
+    public void setBriefDescription(String briefDescription) {
+	this.briefDescription = briefDescription;
+    }
+
+    public String getFullDescription() {
+	return fullDescription;
+    }
+
+    public void setFullDescription(String fullDescription) {
+	this.fullDescription = fullDescription;
+    }
+
+    public String getFileName() {
+	return fileName;
+    }
+
+    public void setFileName(String fileName) {
+	this.fileName = fileName;
+    }
+
+    public List<PedagogicalPlannerSequenceNodeDTO> getSubnodes() {
+	return subnodes;
+    }
+
+    public void setSubnodes(List<PedagogicalPlannerSequenceNodeDTO> subnodes) {
+	this.subnodes = subnodes;
+    }
+
+    public Long getUid() {
+	return uid;
+    }
+
+    public void setUid(Long uid) {
+	this.uid = uid;
+    }
+
+    public Boolean getLocked() {
+	return locked;
+    }
+
+    public void setLocked(Boolean locked) {
+	this.locked = locked;
+    }
+
+    public Long getParentUid() {
+	return parentUid;
+    }
+
+    public void setParentUid(Long parentUid) {
+	this.parentUid = parentUid;
+    }
+
+    public Boolean getEdit() {
+	return edit;
+    }
+
+    public void setEdit(Boolean edit) {
+	this.edit = edit;
+    }
+
+    public Boolean getCreateSubnode() {
+	return createSubnode;
+    }
+
+    public void setCreateSubnode(Boolean createSubnode) {
+	this.createSubnode = createSubnode;
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -0,0 +1,92 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.planner.dto;
+
+import java.util.List;
+
+public class PedagogicalPlannerTemplateDTO {
+    private String sequenceTitle;
+    private Boolean sendInPortions;
+    private Integer activitiesInPortion;
+    private Long submitDelay;
+    private List<PedagogicalPlannerActivityDTO> activities;
+    private Long learningDesignID;
+    private Integer activitySupportingPlannerCount = 0;
+
+    public String getSequenceTitle() {
+	return sequenceTitle;
+    }
+
+    public void setSequenceTitle(String sequenceTitle) {
+	this.sequenceTitle = sequenceTitle;
+    }
+
+    public Boolean getSendInPortions() {
+	return sendInPortions;
+    }
+
+    public void setSendInPortions(Boolean sendInPortions) {
+	this.sendInPortions = sendInPortions;
+    }
+
+    public Integer getActivitiesInPortion() {
+	return activitiesInPortion;
+    }
+
+    public void setActivitiesInPortion(Integer activitiesInPortion) {
+	this.activitiesInPortion = activitiesInPortion;
+    }
+
+    public Long getSubmitDelay() {
+	return submitDelay;
+    }
+
+    public void setSubmitDelay(Long submitDelay) {
+	this.submitDelay = submitDelay;
+    }
+
+    public List<PedagogicalPlannerActivityDTO> getActivities() {
+	return activities;
+    }
+
+    public void setActivities(List<PedagogicalPlannerActivityDTO> activities) {
+	this.activities = activities;
+    }
+
+    public Long getLearningDesignID() {
+	return learningDesignID;
+    }
+
+    public void setLearningDesignID(Long learningDesignID) {
+	this.learningDesignID = learningDesignID;
+    }
+
+    public Integer getActivitySupportingPlannerCount() {
+	return activitySupportingPlannerCount;
+    }
+
+    public void setActivitySupportingPlannerCount(Integer activitySupportingPlannerCount) {
+	this.activitySupportingPlannerCount = activitySupportingPlannerCount;
+    }
+}
\ No newline at end of file
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java
===================================================================
diff -u -r38eea63d76357e11cad168548c1332b9297f0828 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java	(.../ChatPedagogicalPlannerForm.java)	(revision 38eea63d76357e11cad168548c1332b9297f0828)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java	(.../ChatPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -24,12 +24,12 @@
 package org.lamsfoundation.lams.tool.chat.web.forms;
 
 import org.lamsfoundation.lams.tool.chat.model.Chat;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
 /**
  * @struts.form name="pedagogicalPlannerForm"
  */
-public class ChatPedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class ChatPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     private String instructions;
     private String contentFolderID;
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java	(.../ForumPedagogicalPlannerForm.java)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java	(.../ForumPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -32,12 +32,12 @@
 import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
 /**
  * @struts.form name="pedagogicalPlannerForm"
  */
-public class ForumPedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class ForumPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     private List<String> topic;
     private String contentFolderID;
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerForm.java
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerForm.java	(.../McPedagogicalPlannerForm.java)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerForm.java	(.../McPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -40,9 +40,9 @@
 import org.lamsfoundation.lams.tool.mc.McQuestionContentDTO;
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
-public class McPedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class McPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     private static Logger logger = Logger.getLogger(McPedagogicalPlannerForm.class);
 
     private List<String> question;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerForm.java
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerForm.java	(.../QaPedagogicalPlannerForm.java)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerForm.java	(.../QaPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -32,9 +32,9 @@
 import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
-public class QaPedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class QaPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     private List<String> question;
     private String contentFolderID;
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java
===================================================================
diff -u -r3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java	(.../ResourcePedagogicalPlannerForm.java)	(revision 3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java	(.../ResourcePedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -35,12 +35,12 @@
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
 /**
  * @struts.form name="pedagogicalPlannerForm"
  */
-public class ResourcePedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class ResourcePedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     private List<String> title;
     private List<String> url;
     private List<FormFile> file;
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerForm.java
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerForm.java	(.../NbPedagogicalPlannerForm.java)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerForm.java	(.../NbPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -24,13 +24,13 @@
 package org.lamsfoundation.lams.tool.noticeboard.web;
 
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
 /**
  * @struts:form name="NbPedagogicalPlannerForm"
  *              type="org.lamsfoundation.lams.tool.noticeboard.web.NbPedagogicalPlannerForm"
  */
-public class NbPedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class NbPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     private String content;
     private String contentFolderID;
 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java	(.../NotebookPedagogicalPlannerForm.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java	(.../NotebookPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -24,12 +24,12 @@
 package org.lamsfoundation.lams.tool.notebook.web.forms;
 
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
 /**
  * @struts.form name="pedagogicalPlannerForm"
  */
-public class NotebookPedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class NotebookPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     String instructions;
     String contentFolderID;
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/SubmitFilesPedagogicalPlannerForm.java
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/SubmitFilesPedagogicalPlannerForm.java	(.../SubmitFilesPedagogicalPlannerForm.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/SubmitFilesPedagogicalPlannerForm.java	(.../SubmitFilesPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -24,13 +24,13 @@
 package org.lamsfoundation.lams.tool.sbmt.form;
 
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
 /**
  * @struts:form name="SbmtPedagogicalPlannerForm"
  *              type="org.lamsfoundation.lams.tool.sbmt.form.SubmitFilesPedagogicalPlannerForm"
  */
-public class SubmitFilesPedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class SubmitFilesPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     String instruction;
     String contentFolderID;
 
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r7b79396263b36a933d66390fb9ab12821956d59d -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 7b79396263b36a933d66390fb9ab12821956d59d)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -13,28 +13,36 @@
 
    <tag>
 
-      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
-      <display-name>Base URL for the current web app</display-name>
+      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
+      <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
-      <name>WebAppURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
+      <name>LAMSURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
 
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
+      <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+      <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
+      <name>out</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>value</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeHtml</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -44,6 +52,26 @@
    </tag>
    <tag>
 
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
@@ -64,28 +92,17 @@
    </tag>
    <tag>
 
-      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
-      <display-name>LAMS URL</display-name>
+      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+      <display-name>generate unique ID</display-name>
       <icon>    
       </icon>
-      <name>LAMSURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
+      <name>generateID</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
       <body-content>empty</body-content>
 
-   </tag>
-   <tag>
-
-      <description>Render html tag with direction and language</description>
-      <display-name>Render html tag with direction and language</display-name>
-      <icon>    
-      </icon>
-      <name>html</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
-      <body-content>JSP</body-content>
-
       <attribute>
-         <description>Render html tag with direction and language</description>
-         <name>xhtml</name>
+         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+         <name>id</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -95,26 +112,29 @@
    </tag>
    <tag>
 
-      <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-      <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
+      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
+      <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
-      <name>out</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
+      <name>WebAppURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
 
-      <attribute>
-         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-         <name>value</name>
-         <required>true</required>
+   </tag>
+   <tag>
 
-           <rtexprvalue>true</rtexprvalue>
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
+      <icon>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
 
-      </attribute>
       <attribute>
-         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-         <name>escapeHtml</name>
-         <required>false</required>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
 
            <rtexprvalue>true</rtexprvalue>
 
@@ -167,17 +187,17 @@
    </tag>
    <tag>
 
-      <description>Converts role name into form usable as message resources key</description>
-      <display-name>Converts role name into form usable as message resources key</display-name>
+      <description>Output details from the shared session UserDTO object</description>
+      <display-name>user details</display-name>
       <icon>    
       </icon>
-      <name>role</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <name>user</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Converts role name into form usable as message resources key</description>
-         <name>role</name>
+         <description>Output details from the shared session UserDTO object</description>
+         <name>property</name>
          <required>true</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -213,27 +233,7 @@
       </attribute>
 
    </tag>
-   <tag>
 
-      <description>Output details from the shared session UserDTO object</description>
-      <display-name>user details</display-name>
-      <icon>    
-      </icon>
-      <name>user</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output details from the shared session UserDTO object</description>
-         <name>property</name>
-         <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-
   	<tag>
 		<name>STRUTS-textarea</name>
 		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
@@ -289,11 +289,6 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<name>index</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java	(.../TaskListPedagogicalPlannerForm.java)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java	(.../TaskListPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -32,12 +32,12 @@
 import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
 /**
  * @struts.form name="pedagogicalPlannerForm"
  */
-public class TaskListPedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class TaskListPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     private List<String> taskListItem;
 
     @Override
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerForm.java
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerForm.java	(.../VotePedagogicalPlannerForm.java)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerForm.java	(.../VotePedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -32,9 +32,9 @@
 import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
-public class VotePedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class VotePedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     private List<String> nomination;
     private String contentFolderID;
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java
===================================================================
diff -u -r8d32e52903d230f8018ac609041934db7f180e73 -r00a6e145b37916eb1561ea5c68319b0fc691681b
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java	(.../WikiPedagogicalPlannerForm.java)	(revision 8d32e52903d230f8018ac609041934db7f180e73)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java	(.../WikiPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
@@ -28,12 +28,12 @@
 import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.tool.wiki.model.Wiki;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPage;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 
 /**
  * @struts.form name="pedagogicalPlannerForm"
  */
-public class WikiPedagogicalPlannerForm extends PedagogicalPlannerForm {
+public class WikiPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     String title;
     String wikiBody;
     String contentFolderID;