Index: lams_admin/web/WEB-INF/lams.tld
===================================================================
diff -u -rc5b655c3c11fa9d9b1d76e0ef602acf6363e45f9 -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c5b655c3c11fa9d9b1d76e0ef602acf6363e45f9)
+++ lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -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>
@@ -466,6 +461,10 @@
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_admin/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/TextSearch.tag	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -0,0 +1,136 @@
+<% 
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * TextSearch.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays form for creating text search conditions.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%-- Required attributes --%>
+<%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
+<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
+
+<%-- Optional attributes --%>
+<%@ attribute name="action" required="false" rtexprvalue="true" %>
+<%@ attribute name="formID" required="false" rtexprvalue="true" %>
+<%@ attribute name="headingLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="allWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="phraseLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="anyWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="excludedWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelAction" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty action}">
+	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+</c:if>
+<c:if test="${empty cancelAction}">
+	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+</c:if>
+<c:if test="${empty formID}">
+	<c:set var="formID" value="textSearchForm" scope="request"/>
+</c:if>
+<c:if test="${empty headingFindTextLabelKey}">
+	<c:set var="headingLabelKey" value="textsearch.heading" scope="request"/>
+</c:if>
+<c:if test="${empty allWordsLabelKey}">
+	<c:set var="allWordsLabelKey" value="textsearch.all.words" scope="request"/>
+</c:if>
+<c:if test="${empty phraseLabelKey}">
+	<c:set var="phraseLabelKey" value="textsearch.phrase" scope="request"/>
+</c:if>
+<c:if test="${empty anyWordsLabelKey}">
+	<c:set var="anyWordsLabelKey" value="textsearch.any.words" scope="request"/>
+</c:if>
+<c:if test="${empty excludedWordsLabelKey}">
+	<c:set var="excludedWordsLabelKey" value="textsearch.excluded.words" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="textsearch.save" scope="request"/>
+</c:if>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="textsearch.cancel" scope="request"/>
+</c:if>
+
+<!-- begin text search form content -->
+	
+<c:if test="${wrapInFormTag}">
+	<form action="${action}" id="${formID}" name="${formID}">
+</c:if>
+		<html:hidden property="sessionMapID" />
+		<h4><fmt:message key="${headingLabelKey}" /></h4>
+		<table>
+			<tr>
+				<td>
+					<fmt:message key="${allWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="allWords" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${phraseLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="phrase" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${anyWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="anyWords" /> 
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${excludedWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="excludedWords" /> 
+				</td>
+			</tr>
+		</table>
+<c:if test="${wrapInFormTag}">
+	<lams:ImgButtonWrapper>
+		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
+		</a>
+		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
+		</a>
+	</lams:ImgButtonWrapper>
+	</form>
+</c:if>
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_central/build.xml
===================================================================
diff -u -rc234c64ad9ff9d713f6d8e3331d0c20075e49303 -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/build.xml	(.../build.xml)	(revision c234c64ad9ff9d713f6d8e3331d0c20075e49303)
+++ lams_central/build.xml	(.../build.xml)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -165,6 +165,7 @@
 				<include name="*.properties"/>
 				<include name="struts/**"/>
 				<include name="jstl/**"/>
+				<include name="fckeditor/**"/>
 				<include name="tiles/**"/>
 				<exclude name="web.xml"/>
 			</webinf>
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5bd95ffef22a2fdc60414cfd9cfb22968b88c13b -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5bd95ffef22a2fdc60414cfd9cfb22968b88c13b)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -232,4 +232,69 @@
 videorecorder.instructions.fck  =Click the record button to start and stop recording. Once a recording is completed, you can review it by clicking the play button. When ready to add the video, click the tick button.
 
 
-#======= End labels: Exported 224 labels for en AU =====
+index.planner =Planner
+planner.title =Pedagogical Planner
+label.description =Description
+planner.saved =All acitvities were saved successfully.
+planner.not.saved =There were errors in activities. Not all acitvities were saved.
+error.planner.title.blank =Sequence title must not be blank.
+label.planner.not.supported =This activity does not support the planner.
+button.planner.save =Save template
+button.planner.preview =Preview
+button.planner.view.full.author =View in Full Author
+
+label.planner.grouping.type=Group type
+label.planner.grouping.type.random=Random grouping
+label.planner.grouping.type.chosen=Choose in Monitor
+label.planner.grouping.type.learner.choice=Learner's choice
+label.planner.grouping.number.of.groups=Number of groups
+label.planner.grouping.number.of.learners=Number of learners
+error.planner.grouping.number.integer=Provided value must be a positive integer number.
+label.planner.grouping.equal.group.size=Equal group sizes
+msg.planner.not.saved  =Are you sure you want to close? If you have not saved the design, changes you have made will be lost.
+label.planner.editing.advice=Editing advice
+label.planner.branch.empty =This branch is empty.
+label.planner.branch=Branch
+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=Planner
+msg.planner.open.template=This node opens a 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?
+
+label.planner.node.type=This node:
+label.planner.node.type.subnodes=has subnodes
+label.planner.node.type.template=opens a template
+label.planner.remove.file=Remove file
+label.planner.change.file=Change file:
+label.planner.uploaded.template=Uploaded template file:
+msg.planner.move.node.up=Move node up
+msg.planner.move.node.down=Move node down
+label.planner.choose.file=Choose a template file:
+error.planner.node.title.blank=Node title must not be blank.
+error.planner.repository=There was a file respository error. Template file was not saved.
+error.planner.file.empty=You must upload a file.
+error.planner.file.bad.extension=Template file must have a ZIP or LAS extension.
+
+error.planner.tools=There were tool errors. Learning design could not be retrieved.
+error.planner.learning.design.retrieve=Learning design could not be retrieved.
+error.planner.file.open=There was an error while opening the template file.
+error.planner.editor=There was an error while opening the editor.
+error.planner.export=There was an error while exporting the node.
+error.planner.import=There was an error while importing the node.
+label.planner.export=Export node
+label.planner.import=Import node
+
+label.planner.import.instruction=Please select Pedagogical Planner node to import. The import file must be a .zip file exported from LAMS 2 or above.
+label.planner.grouping.view.students=View students before selection
+#======= End labels: Exported 222 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5bd95ffef22a2fdc60414cfd9cfb22968b88c13b -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5bd95ffef22a2fdc60414cfd9cfb22968b88c13b)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -232,4 +232,69 @@
 videorecorder.instructions.fck  =Click the record button to start and stop recording. Once a recording is completed, you can review it by clicking the play button. When ready to add the video, click the tick button.
 
 
-#======= End labels: Exported 224 labels for en AU =====
+index.planner =Planner
+planner.title =Pedagogical Planner
+label.description =Description
+planner.saved =All acitvities were saved successfully.
+planner.not.saved =There were errors in activities. Not all acitvities were saved.
+error.planner.title.blank =Sequence title must not be blank.
+label.planner.not.supported =This activity does not support the planner.
+button.planner.save =Save template
+button.planner.preview =Preview
+button.planner.view.full.author =View in Full Author
+
+label.planner.grouping.type=Group type
+label.planner.grouping.type.random=Random grouping
+label.planner.grouping.type.chosen=Choose in Monitor
+label.planner.grouping.type.learner.choice=Learner's choice
+label.planner.grouping.number.of.groups=Number of groups
+label.planner.grouping.number.of.learners=Number of learners
+error.planner.grouping.number.integer=Provided value must be a positive integer number.
+label.planner.grouping.equal.group.size=Equal group sizes
+msg.planner.not.saved  =Are you sure you want to close? If you have not saved the design, changes you have made will be lost.
+label.planner.editing.advice=Editing advice
+label.planner.branch.empty =This branch is empty.
+label.planner.branch=Branch
+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=Planner
+msg.planner.open.template=This node opens a 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?
+
+label.planner.node.type=This node:
+label.planner.node.type.subnodes=has subnodes
+label.planner.node.type.template=opens a template
+label.planner.remove.file=Remove file
+label.planner.change.file=Change file:
+label.planner.uploaded.template=Uploaded template file:
+msg.planner.move.node.up=Move node up
+msg.planner.move.node.down=Move node down
+label.planner.choose.file=Choose a template file:
+error.planner.node.title.blank=Node title must not be blank.
+error.planner.repository=There was a file respository error. Template file was not saved.
+error.planner.file.empty=You must upload a file.
+error.planner.file.bad.extension=Template file must have a ZIP or LAS extension.
+
+error.planner.tools=There were tool errors. Learning design could not be retrieved.
+error.planner.learning.design.retrieve=Learning design could not be retrieved.
+error.planner.file.open=There was an error while opening the template file.
+error.planner.editor=There was an error while opening the editor.
+error.planner.export=There was an error while exporting the node.
+error.planner.import=There was an error while importing the node.
+label.planner.export=Export node
+label.planner.import=Import node
+
+label.planner.import.instruction=Please select Pedagogical Planner node to import. The import file must be a .zip file exported from LAMS 2 or above.
+label.planner.grouping.view.students=View students before selection
+#======= End labels: Exported 222 labels for en AU =====
Index: lams_central/conf/xdoclet/taglibs.xml
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_central/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -65,7 +65,7 @@
 		<!--  ======================================================== -->	
 		<taglib>
 		    <taglib-uri>fck-editor</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/FCKeditor.tld</taglib-location>
+		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 		</taglib>
 		
 		 <taglib>
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -534,8 +534,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);
@@ -1363,17 +1363,18 @@
 	HashSet<Competence> newCompeteces = new HashSet<Competence>();
 
 	Set<Competence> oldCompetences = originalLearningDesign.getCompetences();
-	for (Competence competence : oldCompetences) {
-	    Competence newCompetence = competence.createCopy(competence);
-	    newCompetence.setLearningDesign(newLearningDesign);
+	if (oldCompetences != null) {
+	    for (Competence competence : oldCompetences) {
+		Competence newCompetence = competence.createCopy(competence);
+		newCompetence.setLearningDesign(newLearningDesign);
 
-	    // check for existing competences to prevent duplicates
-	    if (competenceDAO.getCompetence(newLearningDesign, newCompetence.getTitle()) == null) {
-		competenceDAO.saveOrUpdate(newCompetence);
+		// check for existing competences to prevent duplicates
+		if (competenceDAO.getCompetence(newLearningDesign, newCompetence.getTitle()) == null) {
+		    competenceDAO.saveOrUpdate(newCompetence);
+		}
+		newCompeteces.add(newCompetence);
 	    }
-	    newCompeteces.add(newCompetence);
 	}
-
 	if (newLearningDesign.getCompetences() != null) {
 	    if (!insert) {
 		newLearningDesign.getCompetences().clear();
Index: lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java	(.../CentralConstants.java)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java	(.../CentralConstants.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -155,6 +155,8 @@
 
     public static final String PARAM_CREATE_SUBNODE = "createSubnode";
 
+    public static final String PARAM_IMPORT_NODE = "importNode";
+
     public static final String PARAM_UID = "uid";
 
     public static final String CENTRAL_TOOL_CONTENT_HANDLER_BEAN_NAME = "centralToolContentHandler";
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
===================================================================
diff -u -r5a30100855d83534e76db8dec0d0b603a1a1ded8 -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision 5a30100855d83534e76db8dec0d0b603a1a1ded8)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -23,15 +23,21 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.web.planner;
 
+import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
 import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -76,15 +82,22 @@
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.CentralToolContentHandler;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.FileUtilException;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
+import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.thoughtworks.xstream.XStream;
+
 /**
  * Action managing Pedagogical Planner base page and non-tool activities.
  * 
@@ -105,6 +118,7 @@
     private static final String FILE_EXTENSION_ZIP = ".zip";
     private static final String FILE_EXTENSION_LAS = ".las";
 
+    // ActionForwards
     private static final String FORWARD_TEMPLATE = "template";
     private static final String FORWARD_PREVIEW = "preview";
     private static final String FORWARD_SEQUENCE_CHOOSER = "sequenceChooser";
@@ -123,8 +137,9 @@
     private static MessageService messageService;
     private static PedagogicalPlannerDAO pedagogicalPlannerDAO;
     private static ToolContentHandler contentHandler;
+    private static final String PEDAGOGICAL_PLANNER_DAO_BEAN_NAME = "pedagogicalPlannerDAO";
 
-    // Error messages used in class
+    // Keys of error messages used in this class. They are ment to be displayed for user.
     private static final String ERROR_KEY_TOOL_ERRORS = "error.planner.tools.";
     private static final String ERROR_KEY_NODE_TITLE_BLANK = "error.planner.node.title.blank";
     private static final String ERROR_KEY_REPOSITORY = "error.planner.repository";
@@ -133,7 +148,10 @@
     private static final String ERROR_KEY_FILE_OPEN = "error.planner.file.open";
     private static final String ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED = "error.planner.learning.design.retrieve";
     private static final String ERROR_KEY_EDITOR = "error.planner.editor";
+    private static final String ERROR_KEY_EXPORT = "error.planner.export";
+    private static final String ERROR_KEY_IMPORT = "error.planner.import";
 
+    // Error messages used in this class. They are ment to be thrown.
     private static final String ERROR_USER_NOT_FOUND = "User not found.";
     private static final String ERROR_NOT_PROPER_FILE = "The sequence template does not exist or is not a proper file.";
     private static final String ERROR_TOO_MANY_OPTIONS = "Number of options in options activity is limited to "
@@ -145,112 +163,71 @@
 
     private static Logger log = Logger.getLogger(PedagogicalPlannerAction.class);
 
-    private static final String PEDAGOGICAL_PLANNER_DAO_BEAN_NAME = "pedagogicalPlannerDAO";
+    // Paths used in templateBase.jsp
     private static final String IMAGE_PATH_GATE = "images/stop.gif";
     private static final String PATH_ACTIVITY_NO_PLANNER_SUPPORT = "/pedagogical_planner/defaultActivityForm.jsp";
     private static final String IMAGE_PATH_GROUPING = "images/grouping.gif";
 
+    // Parts of paths used in importing/exporting nodes
+
+    private static final String NODE_FILE_NAME = "node.xml";
+    private static final String DIR_CONTENT = "content";
+    private static final String DIR_TEMPLATES = "template";
+
+    private static final String EXPORT_NODE_FOLDER_SUFFIX = "export_node";
+    private static final String EXPORT_NODE_CONTENT_ZIP_PREFIX = "content_";
+    private static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition";
+    private static final String RESPONSE_CONTENT_TYPE_DOWNLOAD = "application/x-download";
+    private static final String ENCODING_UTF_8 = "UTF-8";
+    private static final String DIR_UPLOADED_NODE_SUFFIX = "_uploaded_node";
+    private static final String EXPORT_NODE_ZIP_PREFIX = "lams_planner_node_";
+
+    private static final int FILE_COPY_BUFFER_SIZE = 1024;
+
     @Override
     /**
-     * Go straight to start().
+     * Go straight to open sequence node.
      */
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	return openSequenceNode(mapping, form, request, response);
     }
 
+    /*----------------------- TEMPLATE CHOOSER METHODS --------------------*/
+
     /**
      * The main method for opening and parsing template (chosen learning desing).
      * 
      * @param mapping
      * @param form
      * @param request
-     * @param response
+     * @param fileUuid
+     * @param fileName
      * @return
      * @throws ServletException
-     * @throws IOException
      */
     private ActionForward openTemplate(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    Long fileUuid, String fileName) throws ServletException {
-	// Get the learning design template zip file
+
 	ActionMessages errors = new ActionMessages();
 
-	File designFile = null;
-
-	try {
-	    designFile = copyFileFromRepository(fileUuid, fileName);
-	} catch (Exception e) {
-	    PedagogicalPlannerAction.log.error(e);
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(PedagogicalPlannerAction.ERROR_KEY_FILE_OPEN));
+	// Open the learning design stored in the repository.
+	LearningDesign learningDesign = importLearningDesign(fileUuid, fileName, errors);
+	if (!errors.isEmpty()) {
 	    saveErrors(request, errors);
+	    // If anything goes wrong, open the root node. Errors will be displayed at top.
+	    // This approach is used widely in this action.
 	    return openSequenceNode(mapping, form, request, (Long) null);
 	}
-	if (!designFile.exists() || designFile.isDirectory()) {
-	    PedagogicalPlannerAction.log.error(PedagogicalPlannerAction.ERROR_NOT_PROPER_FILE);
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(PedagogicalPlannerAction.ERROR_KEY_FILE_OPEN));
-	    saveErrors(request, errors);
-	    return openSequenceNode(mapping, form, request, (Long) null);
-	}
 
-	HttpSession session = SessionManager.getSession();
-	UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
-	User user = (User) getUserManagementService().findById(User.class, userDto.getUserID());
-	if (user == null) {
-	    throw new ServletException(PedagogicalPlannerAction.ERROR_USER_NOT_FOUND);
-	}
-	List<String> toolsErrorMsgs = new ArrayList<String>();
-	Long learningDesignID = null;
-	LearningDesign learningDesign = null;
-	List<String> learningDesignErrorMsgs = new ArrayList<String>();
-	// Extract the template
-
-	try {
-	    Object[] ldResults = getExportService().importLearningDesign(designFile, user, null, toolsErrorMsgs, "");
-	    designFile.delete();
-	    learningDesignID = (Long) ldResults[0];
-	    learningDesignErrorMsgs = (List<String>) ldResults[1];
-	    toolsErrorMsgs = (List<String>) ldResults[2];
-	    learningDesign = getAuthoringService().getLearningDesign(learningDesignID);
-	} catch (ImportToolContentException e) {
-	    PedagogicalPlannerAction.log.error(e);
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-		    PedagogicalPlannerAction.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
-	    saveErrors(request, errors);
-	    return openSequenceNode(mapping, form, request, (Long) null);
-	}
-
-	if ((learningDesignID == null || learningDesignID.longValue() == -1) && learningDesignErrorMsgs.size() == 0) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-		    PedagogicalPlannerAction.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
-	    saveErrors(request, errors);
-	    return openSequenceNode(mapping, form, request, (Long) null);
-	}
-	if (learningDesignErrorMsgs.size() > 0) {
-	    for (String error : learningDesignErrorMsgs) {
-		PedagogicalPlannerAction.log.error(error);
-	    }
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-		    PedagogicalPlannerAction.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
-	    saveErrors(request, errors);
-	    return openSequenceNode(mapping, form, request, (Long) null);
-	}
-	if (toolsErrorMsgs.size() > 0) {
-	    for (String error : toolsErrorMsgs) {
-		PedagogicalPlannerAction.log.error(error);
-	    }
-	    errors
-		    .add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-			    PedagogicalPlannerAction.ERROR_KEY_TOOL_ERRORS));
-	    return openSequenceNode(mapping, form, request, (Long) null);
-	}
-
 	List<PedagogicalPlannerActivityDTO> activities = new ArrayList<PedagogicalPlannerActivityDTO>();
 
-	// create DTOs that hold all the necessary information of the activities
+	// Create DTOs that hold all the necessary information of the activities
 	Activity activity = learningDesign.getFirstActivity();
+	PedagogicalPlannerAction.log.debug("Parsing learning design activities");
 	try {
 	    while (activity != null) {
-		// Iterate through all the activities
+		// Iterate through all the activities, detecting type of each one
 		addActivityToPlanner(learningDesign, activities, activity);
 		Transition transitionTo = activity.getTransitionTo();
 		if (transitionTo == null) {
@@ -267,6 +244,7 @@
 	    return openSequenceNode(mapping, form, request, (Long) null);
 	}
 
+	// Recalculate how many activities actually support the planner
 	int activitySupportingPlannerCount = 0;
 	for (PedagogicalPlannerActivityDTO activityDTO : activities) {
 	    if (activityDTO.getSupportsPlanner()) {
@@ -278,7 +256,7 @@
 	planner.setActivitySupportingPlannerCount(activitySupportingPlannerCount);
 	planner.setSequenceTitle(learningDesign.getTitle());
 	planner.setActivities(activities);
-	planner.setLearningDesignID(learningDesignID);
+	planner.setLearningDesignID(learningDesign.getLearningDesignId());
 
 	// Some additional options for submitting activity forms; should be moved to configuration file in the future
 	planner.setSendInPortions(false);
@@ -290,99 +268,6 @@
     }
 
     /**
-     * Saves additional, non tool bound template details - currently only the title.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     */
-    public ActionForward saveSequenceDetails(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
-	String sequenceTitle = WebUtil.readStrParam(request, CentralConstants.PARAM_SEQUENCE_TITLE, true);
-	Long learningDesignID = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID);
-	Integer callAttemptedID = WebUtil.readIntParam(request, CentralConstants.PARAM_CALL_ATTEMPTED_ID);
-	// We send a message in format "<response>&<call ID>"; it is then parsed in JavaScript
-	String responseSuffix = PedagogicalPlannerAction.CHAR_AMPERSAND + callAttemptedID;
-
-	if (StringUtils.isEmpty(sequenceTitle)) {
-	    String blankTitleError = getMessageService().getMessage(CentralConstants.ERROR_PLANNER_TITLE_BLANK);
-	    writeAJAXResponse(response, blankTitleError + responseSuffix);
-	} else {
-	    LearningDesign learningDesign = getAuthoringService().getLearningDesign(learningDesignID);
-	    learningDesign.setTitle(sequenceTitle);
-	    getAuthoringService().saveLearningDesign(learningDesign);
-	    writeAJAXResponse(response, PedagogicalPlannerAction.STRING_OK + responseSuffix);
-	}
-	return null;
-    }
-
-    public ActionForward initGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	PedagogicalPlannerGroupingForm plannerForm = (PedagogicalPlannerGroupingForm) form;
-	Long groupingId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
-	Grouping grouping = getAuthoringService().getGroupingById(groupingId);
-	plannerForm.fillForm(grouping);
-	return mapping.findForward(CentralConstants.FORWARD_GROUPING);
-    }
-
-    public ActionForward saveOrUpdateGroupingForm(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	PedagogicalPlannerGroupingForm plannerForm = (PedagogicalPlannerGroupingForm) form;
-	ActionMessages errors = plannerForm.validate();
-	if (errors.isEmpty()) {
-	    Grouping grouping = getAuthoringService().getGroupingById(plannerForm.getToolContentID());
-	    if (grouping.isRandomGrouping()) {
-		RandomGrouping randomGrouping = (RandomGrouping) grouping;
-		Integer number = StringUtils.isEmpty(plannerForm.getNumberOfGroups()) ? null : Integer
-			.parseInt(plannerForm.getNumberOfGroups());
-		randomGrouping.setNumberOfGroups(number);
-
-		number = StringUtils.isEmpty(plannerForm.getLearnersPerGroup()) ? null : Integer.parseInt(plannerForm
-			.getLearnersPerGroup());
-		randomGrouping.setLearnersPerGroup(number);
-	    } else if (grouping.isLearnerChoiceGrouping()) {
-		LearnerChoiceGrouping learnerChoiceGrouping = (LearnerChoiceGrouping) grouping;
-		Integer number = StringUtils.isEmpty(plannerForm.getNumberOfGroups()) ? null : Integer
-			.parseInt(plannerForm.getNumberOfGroups());
-		learnerChoiceGrouping.setNumberOfGroups(number);
-
-		number = StringUtils.isEmpty(plannerForm.getLearnersPerGroup()) ? null : Integer.parseInt(plannerForm
-			.getLearnersPerGroup());
-		learnerChoiceGrouping.setLearnersPerGroup(number);
-		learnerChoiceGrouping.setEqualNumberOfLearnersPerGroup(plannerForm.getEqualGroupSizes());
-	    } else {
-		Integer number = StringUtils.isEmpty(plannerForm.getNumberOfGroups()) ? null : Integer
-			.parseInt(plannerForm.getNumberOfGroups());
-		grouping.setMaxNumberOfGroups(number);
-	    }
-	} else {
-	    saveMessages(request, errors);
-	}
-	return mapping.findForward(CentralConstants.FORWARD_GROUPING);
-    }
-
-    public ActionForward startPreview(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	Long learningDesignID = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID);
-	HttpSession session = SessionManager.getSession();
-	UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
-
-	// Start preview the same way as in authoring
-	Lesson lesson = getMonitoringService().initializeLessonForPreview("Preview", null, learningDesignID,
-		userDto.getUserID(), null, false, false, false);
-	getMonitoringService().createPreviewClassForLesson(userDto.getUserID(), lesson.getLessonId());
-
-	getMonitoringService().startLesson(lesson.getLessonId(), userDto.getUserID());
-	String newPath = mapping.findForward(PedagogicalPlannerAction.FORWARD_PREVIEW).getPath();
-	newPath = newPath + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_LESSON_ID
-		+ PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId();
-	return new ActionForward(newPath, true);
-    }
-
-    /**
      * Recognises activitiy type and creates proper DTO for web pages use. For branching and options it can be called
      * recursevely.
      * 
@@ -397,6 +282,8 @@
      */
     private PedagogicalPlannerActivityDTO addActivityToPlanner(LearningDesign learningDesign,
 	    List<PedagogicalPlannerActivityDTO> activities, Activity activity) throws ServletException {
+	PedagogicalPlannerAction.log.debug("Parsing activity: " + activity.getTitle());
+
 	// Check if the activity is contained in some complex activity: branching or options
 	boolean isNested = activity.getParentActivity() != null
 		&& (activity.getParentActivity().isBranchingActivity() || activity.isOptionsActivity());
@@ -537,6 +424,7 @@
 	    }
 	    addedDTO.setLastNestedActivity(true);
 	} else {
+	    // If unknown/unsupported activity
 	    addedDTO = new PedagogicalPlannerActivityDTO(null, activity.getTitle(), false,
 		    PedagogicalPlannerAction.PATH_ACTIVITY_NO_PLANNER_SUPPORT, activity.getLibraryActivityUiImage(),
 		    null, null);
@@ -545,51 +433,119 @@
 	return addedDTO;
     }
 
+    /**
+     * Starts a lesson preview, both in sequence chooser and in template base.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+    public ActionForward startPreview(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
+
+	Long learningDesignID = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID, true);
+	if (learningDesignID == null) {
+	    Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID);
+	    PedagogicalPlannerSequenceNode node = getPedagogicalPlannerDAO().getByUid(nodeUid);
+	    ActionMessages errors = new ActionMessages();
+	    LearningDesign learningDesign = importLearningDesign(node.getFileUuid(), node.getFileName(), errors);
+	    if (!errors.isEmpty()) {
+		ActionMessage error = (ActionMessage) errors.get().next();
+		String errorMessage = getMessageService().getMessage(error.getKey());
+		throw new ServletException(errorMessage);
+	    }
+	    learningDesignID = learningDesign.getLearningDesignId();
+	}
+	HttpSession session = SessionManager.getSession();
+	UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
+
+	// Start preview the same way as in authoring
+	PedagogicalPlannerAction.log.debug("Opening preview for learnind design id: " + learningDesignID);
+	Lesson lesson = getMonitoringService().initializeLessonForPreview("Preview", null, learningDesignID,
+		userDto.getUserID(), null, false, false, false);
+	getMonitoringService().createPreviewClassForLesson(userDto.getUserID(), lesson.getLessonId());
+
+	getMonitoringService().startLesson(lesson.getLessonId(), userDto.getUserID());
+	String newPath = mapping.findForward(PedagogicalPlannerAction.FORWARD_PREVIEW).getPath();
+	newPath = newPath + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_LESSON_ID
+		+ PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId();
+	return new ActionForward(newPath, true);
+    }
+
+    /**
+     * Reads UID of the node and goes straight to
+     * {@link #openSequenceNode(ActionMapping, ActionForm, HttpServletRequest, Long)}
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     * @throws ServletException
+     */
     public ActionForward openSequenceNode(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true);
 	return openSequenceNode(mapping, form, request, nodeUid);
     }
 
+    /**
+     * Opens a sequence node and fill the necessary data into DTO and form.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param nodeUid
+     * @return
+     * @throws ServletException
+     */
     public ActionForward openSequenceNode(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    Long nodeUid) throws ServletException {
+	// Only SysAdmin can open the editor
 	Boolean isSysAdmin = request.isUserInRole(Role.SYSADMIN);
 	Boolean edit = WebUtil.readBooleanParam(request, CentralConstants.PARAM_EDIT, false);
 	edit &= isSysAdmin;
-
+	// Do we display the root (top) node or an existing one
 	PedagogicalPlannerSequenceNode node = null;
 	if (nodeUid == null) {
 	    node = getPedagogicalPlannerDAO().getRootNode();
 	} else {
 	    node = getPedagogicalPlannerDAO().getByUid(nodeUid);
 	    if (!edit && node.getFileUuid() != null) {
+		// If we are not in the edit mode and we open a node containing a template, then we open the template
 		return openTemplate(mapping, form, request, node.getFileUuid(), node.getFileName());
 	    }
 	}
+	PedagogicalPlannerAction.log.debug("Opening sequence node with UID: " + nodeUid);
+
+	// Fill the DTO
 	List<String[]> titlePath = getPedagogicalPlannerDAO().getTitlePath(node);
 	PedagogicalPlannerSequenceNodeDTO dto = new PedagogicalPlannerSequenceNodeDTO(node, titlePath);
 
+	// Additional DTO parameters
 	Boolean createSubnode = WebUtil.readBooleanParam(request, CentralConstants.PARAM_CREATE_SUBNODE, false);
+	Boolean importNode = WebUtil.readBooleanParam(request, CentralConstants.PARAM_IMPORT_NODE, false);
 	dto.setCreateSubnode(createSubnode);
 	dto.setEdit(edit);
 	dto.setIsSysAdmin(isSysAdmin);
+	dto.setImportNode(importNode);
 
 	request.setAttribute(CentralConstants.ATTR_NODE, dto);
 
 	if (edit) {
+	    // If we are in edit mode, the node form is displayed, requiring additional parameters
 	    PedagogicalPlannerSequenceNodeForm nodeForm = (PedagogicalPlannerSequenceNodeForm) form;
-	    nodeForm.setNodeType(node.getFileName() == null ? PedagogicalPlannerSequenceNodeForm.NODE_TYPE_SUBNODES
-		    : PedagogicalPlannerSequenceNodeForm.NODE_TYPE_TEMPLATE);
-	    nodeForm.setRemoveFile(false);
-	    nodeForm.setTitle(dto.getTitle());
-	    nodeForm.setBriefDescription(dto.getBriefDescription());
-	    nodeForm.setFullDescription(dto.getFullDescription());
-	    nodeForm.setFileUuid(node.getFileUuid());
 
 	    if (createSubnode) {
-		if (node.getParent() == null) {
+		// We create a new node, rather than edit the existing one
+		if (node.getContentFolderId() == null) {
 		    try {
-			String contentFolderId = getAuthoringService().generateUniqueContentFolder();
+			// If it's a new top level node, we create an uniuqe ID
+			String contentFolderId = FileUtil.generateUniqueContentFolderID();
 			nodeForm.setContentFolderId(contentFolderId);
 		    } catch (Exception e) {
 			PedagogicalPlannerAction.log.error(e);
@@ -602,20 +558,42 @@
 			return openSequenceNode(mapping, form, request, (Long) null);
 		    }
 		} else {
-		    nodeForm.setContentFolderId(node.getParent().getContentFolderId());
+		    // Whole node tree share the same content folder ID
+		    nodeForm.setContentFolderId(node.getContentFolderId());
 		}
+	    } else if (!importNode) {
+		// We fill the form with necessary data
+		nodeForm.setNodeType(node.getFileName() == null ? PedagogicalPlannerSequenceNodeForm.NODE_TYPE_SUBNODES
+			: PedagogicalPlannerSequenceNodeForm.NODE_TYPE_TEMPLATE);
+		nodeForm.setRemoveFile(false);
+		nodeForm.setTitle(dto.getTitle());
+		nodeForm.setBriefDescription(dto.getBriefDescription());
+		nodeForm.setFullDescription(dto.getFullDescription());
+		nodeForm.setFileUuid(node.getFileUuid());
 	    }
 	}
 	return mapping.findForward(PedagogicalPlannerAction.FORWARD_SEQUENCE_CHOOSER);
     }
 
+    /**
+     * Saves the created/edited sequence node.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     * @throws ServletException
+     */
     public ActionForward saveSequenceNode(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true);
 	PedagogicalPlannerSequenceNode node = null;
 	PedagogicalPlannerSequenceNodeForm nodeForm = (PedagogicalPlannerSequenceNodeForm) form;
 
 	if (nodeUid == null) {
+	    // It's a new subnode
 	    node = new PedagogicalPlannerSequenceNode();
 	    Long parentUid = nodeForm.getParentUid() == 0 ? null : nodeForm.getParentUid();
 	    if (parentUid != null) {
@@ -624,10 +602,13 @@
 	    }
 	    node.setOrder(getPedagogicalPlannerDAO().getNextOrderId(parentUid));
 	} else {
+	    // It's an existing node
 	    node = getPedagogicalPlannerDAO().getByUid(nodeUid);
 	    nodeUid = node.getUid();
 	}
+	PedagogicalPlannerAction.log.debug("Saving sequence node with UID: " + nodeUid);
 
+	// If anything goes wrong, we need to put back these values
 	String title = nodeForm.getTitle();
 	String briefDescription = nodeForm.getBriefDescription();
 	String fullDescription = nodeForm.getFullDescription();
@@ -640,6 +621,7 @@
 		node.setBriefDescription(briefDescription);
 		node.setContentFolderId(nodeForm.getContentFolderId());
 
+		// Different properties are set, depending on node type: with subnodes or template
 		if (PedagogicalPlannerSequenceNodeForm.NODE_TYPE_SUBNODES.equals(nodeForm.getNodeType())) {
 		    if (node.getFileUuid() != null) {
 			getContentHandler().deleteFile(node.getFileUuid());
@@ -652,22 +634,35 @@
 		    node.setFileName(null);
 		    node.setFileUuid(null);
 		    node.setFullDescription(null);
-		} else if (nodeForm.getFile() != null) {
+		} else if (nodeForm.getFile() != null && nodeForm.getFile().getFileSize() > 0) {
 		    FormFile file = nodeForm.getFile();
 		    InputStream inputStream = file.getInputStream();
 		    String fileName = file.getFileName();
 		    String type = file.getContentType();
+
+		    PedagogicalPlannerAction.log.debug("Uploading to repository file: " + fileName);
+		    // Upload to repository
 		    NodeKey nodeKey = getContentHandler().uploadFile(inputStream, fileName, type,
 			    IToolContentHandler.TYPE_OFFLINE);
 		    if (node.getFileUuid() != null) {
 			getContentHandler().deleteFile(node.getFileUuid());
 		    }
+
+		    // If there were subnodes, we delete them now
+		    Iterator<PedagogicalPlannerSequenceNode> subnodeIter = node.getSubnodes().iterator();
+		    while (subnodeIter.hasNext()) {
+			PedagogicalPlannerSequenceNode subnode = subnodeIter.next();
+			subnodeIter.remove();
+			getPedagogicalPlannerDAO().removeNode(subnode);
+		    }
+
 		    node.setFileUuid(nodeKey.getUuid());
 		    node.setFileName(fileName);
 		    node.setFullDescription(null);
 		}
 
 		getPedagogicalPlannerDAO().saveOrUpdateNode(node);
+		// If it was a new subnode, we need to retrieved the assigned UID
 		nodeUid = node.getUid();
 
 	    } catch (RepositoryCheckedException e) {
@@ -676,11 +671,15 @@
 		PedagogicalPlannerAction.log.error(e);
 	    }
 	}
+
+	// If something went wrong and the new subnode was not saved,
+	// we need to inform the following method of that fact
 	boolean createSubnode = false;
 	if (nodeUid == null) {
 	    nodeUid = node.getParent() == null ? null : node.getParent().getUid();
 	    createSubnode = true;
 	}
+	// Set the parameters, but do not return yet
 	openSequenceNode(mapping, form, request, nodeUid);
 
 	if (!errors.isEmpty()) {
@@ -698,44 +697,75 @@
 	return mapping.findForward(PedagogicalPlannerAction.FORWARD_SEQUENCE_CHOOSER);
     }
 
+    /**
+     * Validates node form fields.
+     * 
+     * @param node
+     * @param form
+     * @return
+     */
     private ActionMessages validateNodeForm(PedagogicalPlannerSequenceNode node, PedagogicalPlannerSequenceNodeForm form) {
 	ActionMessages errors = new ActionMessages();
+	// Title must not be blank
 	if (StringUtils.isEmpty(form.getTitle())) {
 	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
 		    PedagogicalPlannerAction.ERROR_KEY_NODE_TITLE_BLANK));
 	}
+	// Template must a proper file
 	if (PedagogicalPlannerSequenceNodeForm.NODE_TYPE_TEMPLATE.equals(form.getNodeType())
 		&& node.getFileName() == null) {
-	    if (form.getFile() == null || form.getFile().getFileSize() == 0) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-			PedagogicalPlannerAction.ERROR_KEY_FILE_EMPTY));
-	    } else {
-		String fileName = form.getFile().getFileName();
-		boolean badExtension = false;
-		if (fileName.length() >= 4) {
-		    String extension = fileName.substring(fileName.length() - 4);
-		    if (!(extension.equalsIgnoreCase(PedagogicalPlannerAction.FILE_EXTENSION_LAS) || extension
-			    .equalsIgnoreCase(PedagogicalPlannerAction.FILE_EXTENSION_ZIP))) {
-			badExtension = true;
-		    }
-		} else {
+	    errors.add(validateFormFile(form));
+	}
+	return errors;
+    }
+
+    /**
+     * Validates form file. Used both for templates and exported nodes.
+     * 
+     * @param form
+     * @return
+     */
+    private ActionMessages validateFormFile(PedagogicalPlannerSequenceNodeForm form) {
+	ActionMessages errors = new ActionMessages();
+	if (form.getFile() == null || form.getFile().getFileSize() == 0) {
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(PedagogicalPlannerAction.ERROR_KEY_FILE_EMPTY));
+	} else {
+	    String fileName = form.getFile().getFileName();
+	    boolean badExtension = false;
+	    if (fileName.length() >= 4) {
+		String extension = fileName.substring(fileName.length() - 4);
+		if (!(extension.equalsIgnoreCase(PedagogicalPlannerAction.FILE_EXTENSION_LAS) || extension
+			.equalsIgnoreCase(PedagogicalPlannerAction.FILE_EXTENSION_ZIP))) {
 		    badExtension = true;
 		}
-		if (badExtension) {
-		    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-			    PedagogicalPlannerAction.ERROR_KEY_FILE_BAD_EXTENSION));
-		}
-
+	    } else {
+		badExtension = true;
 	    }
+	    if (badExtension) {
+		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+			PedagogicalPlannerAction.ERROR_KEY_FILE_BAD_EXTENSION));
+	    }
 	}
 	return errors;
     }
 
+    /**
+     * Removes the selected node and all of its subnodes
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     * @throws ServletException
+     */
     public ActionForward removeSequenceNode(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID);
 	PedagogicalPlannerSequenceNode node = getPedagogicalPlannerDAO().getByUid(nodeUid);
 	Long parentUid = node.getParent() == null ? null : node.getParent().getUid();
+	PedagogicalPlannerAction.log.debug("Removing sequence node with UID" + nodeUid);
 	getPedagogicalPlannerDAO().removeNode(node);
 	return openSequenceNode(mapping, form, request, parentUid);
     }
@@ -767,11 +797,359 @@
 	return openSequenceNode(mapping, form, request, parentUid);
     }
 
-    private File copyFileFromRepository(Long fileUuid, String fileName) throws RepositoryCheckedException, IOException {
-	InputStream inputStream = getContentHandler().getFileNode(fileUuid).getFile();
-	File file = new File(FileUtil.TEMP_DIR, fileName);
-	FileOutputStream fileOutputStream = new FileOutputStream(file);
-	byte[] data = new byte[1024];
+    /**
+     * Exports the selected node to a ZIP file. Method is based on a similar one for exporting learning designs.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     * @throws IOException
+     */
+    public ActionForward exportNode(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException, IOException {
+	Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID);
+	ActionMessages errors = new ActionMessages();
+
+	PedagogicalPlannerAction.log.debug("Exporting sequence node with UID" + nodeUid);
+	String zipFilePath = null;
+	// Different browsers handle stream downloads differently LDEV-1243
+	String filename = null;
+	try {
+	    zipFilePath = exportNode(nodeUid);
+
+	    // get only filename
+	    String zipfile = FileUtil.getFileName(zipFilePath);
+
+	    // replace spaces (" ") with underscores ("_")
+
+	    zipfile = zipfile.replaceAll(" ", "_");
+
+	    // write zip file as response stream.
+
+	    filename = FileUtil.encodeFilenameForDownload(request, zipfile);
+
+	    PedagogicalPlannerAction.log.debug("Final filename to export: " + filename);
+
+	    response.setContentType(PedagogicalPlannerAction.RESPONSE_CONTENT_TYPE_DOWNLOAD);
+	    // response.setContentType("application/zip");
+	    response.setHeader(PedagogicalPlannerAction.HEADER_CONTENT_DISPOSITION, "attachment;filename=" + filename);
+	} catch (Exception e) {
+	    PedagogicalPlannerAction.log.error(e);
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(PedagogicalPlannerAction.ERROR_KEY_EXPORT));
+	    saveErrors(request, errors);
+	    return openSequenceNode(mapping, form, request, nodeUid);
+	}
+	InputStream in = null;
+	ServletOutputStream out = null;
+	try {
+	    in = new BufferedInputStream(new FileInputStream(zipFilePath));
+	    out = response.getOutputStream();
+	    int count = 0;
+
+	    int ch;
+	    while ((ch = in.read()) != -1) {
+		out.write((char) ch);
+		count++;
+	    }
+	    PedagogicalPlannerAction.log.debug("Wrote out " + count + " bytes");
+	    response.setContentLength(count);
+	    out.flush();
+	} finally {
+	    /*
+	     * If anything goes wrong, we can not display it nicely for the user. Once response.getOutputStream() was
+	     * called to write the file data, we can not forward to a JSP page anymore. Maybe there is a way to avoid
+	     * it, but currently we are simply throwing an error. So no "catch" clause.
+	     */
+	    if (in != null) {
+		in.close(); // very important
+	    }
+	}
+	return null;
+    }
+
+    /**
+     * The proper method for exporting nodes.
+     * 
+     * @param nodeUid
+     * @return
+     * @throws ZipFileUtilException
+     * @throws FileUtilException
+     * @throws IOException
+     * @throws RepositoryCheckedException
+     */
+    private String exportNode(Long nodeUid) throws ZipFileUtilException, FileUtilException, IOException,
+	    RepositoryCheckedException {
+	if (nodeUid != null) {
+
+	    String rootDir = FileUtil.createTempDirectory(PedagogicalPlannerAction.EXPORT_NODE_FOLDER_SUFFIX);
+	    String contentDir = FileUtil.getFullPath(rootDir, PedagogicalPlannerAction.DIR_CONTENT);
+	    FileUtil.createDirectory(contentDir);
+
+	    String nodeFileName = FileUtil.getFullPath(contentDir, PedagogicalPlannerAction.NODE_FILE_NAME);
+	    Writer nodeFile = new OutputStreamWriter(new FileOutputStream(nodeFileName),
+		    PedagogicalPlannerAction.ENCODING_UTF_8);
+
+	    PedagogicalPlannerSequenceNode node = getPedagogicalPlannerDAO().getByUid(nodeUid);
+	    // exporting XML
+	    XStream designXml = new XStream();
+	    designXml.toXML(node, nodeFile);
+	    nodeFile.close();
+
+	    PedagogicalPlannerAction.log.debug("Node xml export success");
+
+	    // Copy templates' ZIP files from repository
+	    File templateDir = new File(contentDir, PedagogicalPlannerAction.DIR_TEMPLATES);
+	    exportSubnodeTemplates(node, templateDir);
+
+	    // create zip file for fckeditor unique content folder
+	    String targetZipFileName = PedagogicalPlannerAction.EXPORT_NODE_CONTENT_ZIP_PREFIX
+		    + node.getContentFolderId() + PedagogicalPlannerAction.FILE_EXTENSION_ZIP;
+	    String secureDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator
+		    + FileUtil.LAMS_WWW_DIR + File.separator + FileUtil.LAMS_WWW_SECURE_DIR;
+	    String nodeContentDir = FileUtil.getFullPath(secureDir, node.getContentFolderId());
+
+	    if (!FileUtil.isEmptyDirectory(nodeContentDir, true)) {
+		PedagogicalPlannerAction.log.debug("Create export node content target zip file. File name is "
+			+ targetZipFileName);
+		ZipFileUtil.createZipFile(targetZipFileName, nodeContentDir, contentDir);
+	    } else {
+		PedagogicalPlannerAction.log.debug("No such directory (or empty directory): " + nodeContentDir);
+	    }
+
+	    // zip file name with full path
+	    targetZipFileName = PedagogicalPlannerAction.EXPORT_NODE_ZIP_PREFIX + node.getTitle()
+		    + PedagogicalPlannerAction.FILE_EXTENSION_ZIP;
+	    ;
+	    PedagogicalPlannerAction.log
+		    .debug("Create export node content zip file. File name is " + targetZipFileName);
+	    // create zip file and return zip full file name
+	    return ZipFileUtil.createZipFile(targetZipFileName, contentDir, rootDir);
+	}
+	return null;
+    }
+
+    /**
+     * Imports a zipped node. Thi method is based on a similar one for importing learning designs.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+    public ActionForward importNode(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
+
+	PedagogicalPlannerSequenceNodeForm nodeForm = (PedagogicalPlannerSequenceNodeForm) form;
+	ActionMessages errors = validateFormFile(nodeForm);
+
+	if (errors.isEmpty()) {
+	    try {
+		String uploadPath = FileUtil.createTempDirectory(PedagogicalPlannerAction.DIR_UPLOADED_NODE_SUFFIX);
+		String fileName = nodeForm.getFile().getFileName();
+		File importFile = new File(uploadPath + fileName);
+		PedagogicalPlannerAction.log.debug("Importing a node from file: " + fileName);
+
+		// Copy the submitted file to the hard drive
+		InputStream inputStream = nodeForm.getFile().getInputStream();
+		copyFileFromRepository(inputStream, importFile);
+
+		nodeForm.setFile(null);
+
+		String rootPath = ZipFileUtil.expandZip(new FileInputStream(importFile), fileName);
+		String nodeFilePath = FileUtil.getFullPath(rootPath, PedagogicalPlannerAction.NODE_FILE_NAME);
+
+		PedagogicalPlannerSequenceNode node = (PedagogicalPlannerSequenceNode) FileUtil.getObjectFromXML(null,
+			nodeFilePath);
+
+		// begin fckeditor content folder import
+		String contentZipFileName = PedagogicalPlannerAction.EXPORT_NODE_CONTENT_ZIP_PREFIX
+			+ node.getContentFolderId() + PedagogicalPlannerAction.FILE_EXTENSION_ZIP;
+		String secureDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator
+			+ FileUtil.LAMS_WWW_DIR + File.separator + FileUtil.LAMS_WWW_SECURE_DIR + File.separator
+			+ node.getContentFolderId();
+		File contentZipFile = new File(FileUtil.getFullPath(rootPath, contentZipFileName));
+
+		// unzip file to target secure dir if exists
+		if (contentZipFile.exists()) {
+		    InputStream is = new FileInputStream(contentZipFile);
+		    ZipFileUtil.expandZipToFolder(is, secureDir);
+		}
+
+		// Upload the template files back into the repository
+		File templateDir = new File(rootPath, PedagogicalPlannerAction.DIR_TEMPLATES);
+		importSubnodeTemplates(node, templateDir);
+
+		// The imported node is added as the last one
+		Integer order = getPedagogicalPlannerDAO().getNextOrderId(null);
+		node.setOrder(order);
+		getPedagogicalPlannerDAO().saveOrUpdateNode(node);
+	    } catch (Exception e) {
+		PedagogicalPlannerAction.log.error(e);
+		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(PedagogicalPlannerAction.ERROR_KEY_IMPORT));
+	    }
+	}
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	}
+	return openSequenceNode(mapping, form, request, (Long) null);
+    }
+
+    /**
+     * Imports a learning design for edit/preview template purposes.
+     * 
+     * @param fileUuid
+     * @param fileName
+     * @param errors
+     * @return
+     * @throws ServletException
+     */
+    private LearningDesign importLearningDesign(Long fileUuid, String fileName, ActionMessages errors)
+	    throws ServletException {
+	File designFile = null;
+	try {
+	    designFile = new File(FileUtil.TEMP_DIR, fileName);
+	    InputStream inputStream = getContentHandler().getFileNode(fileUuid).getFile();
+	    copyFileFromRepository(inputStream, designFile);
+	} catch (Exception e) {
+	    PedagogicalPlannerAction.log.error(e);
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(PedagogicalPlannerAction.ERROR_KEY_FILE_OPEN));
+	    return null;
+	}
+	if (!designFile.exists() || designFile.isDirectory()) {
+	    PedagogicalPlannerAction.log.error(PedagogicalPlannerAction.ERROR_NOT_PROPER_FILE);
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(PedagogicalPlannerAction.ERROR_KEY_FILE_OPEN));
+	    return null;
+	}
+
+	HttpSession session = SessionManager.getSession();
+	UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
+	User user = (User) getUserManagementService().findById(User.class, userDto.getUserID());
+	if (user == null) {
+	    throw new ServletException(PedagogicalPlannerAction.ERROR_USER_NOT_FOUND);
+	}
+	List<String> toolsErrorMsgs = new ArrayList<String>();
+	Long learningDesignID = null;
+	LearningDesign learningDesign = null;
+	List<String> learningDesignErrorMsgs = new ArrayList<String>();
+	// Extract the template
+
+	try {
+	    Object[] ldResults = getExportService().importLearningDesign(designFile, user, null, toolsErrorMsgs, "");
+	    designFile.delete();
+	    learningDesignID = (Long) ldResults[0];
+	    learningDesignErrorMsgs = (List<String>) ldResults[1];
+	    toolsErrorMsgs = (List<String>) ldResults[2];
+	    learningDesign = getAuthoringService().getLearningDesign(learningDesignID);
+	} catch (ImportToolContentException e) {
+	    PedagogicalPlannerAction.log.error(e);
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+		    PedagogicalPlannerAction.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
+
+	}
+
+	if ((learningDesignID == null || learningDesignID.longValue() == -1) && learningDesignErrorMsgs.size() == 0) {
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+		    PedagogicalPlannerAction.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
+	    return null;
+	}
+	if (learningDesignErrorMsgs.size() > 0) {
+	    for (String error : learningDesignErrorMsgs) {
+		PedagogicalPlannerAction.log.error(error);
+	    }
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+		    PedagogicalPlannerAction.ERROR_KEY_LEARNING_DESIGN_COULD_NOT_BE_RETRIEVED));
+	    return null;
+	}
+	if (toolsErrorMsgs.size() > 0) {
+	    for (String error : toolsErrorMsgs) {
+		PedagogicalPlannerAction.log.error(error);
+	    }
+	    errors
+		    .add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+			    PedagogicalPlannerAction.ERROR_KEY_TOOL_ERRORS));
+	    return null;
+	}
+	return learningDesign;
+    }
+
+    /**
+     * Copies the template files from repository into the selected dir.
+     * 
+     * @param node
+     * @param outputDir
+     * @throws RepositoryCheckedException
+     * @throws IOException
+     */
+    private void exportSubnodeTemplates(PedagogicalPlannerSequenceNode node, File outputDir)
+	    throws RepositoryCheckedException, IOException {
+	if (node != null) {
+	    if (node.getFileUuid() == null) {
+		if (node.getSubnodes() != null) {
+		    for (PedagogicalPlannerSequenceNode subnode : node.getSubnodes()) {
+			exportSubnodeTemplates(subnode, outputDir);
+		    }
+		}
+	    } else {
+		File uuidDir = new File(outputDir, node.getFileUuid().toString());
+		uuidDir.mkdirs();
+		File targetFile = new File(uuidDir, node.getFileName());
+		InputStream inputStream = getContentHandler().getFileNode(node.getFileUuid()).getFile();
+		PedagogicalPlannerAction.log.debug("Preparing for zipping the template file: " + node.getFileName());
+		copyFileFromRepository(inputStream, targetFile);
+	    }
+	}
+    }
+
+    /**
+     * Uploads the templates back into repository. Also sets all the nodes' UIDs to NULL.
+     * 
+     * @param node
+     * @param inputDir
+     * @throws RepositoryCheckedException
+     * @throws IOException
+     */
+    private void importSubnodeTemplates(PedagogicalPlannerSequenceNode node, File inputDir)
+	    throws RepositoryCheckedException, IOException {
+	if (node != null) {
+	    node.setUid(null);
+
+	    if (node.getFileUuid() == null) {
+		if (node.getSubnodes() != null) {
+		    for (PedagogicalPlannerSequenceNode subnode : node.getSubnodes()) {
+			importSubnodeTemplates(subnode, inputDir);
+		    }
+		}
+	    } else {
+		File uuidDir = new File(inputDir, node.getFileUuid().toString());
+		File file = new File(uuidDir, node.getFileName());
+		InputStream inputStream = new FileInputStream(file);
+		String fileName = node.getFileName();
+		PedagogicalPlannerAction.log.debug("Uploading into repository a template file: " + fileName);
+		NodeKey nodeKey = getContentHandler().uploadFile(inputStream, fileName,
+			PedagogicalPlannerAction.RESPONSE_CONTENT_TYPE_DOWNLOAD, IToolContentHandler.TYPE_OFFLINE);
+		node.setFileUuid(nodeKey.getUuid());
+	    }
+	}
+    }
+
+    /**
+     * Copies a file using the provided input stream.
+     * 
+     * @param inputStream
+     * @param targetFile
+     * @throws RepositoryCheckedException
+     * @throws IOException
+     */
+    private void copyFileFromRepository(InputStream inputStream, File targetFile) throws RepositoryCheckedException,
+	    IOException {
+
+	FileOutputStream fileOutputStream = new FileOutputStream(targetFile);
+	byte[] data = new byte[PedagogicalPlannerAction.FILE_COPY_BUFFER_SIZE];
 	int read = 0;
 	do {
 	    read = inputStream.read(data);
@@ -781,9 +1159,104 @@
 	} while (read > 0);
 	fileOutputStream.close();
 	inputStream.close();
-	return file;
     }
 
+    /*----------------------- GROUPING METHODS -------------------------*/
+
+    /**
+     * Fill the grouping with initial data
+     */
+    public ActionForward initGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	PedagogicalPlannerGroupingForm plannerForm = (PedagogicalPlannerGroupingForm) form;
+	Long groupingId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Grouping grouping = getAuthoringService().getGroupingById(groupingId);
+	plannerForm.fillForm(grouping);
+	return mapping.findForward(CentralConstants.FORWARD_GROUPING);
+    }
+
+    /**
+     * Saves parameters of the grouping form, depending on the grouping type.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward saveOrUpdateGroupingForm(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	PedagogicalPlannerAction.log.debug("Saving grouping activity");
+	PedagogicalPlannerGroupingForm plannerForm = (PedagogicalPlannerGroupingForm) form;
+	ActionMessages errors = plannerForm.validate();
+	if (errors.isEmpty()) {
+	    Grouping grouping = getAuthoringService().getGroupingById(plannerForm.getToolContentID());
+	    if (grouping.isRandomGrouping()) {
+		RandomGrouping randomGrouping = (RandomGrouping) grouping;
+		Integer number = StringUtils.isEmpty(plannerForm.getNumberOfGroups()) ? null : Integer
+			.parseInt(plannerForm.getNumberOfGroups());
+		randomGrouping.setNumberOfGroups(number);
+
+		number = StringUtils.isEmpty(plannerForm.getLearnersPerGroup()) ? null : Integer.parseInt(plannerForm
+			.getLearnersPerGroup());
+		randomGrouping.setLearnersPerGroup(number);
+	    } else if (grouping.isLearnerChoiceGrouping()) {
+		LearnerChoiceGrouping learnerChoiceGrouping = (LearnerChoiceGrouping) grouping;
+		Integer number = StringUtils.isEmpty(plannerForm.getNumberOfGroups()) ? null : Integer
+			.parseInt(plannerForm.getNumberOfGroups());
+		learnerChoiceGrouping.setNumberOfGroups(number);
+
+		number = StringUtils.isEmpty(plannerForm.getLearnersPerGroup()) ? null : Integer.parseInt(plannerForm
+			.getLearnersPerGroup());
+		learnerChoiceGrouping.setLearnersPerGroup(number);
+		learnerChoiceGrouping.setEqualNumberOfLearnersPerGroup(plannerForm.getEqualGroupSizes());
+		learnerChoiceGrouping.setViewStudentsBeforeSelection(plannerForm.getViewStudentsBeforeSelection());
+	    } else {
+		Integer number = StringUtils.isEmpty(plannerForm.getNumberOfGroups()) ? null : Integer
+			.parseInt(plannerForm.getNumberOfGroups());
+		grouping.setMaxNumberOfGroups(number);
+	    }
+	} else {
+	    saveMessages(request, errors);
+	}
+	return mapping.findForward(CentralConstants.FORWARD_GROUPING);
+    }
+
+    /*-------------------------- TEMPLATE BASE METHODS -----------------*/
+
+    /**
+     * Saves additional, non tool-bound template details - currently only the title.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     */
+    public ActionForward saveSequenceDetails(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException {
+	PedagogicalPlannerAction.log.debug("Saving sequence title");
+	String sequenceTitle = WebUtil.readStrParam(request, CentralConstants.PARAM_SEQUENCE_TITLE, true);
+	Long learningDesignID = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID);
+	Integer callAttemptedID = WebUtil.readIntParam(request, CentralConstants.PARAM_CALL_ATTEMPTED_ID);
+	// We send a message in format "<response>&<call ID>"; it is then parsed in JavaScript
+	String responseSuffix = PedagogicalPlannerAction.CHAR_AMPERSAND + callAttemptedID;
+
+	if (StringUtils.isEmpty(sequenceTitle)) {
+	    String blankTitleError = getMessageService().getMessage(CentralConstants.ERROR_PLANNER_TITLE_BLANK);
+	    writeAJAXResponse(response, blankTitleError + responseSuffix);
+	} else {
+	    LearningDesign learningDesign = getAuthoringService().getLearningDesign(learningDesignID);
+	    learningDesign.setTitle(sequenceTitle);
+	    getAuthoringService().saveLearningDesign(learningDesign);
+	    writeAJAXResponse(response, PedagogicalPlannerAction.STRING_OK + responseSuffix);
+	}
+	return null;
+    }
+
+    /*------------------------ SERVICE ACCESS METHODS --------------------*/
+
     private IExportToolContentService getExportService() {
 	if (PedagogicalPlannerAction.exportService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
===================================================================
diff -u -r00a6e145b37916eb1561ea5c68319b0fc691681b -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java	(.../PedagogicalPlannerGroupingForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java	(.../PedagogicalPlannerGroupingForm.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -41,6 +41,7 @@
     private String numberOfGroups;
     private String learnersPerGroup;
     private Boolean equalGroupSizes;
+    private Boolean viewStudentsBeforeSelection;
 
     public Integer getGroupingTypeId() {
 	return groupingTypeId;
@@ -87,6 +88,7 @@
 		setLearnersPerGroup(number);
 
 		setEqualGroupSizes(learnerChoiceGrouping.getEqualNumberOfLearnersPerGroup());
+		setViewStudentsBeforeSelection(learnerChoiceGrouping.getViewStudentsBeforeSelection());
 	    } else {
 		String numberOfGroups = grouping.getMaxNumberOfGroups() == null ? null : String.valueOf(grouping
 			.getMaxNumberOfGroups());
@@ -136,4 +138,12 @@
     public void setEqualGroupSizes(Boolean equalGroupsSizes) {
 	equalGroupSizes = equalGroupsSizes;
     }
+
+    public Boolean getViewStudentsBeforeSelection() {
+	return viewStudentsBeforeSelection;
+    }
+
+    public void setViewStudentsBeforeSelection(Boolean viewStudentsBeforeSelection) {
+	this.viewStudentsBeforeSelection = viewStudentsBeforeSelection;
+    }
 }
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java	(.../PedagogicalPlannerSequenceNodeForm.java)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java	(.../PedagogicalPlannerSequenceNodeForm.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -27,6 +27,9 @@
 import org.apache.struts.upload.FormFile;
 
 public class PedagogicalPlannerSequenceNodeForm extends ActionForm {
+    public final static String NODE_TYPE_SUBNODES = "subnodes";
+    public final static String NODE_TYPE_TEMPLATE = "template";
+
     private Long uid;
     private Long parentUid;
     private String contentFolderId;
@@ -35,12 +38,9 @@
     private String fullDescription;
     private FormFile file;
     private Boolean removeFile;
-    private String nodeType;
+    private String nodeType = PedagogicalPlannerSequenceNodeForm.NODE_TYPE_SUBNODES;
     private Long fileUuid;
 
-    public final static String NODE_TYPE_SUBNODES = "subnodes";
-    public final static String NODE_TYPE_TEMPLATE = "template";
-
     public Long getUid() {
 	return uid;
     }
Index: lams_central/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u
--- lams_central/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(revision 0)
+++ lams_central/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
+	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
+		<name>editor</name>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
+			<name>width</name>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
+			<name>height</name>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
+	</tag>
+</taglib>
\ No newline at end of file
Fisheye: Tag 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef refers to a dead (removed) revision in file `lams_central/web/WEB-INF/jstl/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rbdd916337e3a48589da367f4c8b7705fe3197af2 -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision bdd916337e3a48589da367f4c8b7705fe3197af2)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -294,6 +294,11 @@
 
    </servlet>
    <servlet>
+      <servlet-name>GetRecordingServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.GetRecordingServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>copyMultipleToolContent</servlet-name>
       <servlet-class>org.lamsfoundation.lams.authoring.web.CopyMultipleToolContentServlet</servlet-class>
 
@@ -493,6 +498,10 @@
       <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>GetRecordingServlet</servlet-name>
+      <url-pattern>/GetRecording</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>copyMultipleToolContent</servlet-name>
       <url-pattern>/servlet/authoring/copyMultipleToolContent</url-pattern>
    </servlet-mapping>
Index: lams_central/web/includes/javascript/pedagogicalPlanner.js
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -138,7 +138,7 @@
   	if (sequenceDetailsValid &&  activitiesValid==activitiesResponded){
   	   	$('#pedagogicalPlannerInfoArea').show();
   	   	if (actionAfterCompleted==ACTION_PREVIEW){
-  	   		window.open(startPreviewUrl,'Preview','width=800,height=600,scrollbars=yes,resizable=yes');
+  	   		startPreview(startPreviewUrl);
   	   	}
   	   	else if (actionAfterCompleted==ACTION_OPEN_AUTHOR){
   	   		 window.resizeTo(authoring_width,authoring_height);
@@ -154,6 +154,10 @@
    }
   }
   
+  function startPreview(url){
+  	window.open(url,'Preview','width=800,height=600,scrollbars=yes,resizable=yes');
+  }
+  
   function closePlanner(text){
 	 if (text==null || confirm(text)){
 	 	window.close();
@@ -179,4 +183,6 @@
   		document.getElementById("fullDescriptionArea").style.display="none";
   		document.getElementById("fileArea").style.display="block";
   	}
+  	
+  	
   }  
\ No newline at end of file
Index: lams_central/web/pedagogical_planner/grouping.jsp
===================================================================
diff -u -r5a30100855d83534e76db8dec0d0b603a1a1ded8 -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/web/pedagogical_planner/grouping.jsp	(.../grouping.jsp)	(revision 5a30100855d83534e76db8dec0d0b603a1a1ded8)
+++ lams_central/web/pedagogical_planner/grouping.jsp	(.../grouping.jsp)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -14,6 +14,10 @@
 <lams:head>
 	<lams:css style="core" />
 	<style type="text/css">
+		table {
+			width: 570px;
+			margin-top: 30px;
+		}
 		table td {
 			padding: 5px;
 		}
@@ -36,7 +40,7 @@
 	
 	<html:hidden property="groupingTypeId" />
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<table style="width: 570px; margin-top: 30px" cellpadding="0" cellspacing="0">
+	<table cellpadding="0" cellspacing="0">
 		<tr>
 			<td style="width: 30%">
 				<h2><fmt:message key="label.planner.grouping.type" /></h2>
@@ -77,15 +81,27 @@
 				</tr>
 			</c:otherwise>
 		</c:choose>
-		<c:if test="${(formBean.groupingTypeId eq 4) and (empty formBean.learnersPerGroup)}">
+		<c:if test="${formBean.groupingTypeId eq 4}">
+			<c:if test="${empty formBean.learnersPerGroup}">
+				<tr>
+					<td>
+						<h2>
+							<fmt:message key="label.planner.grouping.equal.group.size" />
+						</h2>
+					</td>
+					<td>
+						<html:checkbox property="equalGroupSizes" />
+					</td>
+				</tr>
+			</c:if>
 			<tr>
 				<td>
 					<h2>
-						<fmt:message key="label.planner.grouping.equal.group.size" />
+						<fmt:message key="label.planner.grouping.view.students" />
 					</h2>
 				</td>
 				<td>
-					<html:checkbox property="equalGroupSizes"></html:checkbox>
+					<html:checkbox property="viewStudentsBeforeSelection" />
 				</td>
 			</tr>
 		</c:if>
Index: lams_central/web/pedagogical_planner/sequenceChooser.jsp
===================================================================
diff -u -r5a30100855d83534e76db8dec0d0b603a1a1ded8 -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_central/web/pedagogical_planner/sequenceChooser.jsp	(.../sequenceChooser.jsp)	(revision 5a30100855d83534e76db8dec0d0b603a1a1ded8)
+++ lams_central/web/pedagogical_planner/sequenceChooser.jsp	(.../sequenceChooser.jsp)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -20,14 +20,19 @@
 <body class="stripes">
 <div id="page">
 <div id="content">
+	<%-- We might need to alter that for RTL layout --%>
 	<h1 style="text-align: center" class="small-space-top"><fmt:message key="planner.title" /></h1>
+	
+	<%-- Errors are displayed at the top of the page --%>
 	<logic:messagesPresent> 
 		<p class="warning">
 			<html:messages id="error">
 		       <c:out value="${error}" escapeXml="false"/><br/>
 		    </html:messages>
 	    </p>
 	</logic:messagesPresent>
+	
+	<%-- List of the existing nodes --%>
 	<table>
 		<tr>
 			<td colspan="2">
@@ -37,8 +42,9 @@
 					<c:param name="method" value="openSequenceNode" />
 					<c:param name="edit" value="${node.edit}" />
 				</c:url>
-				<%-- Always add root node --%>
+				<%-- Always add root node at the beginning --%>
 				<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">
@@ -48,6 +54,8 @@
 					</c:url>
 					<a href="${titleUrl}"><c:out value='${title[1]}' escapeXml='true' /></a> &gt;
 				</c:forEach>
+				
+				<%-- Add title (but no link) of the current node at the end --%>
 				<c:out value='${node.title}' escapeXml='true' />
 			
 				<%-- Title and full description of the node --%>
@@ -64,7 +72,10 @@
 				
 			</td>
 		</tr>
+		
+		<%-- List of subnodes --%>
 		<c:choose>
+			<%-- If the list of subnodes is empty, we display only a message --%>
 			<c:when test="${empty node.subnodes}">
 				<tr>
 					<td colspan="2" class="align-center">
@@ -80,6 +91,7 @@
 							<%-- Cell with icons (info or actions like remove node)  --%>
 							<c:choose>
 								<c:when test="${node.edit}">
+									<%-- If we are in the edit mode, we display remove and move up/down images --%>
 									<c:url value="/pedagogicalPlanner.do" var="removeNodeUrl">
 										<c:param name="method" value="removeSequenceNode" />
 										<c:param name="edit" value="true" />
@@ -115,14 +127,21 @@
 									</c:if>
 								</c:when>
 								<c:otherwise>
+									<%-- If we are not in the edit mode and the node leads to a template rather then subnodes,
+										we display an icon --%>
 									<c:if test="${not empty subnode.fileName}">
-										<img src="<lams:LAMSURL/>images/circle_filled.gif" title="<fmt:message key="msg.planner.open.template" />" />
+										<c:url var="startPreviewUrl" value="/pedagogicalPlanner.do">
+											<c:param name="method" value="startPreview" />
+											<c:param name="uid" value="${subnode.uid}" />
+										</c:url>
+										<a class="button" href="javascript:startPreview('${startPreviewUrl}')" 
+										   title="<fmt:message key="msg.planner.open.template" />"><fmt:message key="button.planner.preview" /></a>
 									</c:if>
 								</c:otherwise>
 							</c:choose>
 						</td>
 						<td>
-							<%-- Link to node and its brief description  --%>
+							<%-- Link to the subnode and its brief description below --%>
 							<c:url value="/pedagogicalPlanner.do" var="subnodeUrl">
 								<c:param name="method" value="openSequenceNode" />		
 								<c:param name="edit" value="${node.edit}" />
@@ -147,17 +166,37 @@
 			
 			<%-- Do we edit the current node or create a subnode? --%>
 			<c:choose>
+				<%-- Import node form --%>
+				<c:when test="${node.importNode}">
+					<h2 class="align-center">
+						<fmt:message key="title.import" />
+					</h2>
+					<p>
+						<fmt:message key="label.planner.import.instruction" />
+					</p>
+					<html:form styleId="nodeForm" styleClass="space-left" action="/pedagogicalPlanner" method="post" enctype="multipart/form-data">
+						<c:set var="formBean"  value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+						<input type="hidden" id="method" name="method" value="importNode" />
+						<input type="hidden" name="edit" value="true" />
+						<input type="hidden" name="importNode" value="true" />
+						<html:file property="file" size="115"/>
+						<input style="margin: 0px 0px 20px 10px;" type="submit" value="<fmt:message key="button.import" />" class="button" />
+					</html:form>
+				</c:when>
+				<%-- If the node is locked i.e. comes with LAMS distribution, we do not allow editing --%>
 				<c:when test="${not node.createSubnode and (isRootNode or node.locked)}">
 					<h3 class="align-center"><fmt:message key="msg.planner.node.locked" /></h3>
 				</c:when>
 				<c:otherwise>
 					<html:form styleId="nodeForm" styleClass="space-left" action="/pedagogicalPlanner" method="post" enctype="multipart/form-data">
 						<c:set var="formBean"  value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-						<input type="hidden" id="method" name="method" value="saveSequenceNode" />
-						<input type="hidden" id="edit" name="edit" value="true" />
+						<input type="hidden" name="method" value="saveSequenceNode" />
+						<input type="hidden" name="edit" value="true" />
 						<html:hidden property="contentFolderId"/>
 						
 						<c:choose>
+							<%-- If we are in the create subnode mode,
+								the node we edit is actually the new subnode rather the parent node itself --%>
 							<c:when test="${node.createSubnode}">
 								<input type="hidden" id="parentUid" name="parentUid" value="${node.uid}" />
 								<h2 class="align-center"><fmt:message key="label.planner.create.subnode" /></h2>
@@ -183,7 +222,12 @@
 						<html:radio property="nodeType" styleId="hasSubnodesType" onchange="javascript:onNodeTypeChange()" value="subnodes"><fmt:message key="label.planner.node.type.subnodes" /></html:radio><br />
 						<html:radio property="nodeType" onchange="onNodeTypeChange()" value="template"><fmt:message key="label.planner.node.type.template" /></html:radio>
 						
+						<%-- DIVs below are displayed/hidden depending of the subnode type:
+							 containing subnodes or opening a template --%>
 						<c:set var="hasSubnodesType" value="${formBean.nodeType eq 'subnodes'}" />
+						
+						
+						<%-- DIV with full description FCKeditor --%>
 						<div id="fullDescriptionArea" class="space-bottom"
 							<c:if test="${not hasSubnodesType}">
 								style="display: none;"
@@ -197,6 +241,8 @@
 				                width="820px" displayExpanded="false">
 							</lams:FCKEditor>
 						</div>
+						
+						<%-- DIV with "Browse" button to find the template --%>
 						<div id="fileArea" class="space-top"
 							<c:if test="${hasSubnodesType}">
 								style="display: none;"
@@ -227,6 +273,8 @@
 					</html:form>
 				</c:otherwise>
 			</c:choose>
+			
+			<%-- Buttons below --%>
 			<div id="buttonArea" class="space-top">
 				<c:url value="/pedagogicalPlanner.do" var="closeNodeEditorUrl">
 					<c:param name="method" value="openSequenceNode" />
@@ -252,6 +300,22 @@
 					</c:url>
 					<a class="button pedagogicalPlannerButtons" href="javascript:leaveNodeEditor(null,'${createSubnodeUrl}');"><fmt:message key="label.planner.create.subnode" /></a>
 				</c:if>
+				<c:if test="${empty node.parentUid and not empty node.uid and not node.createSubnode}">
+					<c:url value="/pedagogicalPlanner.do" var="exportNodeUrl">
+						<c:param name="method" value="exportNode" />
+						<c:param name="edit" value="true" />
+						<c:param name="uid" value="${node.uid}" />
+					</c:url>
+					<a class="button pedagogicalPlannerButtons" href="javascript:leaveNodeEditor(null,'${exportNodeUrl}');"><fmt:message key="label.planner.export" /></a>
+				</c:if>
+				<c:if test="${isRootNode}">
+					<c:url value="/pedagogicalPlanner.do" var="importNodeUrl">
+						<c:param name="method" value="openSequenceNode" />
+						<c:param name="edit" value="true" />
+						<c:param name="importNode" value="true" />
+					</c:url>
+					<a class="button pedagogicalPlannerButtons" href="javascript:leaveNodeEditor(null,'${importNodeUrl}');"><fmt:message key="label.planner.import" /></a>
+				</c:if>
 				<c:if test="${node.createSubnode or not isRootNode }">
 					<a class="button pedagogicalPlannerButtons" href="javascript:document.getElementById('nodeForm').submit()"><fmt:message key="button.planner.save.node" /></a>
 				</c:if>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml	(.../PedagogicalPlannerSequenceNode.hbm.xml)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml	(.../PedagogicalPlannerSequenceNode.hbm.xml)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -111,6 +111,14 @@
             column="file_uuid"
         />
 
+        <property
+            name="contentFolderId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="content_folder_id"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-PedagogicalPlannerSequenceNode.xml
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java
===================================================================
diff -u -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -25,15 +25,14 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.HashSet;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.strategy.ToolActivityStrategy;
-import org.lamsfoundation.lams.learningdesign.CompetenceMapping;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.LessonClass;
 import org.lamsfoundation.lams.tool.GroupedToolSession;
@@ -46,309 +45,247 @@
  * @author Manpreet Minhas
  * @hibernate.class
  */
-public class ToolActivity extends SimpleActivity implements Serializable
-{
-    
-	private static Logger log = Logger.getLogger(ToolActivity.class);
+public class ToolActivity extends SimpleActivity implements Serializable {
 
-	/** Holds value of property toolContentId. */
+    private static Logger log = Logger.getLogger(ToolActivity.class);
+
+    /** Holds value of property toolContentId. */
     private Long toolContentId;
-    
-    /** Holds value of property tool.*/
+
+    /** Holds value of property tool. */
     private Tool tool;
-    
+
     /** List of sessions associated with this ToolActivity */
     private Set toolSessions;
-    
+
     private Set<CompetenceMapping> competenceMappings;
-       
+
     /** full constructor */
-    public ToolActivity(Long activityId,
-            Integer id,
-            String description,
-            String title,
-            Integer xcoord,
-            Integer ycoord,
-            Integer orderId,
-            Boolean defineLater,
-            java.util.Date createDateTime,
-            LearningLibrary learningLibrary,
-            Activity parentActivity,
-            Activity libraryActivity,
-			Integer parentUIID,
-            LearningDesign learningDesign,
-            Grouping grouping,
-            Integer activityTypeId,
-            Transition transitionTo,
-            Transition transitionFrom,
-            String languageFile,
-            Boolean stopAfterActivity,
-			Set inputActivities,
-            Tool tool,
-            Long toolContentId,
-            Set branchActivityEntries,
-            Set competenceMappings)
-    {
-        super(activityId,
-                id,
-                description,
-                title,
-                xcoord,
-                ycoord,
-                orderId,
-                defineLater,
-                createDateTime,
-                learningLibrary,
-                parentActivity,
-				libraryActivity,
-				parentUIID,
-                learningDesign,
-                grouping,
-                activityTypeId,
-                transitionTo,
-				transitionFrom,
-				languageFile,
-                stopAfterActivity,
-    			inputActivities,
-    			branchActivityEntries);
-        this.tool = tool;
-        this.toolContentId = toolContentId;
-        this.competenceMappings = competenceMappings;
-        super.simpleActivityStrategy = new ToolActivityStrategy(this);
+    public ToolActivity(Long activityId, Integer id, String description, String title, Integer xcoord, Integer ycoord,
+	    Integer orderId, Boolean defineLater, java.util.Date createDateTime, LearningLibrary learningLibrary,
+	    Activity parentActivity, Activity libraryActivity, Integer parentUIID, LearningDesign learningDesign,
+	    Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom,
+	    String languageFile, Boolean stopAfterActivity, Set inputActivities, Tool tool, Long toolContentId,
+	    Set branchActivityEntries, Set competenceMappings) {
+	super(activityId, id, description, title, xcoord, ycoord, orderId, defineLater, createDateTime,
+		learningLibrary, parentActivity, libraryActivity, parentUIID, learningDesign, grouping, activityTypeId,
+		transitionTo, transitionFrom, languageFile, stopAfterActivity, inputActivities, branchActivityEntries);
+	this.tool = tool;
+	this.toolContentId = toolContentId;
+	this.competenceMappings = competenceMappings;
+	super.simpleActivityStrategy = new ToolActivityStrategy(this);
     }
-    
+
     /** default constructor */
-    public ToolActivity(){
-    	super.simpleActivityStrategy = new ToolActivityStrategy(this);
+    public ToolActivity() {
+	super.simpleActivityStrategy = new ToolActivityStrategy(this);
     }
-    
+
     /** minimal constructor */
-    public ToolActivity(Long activityId,
-            Boolean defineLater,
-            java.util.Date createDateTime,
-            org.lamsfoundation.lams.learningdesign.LearningLibrary learningLibrary,
-            org.lamsfoundation.lams.learningdesign.Activity parentActivity,
-            org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign,
-            org.lamsfoundation.lams.learningdesign.Grouping grouping,
-            Integer activityTypeId,
-            Transition transitionTo,
-            Transition transitionFrom,
-            Tool tool,
-            Long toolContentId)
-    {
-        super(activityId,
-                defineLater,
-                createDateTime,
-                learningLibrary,
-                parentActivity,
-                learningDesign,
-                grouping,
-                activityTypeId,
-                transitionTo,
-				transitionFrom);
-        this.tool = tool;
-        this.toolContentId = toolContentId;
-        super.simpleActivityStrategy = new ToolActivityStrategy(this);
+    public ToolActivity(Long activityId, Boolean defineLater, java.util.Date createDateTime,
+	    org.lamsfoundation.lams.learningdesign.LearningLibrary learningLibrary,
+	    org.lamsfoundation.lams.learningdesign.Activity parentActivity,
+	    org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign,
+	    org.lamsfoundation.lams.learningdesign.Grouping grouping, Integer activityTypeId, Transition transitionTo,
+	    Transition transitionFrom, Tool tool, Long toolContentId) {
+	super(activityId, defineLater, createDateTime, learningLibrary, parentActivity, learningDesign, grouping,
+		activityTypeId, transitionTo, transitionFrom);
+	this.tool = tool;
+	this.toolContentId = toolContentId;
+	super.simpleActivityStrategy = new ToolActivityStrategy(this);
     }
-    
+
     /**
-     * Makes a copy of the ToolActivity for authoring, preview and monitoring enviornment 
+     * Makes a copy of the ToolActivity for authoring, preview and monitoring enviornment
      * 
      * @return ToolActivity Returns a deep-copy of the originalActivity
      */
-    public Activity createCopy(int uiidOffset){    	
-    	ToolActivity newToolActivity = new ToolActivity();
-    	copyToNewActivity(newToolActivity, uiidOffset);
-		newToolActivity.setTool(this.getTool());
-		newToolActivity.setToolContentId(this.getToolContentId());  
-		
-		Set<CompetenceMapping> newCompetenceMappings = new HashSet();
-		for (CompetenceMapping compMap : this.competenceMappings)
-		{
-			CompetenceMapping newComp = new CompetenceMapping();
-			newComp.setCompetence(compMap.getCompetence());
-			newComp.setToolActivity(compMap.getToolActivity());
-			newCompetenceMappings.add(compMap);
-		}
-		newToolActivity.setCompetenceMappings(newCompetenceMappings);
-		
-    	return newToolActivity;
-    }    
-    
+    @Override
+    public Activity createCopy(int uiidOffset) {
+	ToolActivity newToolActivity = new ToolActivity();
+	copyToNewActivity(newToolActivity, uiidOffset);
+	newToolActivity.setTool(this.getTool());
+	newToolActivity.setToolContentId(this.getToolContentId());
+
+	Set<CompetenceMapping> newCompetenceMappings = new HashSet();
+	if (competenceMappings != null) {
+	    for (CompetenceMapping compMap : competenceMappings) {
+		CompetenceMapping newComp = new CompetenceMapping();
+		newComp.setCompetence(compMap.getCompetence());
+		newComp.setToolActivity(compMap.getToolActivity());
+		newCompetenceMappings.add(compMap);
+	    }
+	}
+	newToolActivity.setCompetenceMappings(newCompetenceMappings);
+
+	return newToolActivity;
+    }
+
     /**
-     * Factory method to create a new tool session for a single user when he is
-     * running current activity. Does not check to see if a tool session already exists.
+     * Factory method to create a new tool session for a single user when he is running current activity. Does not check
+     * to see if a tool session already exists.
      * <p>
-     * If the activity has groupingSupportType = GROUPING_SUPPORT_NONE then
-     * a new tool session is created for each learner.
+     * If the activity has groupingSupportType = GROUPING_SUPPORT_NONE then a new tool session is created for each
+     * learner.
      * <p>
-     * If the activity has groupingSupportType = GROUPING_SUPPORT_REQUIRED 
-     * then a new tool session is created for each group of learners. It will fall back
-     * to a class group if no grouping is found - the user interface should not
+     * If the activity has groupingSupportType = GROUPING_SUPPORT_REQUIRED then a new tool session is created for each
+     * group of learners. It will fall back to a class group if no grouping is found - the user interface should not
      * have allowed this!
      * <p>
-     * If the activity has groupingSupportType = GROUPING_SUPPORT_OPTIONAL 
-     * then a new tool session is created for each group of learners. If no grouping
-     * is available then a whole of class group is created.
+     * If the activity has groupingSupportType = GROUPING_SUPPORT_OPTIONAL then a new tool session is created for each
+     * group of learners. If no grouping is available then a whole of class group is created.
      * <p>
-     * If groupingSupportType is not set then defaults to GROUPING_SUPPORT_NONE.
-     * If for some reason a grouped session if also does the equivalent of GROUPING_SUPPORT_NONE.
-     * This way the system will still function, if not as expected!
+     * If groupingSupportType is not set then defaults to GROUPING_SUPPORT_NONE. If for some reason a grouped session if
+     * also does the equivalent of GROUPING_SUPPORT_NONE. This way the system will still function, if not as expected!
      * <p>
-     * @param learner the user who should be using this tool session.
+     * 
+     * @param learner
+     *                the user who should be using this tool session.
      * @return the new tool session.
      */
-    public ToolSession createToolSessionForActivity(User learner,Lesson lesson)
-    {
-    	Date now = new Date(System.currentTimeMillis());
-    	Integer supportType = getGroupingSupportType();
-    	ToolSession session = null;
+    public ToolSession createToolSessionForActivity(User learner, Lesson lesson) {
+	Date now = new Date(System.currentTimeMillis());
+	Integer supportType = getGroupingSupportType();
+	ToolSession session = null;
 
-    	if ( supportType != null && 
-    			( supportType.intValue() == GROUPING_SUPPORT_REQUIRED || supportType.intValue() == GROUPING_SUPPORT_OPTIONAL ) ) {
+	if (supportType != null
+		&& (supportType.intValue() == Activity.GROUPING_SUPPORT_REQUIRED || supportType.intValue() == Activity.GROUPING_SUPPORT_OPTIONAL)) {
 
-	    	// Both cases create a small group if a grouping exists, otherwise creates a class group.
-	    	Group learners = null;
-	        if( getApplyGrouping().booleanValue()) {
-	        	learners = this.getGroupFor(learner);
-			} 
-	        
-	    	if ( supportType.intValue() == GROUPING_SUPPORT_REQUIRED && learners == null ) {
-	    		log.error("Activity "+getActivityId()
-	    				+" requires grouping (groupingSupportType=GROUPING_SUPPORT_REQUIRED) but no grouping was available. "
-	    				+" applyGrouping = "+getApplyGrouping()
-	    				+" grouping = "+getGrouping()
-	    				+". Falling back to a class grouping.");
-	    	}
-	
-	    	if ( learners == null || learners.isNull()) {
-				LessonClass lessonClass = lesson.getLessonClass();
-				learners = this.getGroupFor(learner, lessonClass);
-			}
-	    	
-	        if ( learners != null && ! learners.isNull() ) {
-	        	session = new GroupedToolSession(this,
-	                    now,
-	                    ToolSession.STARTED_STATE,
-	                    learners,
-	                    lesson);
-	        } else {
-	        	log.error("Unable to get the group for a new tool session for Activity "+getActivityId()
-	        			+" Falling back to one learner per session."
-	        			+" Learner "+learner
-	        			+", lesson is "+lesson);
-	        }
-    	}
-    	
-    	if ( session == null ) {
-	    	// Either GROUPING_SUPPORT_NONE was selected, supportType == null or the grouped tool sessions could not be created.
-	    	// So create one session per user.
-            session = new NonGroupedToolSession(this,
-                    now,
-                    ToolSession.STARTED_STATE,
-                    learner,
-                    lesson);
-    	}
+	    // Both cases create a small group if a grouping exists, otherwise creates a class group.
+	    Group learners = null;
+	    if (getApplyGrouping().booleanValue()) {
+		learners = this.getGroupFor(learner);
+	    }
 
-    	return session;
+	    if (supportType.intValue() == Activity.GROUPING_SUPPORT_REQUIRED && learners == null) {
+		ToolActivity.log
+			.error("Activity "
+				+ getActivityId()
+				+ " requires grouping (groupingSupportType=GROUPING_SUPPORT_REQUIRED) but no grouping was available. "
+				+ " applyGrouping = " + getApplyGrouping() + " grouping = " + getGrouping()
+				+ ". Falling back to a class grouping.");
+	    }
+
+	    if (learners == null || learners.isNull()) {
+		LessonClass lessonClass = lesson.getLessonClass();
+		learners = this.getGroupFor(learner, lessonClass);
+	    }
+
+	    if (learners != null && !learners.isNull()) {
+		session = new GroupedToolSession(this, now, ToolSession.STARTED_STATE, learners, lesson);
+	    } else {
+		ToolActivity.log
+			.error("Unable to get the group for a new tool session for Activity " + getActivityId()
+				+ " Falling back to one learner per session." + " Learner " + learner + ", lesson is "
+				+ lesson);
+	    }
+	}
+
+	if (session == null) {
+	    // Either GROUPING_SUPPORT_NONE was selected, supportType == null or the grouped tool sessions could not be
+	    // created.
+	    // So create one session per user.
+	    session = new NonGroupedToolSession(this, now, ToolSession.STARTED_STATE, learner, lesson);
+	}
+
+	return session;
     }
-    
-    public String toString()
-    {
-        return new ToStringBuilder(this)
-        .append("activityId", getActivityId())
-        .toString();
+
+    @Override
+    public String toString() {
+	return new ToStringBuilder(this).append("activityId", getActivityId()).toString();
     }
-    
+
     /**
      * Getter for property toolContentId.
+     * 
      * @return Value of property toolContentId.
      */
-    public Long getToolContentId()
-    {
-        
-        return this.toolContentId;
+    public Long getToolContentId() {
+
+	return toolContentId;
     }
-    
+
     /**
      * Setter for property toolContentId.
-     * @param toolContentId New value of property toolContentId.
+     * 
+     * @param toolContentId
+     *                New value of property toolContentId.
      */
-    public void setToolContentId(Long toolContentId)
-    {
-        
-        this.toolContentId = toolContentId;
+    public void setToolContentId(Long toolContentId) {
+
+	this.toolContentId = toolContentId;
     }
-    
+
     /**
      * Getter for property tool.
+     * 
      * @return Value of property tool.
      */
-    public Tool getTool()
-    {
-        
-        return this.tool;
+    public Tool getTool() {
+
+	return tool;
     }
-    
+
     /**
      * Setter for property tool.
-     * @param tool New value of property tool.
+     * 
+     * @param tool
+     *                New value of property tool.
      */
-    public void setTool(Tool tool)
-    {
-        
-        this.tool = tool;
+    public void setTool(Tool tool) {
+
+	this.tool = tool;
     }
-    
-	/**
-	 * @return Returns the toolSessions.
-	 */
-	public Set getToolSessions() {
-		if ( toolSessions == null ) {
-			setToolSessions(new TreeSet(new ActivityOrderComparator()));
-		}
-		return toolSessions;
-	}
-	/**
-	 * @param toolSessions The toolSessions to set.
-	 */
-	public void setToolSessions(Set toolSessions) {
-		this.toolSessions = toolSessions;
-	}
-	
-	/**
-	 * 
-	 * @return
-	 */
-	public Set<CompetenceMapping> getCompetenceMappings() {
-		return competenceMappings;
-	}
 
-	/**
-	 * 
-	 * @param competenceMappings
-	 */
-	public void setCompetenceMappings(Set<CompetenceMapping> competenceMappings) {
-		this.competenceMappings = competenceMappings;
+    /**
+     * @return Returns the toolSessions.
+     */
+    public Set getToolSessions() {
+	if (toolSessions == null) {
+	    setToolSessions(new TreeSet(new ActivityOrderComparator()));
 	}
+	return toolSessions;
+    }
 
-	/**
+    /**
+     * @param toolSessions
+     *                The toolSessions to set.
+     */
+    public void setToolSessions(Set toolSessions) {
+	this.toolSessions = toolSessions;
+    }
+
+    /**
+     * 
+     * @return
+     */
+    public Set<CompetenceMapping> getCompetenceMappings() {
+	return competenceMappings;
+    }
+
+    /**
+     * 
+     * @param competenceMappings
+     */
+    public void setCompetenceMappings(Set<CompetenceMapping> competenceMappings) {
+	this.competenceMappings = competenceMappings;
+    }
+
+    /**
      * @see org.lamsfoundation.lams.util.Nullable#isNull()
      */
-    public boolean isNull()
-    {
-        return false;
-    }    
-    
+    public boolean isNull() {
+	return false;
+    }
 
-	/** 
-	 * Get all the tool activities in this activity. Called by Activity.getAllToolActivities()
-	 * As we are a tool activity, just add ourself.
-	 */
-	protected void getToolActivitiesInActivity(SortedSet toolActivities) {
-        toolActivities.add(this);
-	}
-	
-	
-	
+    /**
+     * Get all the tool activities in this activity. Called by Activity.getAllToolActivities() As we are a tool
+     * activity, just add ourself.
+     */
+    @Override
+    protected void getToolActivitiesInActivity(SortedSet toolActivities) {
+	toolActivities.add(this);
+    }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -rc4bbe0b084234edffd2c0c43dce7d7b1fbf14863 -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision c4bbe0b084234edffd2c0c43dce7d7b1fbf14863)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -34,7 +34,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
@@ -140,7 +139,6 @@
 import org.springframework.context.ApplicationContextAware;
 
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
 
 /**
@@ -1341,7 +1339,7 @@
 	    String fullFilePath = FileUtil.getFullPath(learningDesignPath,
 		    ExportToolContentService.LEARNING_DESIGN_FILE_NAME);
 	    checkImportVersion(fullFilePath, toolsErrorMsgs);
-	    LearningDesignDTO ldDto = (LearningDesignDTO) getObjectFromXML(null, fullFilePath);
+	    LearningDesignDTO ldDto = (LearningDesignDTO) FileUtil.getObjectFromXML(null, fullFilePath);
 	    log.debug("Learning design xml deserialize to LearingDesignDTO success.");
 
 	    // begin tool import
@@ -1456,97 +1454,6 @@
 
     }
 
-    /**
-     * Call xstream to get the POJOs from the XML file. To make it backwardly compatible we catch any exceptions due to
-     * added fields, remove the field using the ToolContentVersionFilter functionality and try to reparse. We can't
-     * nominate the problem fields in advance as we are making XML created by newer versions of LAMS compatible with an
-     * older version.
-     * 
-     * This logic depends on the exception message containing the text. When we upgrade xstream, we must check that this
-     * message doesn't change.
-     * 
-     * <pre>
-     * 	com.thoughtworks.xstream.converters.ConversionException: unknownField : unknownField
-     * 	---- Debugging information ----
-     * 	required-type       : org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO 
-     * 	cause-message       : unknownField : unknownField 
-     * 	class               : org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO 
-     * 	message             : unknownField : unknownField 
-     * 	line number         : 15 
-     * 	path                : /org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO/unknownField 
-     * 	cause-exception     : com.thoughtworks.xstream.alias.CannotResolveClassException 
-     * 	-------------------------------
-     * </pre>
-     */
-    private Object getObjectFromXML(XStream xStream, String fullFilePath) throws JDOMException, IOException {
-
-	Reader file = null;
-	XStream conversionXml = xStream != null ? xStream : new XStream();
-	ConversionException finalException = null;
-	String lastFieldRemoved = "";
-	ToolContentVersionFilter contentFilter = null;
-	// cap the maximum number of retries to 30 - if we add more than 30 new
-	// fields then we need to rethink our
-	// strategy
-	int maxRetries = 30;
-	int numTries = 0;
-
-	while (true) {
-	    try {
-
-		if (numTries > maxRetries) {
-		    break;
-		}
-		numTries++;
-
-		file = new InputStreamReader(new FileInputStream(fullFilePath), "UTF-8");
-		return conversionXml.fromXML(file);
-
-	    } catch (ConversionException ce) {
-		log.debug("Failed import", ce);
-		finalException = ce;
-		file.close();
-
-		if (ce.getMessage() == null) {
-		    // can't retry, so get out of here!
-		    break;
-
-		} else {
-		    // try removing the field from our XML and retry
-		    String message = ce.getMessage();
-		    String classname = extractValue(message, "required-type");
-		    String fieldname = extractValue(message, "message");
-		    if (fieldname == null || fieldname.equals("")
-			    || lastFieldRemoved.equals(classname + "." + fieldname)) {
-			// can't retry, so get out of here!
-			break;
-		    } else {
-			if (contentFilter == null) {
-			    contentFilter = new ToolContentVersionFilter();
-			}
-
-			Class problemClass = getClass(classname);
-			if (problemClass == null) {
-			    // can't retry, so get out of here!
-			    break;
-			}
-
-			contentFilter.removeField(problemClass, fieldname);
-			contentFilter.transformXML(fullFilePath);
-			lastFieldRemoved = classname + "." + fieldname;
-			log.debug("Retrying import after removing field " + fieldname);
-			continue;
-		    }
-		}
-	    } finally {
-		if (file != null) {
-		    file.close();
-		}
-	    }
-	}
-	throw finalException;
-    }
-
     private void checkImportVersion(String fullFilePath, List<String> toolsErrorMsgs) throws FileNotFoundException,
 	    JDOMException {
 
@@ -1574,36 +1481,6 @@
 	}
     }
 
-    private Class getClass(String classname) {
-	try {
-	    return Class.forName(classname);
-	} catch (ClassNotFoundException e) {
-	    log.error("Trying to remove unwanted fields from import but we can't find the matching class " + classname
-		    + ". Aborting retry.", e);
-	    return null;
-	}
-    }
-
-    /**
-     * Extract the class name or field name from a ConversionException message
-     */
-    private String extractValue(String message, String fieldToLookFor) {
-	try {
-	    int startIndex = message.indexOf(fieldToLookFor);
-	    if (startIndex > -1) {
-		startIndex = message.indexOf(":", startIndex + 1);
-		if (startIndex > -1 && startIndex + 2 < message.length()) {
-		    startIndex = startIndex + 2;
-		    int endIndex = message.indexOf(" ", startIndex);
-		    String value = message.substring(startIndex, endIndex);
-		    return value.trim();
-		}
-	    }
-	} catch (ArrayIndexOutOfBoundsException e) {
-	}
-	return "";
-    }
-
     private WorkspaceFolder getWorkspaceFolderForDesign(User importer, Integer workspaceFolderUid)
 	    throws ImportToolContentException {
 	// if workspaceFolderUid == null use the user's default folder
@@ -1664,7 +1541,7 @@
 	    filterClass = null;
 
 	    // read tool file after transform.
-	    toolPOJO = getObjectFromXML(toolXml, toolFilePath);
+	    toolPOJO = FileUtil.getObjectFromXML(toolXml, toolFilePath);
 
 	    // upload file node if has
 	    if (handler != null) {
Index: lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java	(.../PedagogicalPlannerSequenceNode.java)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java	(.../PedagogicalPlannerSequenceNode.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -102,7 +102,7 @@
 	this.fileName = fileName;
     }
 
-    private void setUid(Long uid) {
+    public void setUid(Long uid) {
 	this.uid = uid;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java	(.../PedagogicalPlannerDAOHibernate.java)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java	(.../PedagogicalPlannerDAOHibernate.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -46,7 +46,7 @@
     private static final String FIND_MAX_ORDER_ID = "SELECT MAX(n.order) FROM "
 	    + PedagogicalPlannerSequenceNode.class.getName() + " AS n WHERE n.parent.uid=?";
     private static final String FIND_NEIGHBOUR_NODE = "FROM " + PedagogicalPlannerSequenceNode.class.getName()
-	    + " AS n WHERE n.parent.uid=? AND n.order=?";
+	    + " AS n WHERE ((? IS NULL AND n.parent=NULL) OR  n.parent.uid=?) AND n.order=?";
 
     public PedagogicalPlannerSequenceNode getByUid(Long uid) {
 	return (PedagogicalPlannerSequenceNode) getHibernateTemplate().get(PedagogicalPlannerSequenceNode.class, uid);
@@ -110,8 +110,7 @@
 	Integer order = node.getOrder() + orderDelta;
 	Long parentUid = node.getParent() == null ? null : node.getParent().getUid();
 	return (PedagogicalPlannerSequenceNode) getHibernateTemplate().find(
-		"FROM " + PedagogicalPlannerSequenceNode.class.getName()
-			+ " AS n WHERE ((? IS NULL AND n.parent=NULL) OR  n.parent.uid=?) AND n.order=?",
-		new Object[] { parentUid, parentUid, order }).get(0);
+		PedagogicalPlannerDAOHibernate.FIND_NEIGHBOUR_NODE, new Object[] { parentUid, parentUid, order })
+		.get(0);
     }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java	(.../PedagogicalPlannerSequenceNodeDTO.java)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java	(.../PedagogicalPlannerSequenceNodeDTO.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -42,6 +42,7 @@
     private Boolean edit = false;
     private Boolean createSubnode = false;
     private Boolean isSysAdmin = true;
+    private Boolean importNode = false;
 
     public PedagogicalPlannerSequenceNodeDTO() {
     }
@@ -164,4 +165,12 @@
     public void setIsSysAdmin(Boolean isSysAdmin) {
 	this.isSysAdmin = isSysAdmin;
     }
+
+    public Boolean getImportNode() {
+	return importNode;
+    }
+
+    public void setImportNode(Boolean importNode) {
+	this.importNode = importNode;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
===================================================================
diff -u -r3e9c849ca29692f8c38aaeea0ef638256505ca39 -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef
--- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision 3e9c849ca29692f8c38aaeea0ef638256505ca39)
+++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
@@ -27,13 +27,16 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.channels.FileChannel;
 import java.util.Date;
 import java.util.Properties;
 
+import javax.mail.internet.MimeUtility;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang.StringUtils;
@@ -42,568 +45,720 @@
 import org.hibernate.id.Configurable;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.id.UUIDHexGenerator;
+import org.jdom.JDOMException;
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
-import javax.mail.internet.MimeUtility;
 
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.ConversionException;
+
 /**
  * General File Utilities
  */
 public class FileUtil {
 
-	private static Logger log = Logger.getLogger(FileUtil.class);
-	
-	public static final String LAMS_WWW_SECURE_DIR = "secure";
-	public static final String LAMS_WWW_DIR = "lams-www.war";
-	private static final long numMilliSecondsInADay = 24 * 60 * 60 * 1000;
-	
-	protected static final String prefix = "lamstmp_"; // protected rather than private to suit junit test
-	public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
+    private static Logger log = Logger.getLogger(FileUtil.class);
 
-	/** 
-	 * Deleting a directory using File.delete() only works if
-	 * the directory is empty. This method deletes a directory and 
-	 * all of its contained files.
-	 * 
-	 * This method is not transactional - if it fails to delete some
-	 * contained files or directories, it will continue deleting all 
-	 * the other files in the directory. If only a partial deletion
-	 * is done, then the files and directories that could not be
-	 * deleted are listed in the log file, and the method returns false.
-	 * 
-	 * This method has not been tested in Linux or Unix systems, 
-	 * so the behaviour across symbolic links is unknown.
-	 */
-	public static boolean deleteDirectory(File directory) {
-	    boolean retValue = true;
+    public static final String LAMS_WWW_SECURE_DIR = "secure";
+    public static final String LAMS_WWW_DIR = "lams-www.war";
+    private static final long numMilliSecondsInADay = 24 * 60 * 60 * 1000;
 
-		File[] files = directory.listFiles();
-		if ( files != null ) {
-			for ( int i=0; i<files.length; i++ ) {
-				File file = files[i];
-				if ( file.isDirectory() ) {
-					deleteDirectory(file);
-				} else if ( ! file.delete() ) {
-					log.error("Unable to delete file "+file.getName());
-					retValue = false;
-				}
-			}
+    protected static final String prefix = "lamstmp_"; // protected rather than private to suit junit test
+    public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
+
+    /**
+     * Deleting a directory using File.delete() only works if the directory is empty. This method deletes a directory
+     * and all of its contained files.
+     * 
+     * This method is not transactional - if it fails to delete some contained files or directories, it will continue
+     * deleting all the other files in the directory. If only a partial deletion is done, then the files and directories
+     * that could not be deleted are listed in the log file, and the method returns false.
+     * 
+     * This method has not been tested in Linux or Unix systems, so the behaviour across symbolic links is unknown.
+     */
+    public static boolean deleteDirectory(File directory) {
+	boolean retValue = true;
+
+	File[] files = directory.listFiles();
+	if (files != null) {
+	    for (int i = 0; i < files.length; i++) {
+		File file = files[i];
+		if (file.isDirectory()) {
+		    deleteDirectory(file);
+		} else if (!file.delete()) {
+		    FileUtil.log.error("Unable to delete file " + file.getName());
+		    retValue = false;
 		}
-		if ( directory.delete() ) {
-		    return retValue;
-		} else {
-		    return false;
-		}
+	    }
 	}
-	
-	public static boolean deleteDirectory(String directoryName) throws FileUtilException {
-		boolean isDeleted = false;
-		if (directoryName == null || directoryName.length() == 0)
-			throw new FileUtilException("A directory name must be specified");
-	
-		File dir = new File(directoryName);
-		isDeleted = deleteDirectory(dir);
-		
-		return isDeleted;
-		
-	
+	if (directory.delete()) {
+	    return retValue;
+	} else {
+	    return false;
 	}
-	
-	/** Check if this directory is empty. If checkSubdirectories = true, then it also checks its subdirectories to make sure they aren't empty.
-	 * If checkSubdirectories = true and the directory contains empty subdirectories it will return true.
-	 * If checkSubdirectories = false and the directory contains empty subdirectories it will return false. */
-	public static boolean isEmptyDirectory(String directoryName, boolean checkSubdirectories) throws FileUtilException {
-		
-		if(directoryName == null || directoryName.length() == 0)
-			throw new FileUtilException("A directory name must be specified");
-		
-		return isEmptyDirectory(new File(directoryName), checkSubdirectories);
+    }
 
+    public static boolean deleteDirectory(String directoryName) throws FileUtilException {
+	boolean isDeleted = false;
+	if (directoryName == null || directoryName.length() == 0) {
+	    throw new FileUtilException("A directory name must be specified");
 	}
-	
-	private static boolean isEmptyDirectory(File directory, boolean checkSubdirectories) throws FileUtilException {
-			
-		if(directory.exists()) {
-			File files[] = directory.listFiles();
-	
-			if(files.length > 0) {
-				if ( ! checkSubdirectories ) {
-					return false;
-				} else {
-					boolean isEmpty = true;
-					for ( int i=0; i<files.length && isEmpty; i++) {
-						File file = files[i];
-						isEmpty = file.isDirectory() ? isEmptyDirectory(file, true) : false;
-					}
-					return isEmpty;
-				}
-				
-			} else {
-				return true;
-			}
+
+	File dir = new File(directoryName);
+	isDeleted = deleteDirectory(dir);
+
+	return isDeleted;
+
+    }
+
+    /**
+     * Check if this directory is empty. If checkSubdirectories = true, then it also checks its subdirectories to make
+     * sure they aren't empty. If checkSubdirectories = true and the directory contains empty subdirectories it will
+     * return true. If checkSubdirectories = false and the directory contains empty subdirectories it will return false.
+     */
+    public static boolean isEmptyDirectory(String directoryName, boolean checkSubdirectories) throws FileUtilException {
+
+	if (directoryName == null || directoryName.length() == 0) {
+	    throw new FileUtilException("A directory name must be specified");
+	}
+
+	return isEmptyDirectory(new File(directoryName), checkSubdirectories);
+
+    }
+
+    private static boolean isEmptyDirectory(File directory, boolean checkSubdirectories) throws FileUtilException {
+
+	if (directory.exists()) {
+	    File files[] = directory.listFiles();
+
+	    if (files.length > 0) {
+		if (!checkSubdirectories) {
+		    return false;
+		} else {
+		    boolean isEmpty = true;
+		    for (int i = 0; i < files.length && isEmpty; i++) {
+			File file = files[i];
+			isEmpty = file.isDirectory() ? isEmptyDirectory(file, true) : false;
+		    }
+		    return isEmpty;
 		}
-		
+
+	    } else {
 		return true;
+	    }
 	}
-	
-	/**
-	 * Create a temporary directory with the name in the form
-	 * lamstmp_timestamp_suffix inside the default temporary-file directory 
-	 * for the system.
-	 * This method is protected (rather than private) so that it may be 
-	 * called by the junit tests for this class.
-	 * @param zipFileName
-	 * @return name of the new directory
-	 * @throws ZipFileUtilException if the java io temp directory is not defined,
-	 * or we are unable to calculate a unique name for the expanded directory,
-	 * or an IOException occurs.
-	 */
-	public static String createTempDirectory(String suffix) throws FileUtilException {
-	    
-		String tempSysDirName = TEMP_DIR;
-		if ( tempSysDirName == null )
-			throw new FileUtilException("No temporary directory known to the server. [System.getProperty( \"java.io.tmpdir\" ) returns null. ]\n Cannot upload package.");
-	
-		String tempDirName = tempSysDirName+File.separator
-			+prefix+generateUniqueContentFolderID()+"_"+suffix;
-		File tempDir = new File(tempDirName);
-		// try 100 different variations. If I can't find a unique
-		// one in 100 tries, then give up.
-		int i = 0;
-		while ( tempDir.exists() && i<100) {
-			tempDirName = tempSysDirName+File.separator
-				+prefix+generateUniqueContentFolderID()+"_"+suffix;
-			tempDir = new File(tempDirName);
-			i++;
-		}
-		if ( tempDir.exists() )
-			throw new FileUtilException("Unable to create temporary directory. The temporary filename/directory that we would use to extract files already exists: "
-					+tempDirName);
-		
-		tempDir.mkdirs();
-		return tempDirName;
+
+	return true;
+    }
+
+    /**
+     * Create a temporary directory with the name in the form lamstmp_timestamp_suffix inside the default temporary-file
+     * directory for the system. This method is protected (rather than private) so that it may be called by the junit
+     * tests for this class.
+     * 
+     * @param zipFileName
+     * @return name of the new directory
+     * @throws ZipFileUtilException
+     *                 if the java io temp directory is not defined, or we are unable to calculate a unique name for the
+     *                 expanded directory, or an IOException occurs.
+     */
+    public static String createTempDirectory(String suffix) throws FileUtilException {
+
+	String tempSysDirName = FileUtil.TEMP_DIR;
+	if (tempSysDirName == null) {
+	    throw new FileUtilException(
+		    "No temporary directory known to the server. [System.getProperty( \"java.io.tmpdir\" ) returns null. ]\n Cannot upload package.");
 	}
-	
-	/**
-	 * This method creates a directory with the name <code>directoryName</code>.
-	 * Also creates any necessary parent directories that may not yet exist.
-	 * 
-	 * If the directoryname is null or an empty string, a FileUtilException is thrown
-	 * @param directoryName the name of the directory to create
-	 * @return boolean. Returns true if the directory is created and false otherwise
-	 * @throws FileUtilException if the directory name is null or an empty string
-	 */
-	public static boolean createDirectory(String directoryName) throws FileUtilException
-	{
-		boolean isCreated = false;
-		//check directoryName to see if its empty or null
-		if (directoryName == null || directoryName.length() == 0)
-			throw new FileUtilException("A directory name must be specified");
-	
-		File dir = new File(directoryName);
-		isCreated = dir.exists() ? false : dir.mkdirs();
-		
-		return isCreated;
+
+	String tempDirName = tempSysDirName + File.separator + FileUtil.prefix + generateUniqueContentFolderID() + "_"
+		+ suffix;
+	File tempDir = new File(tempDirName);
+	// try 100 different variations. If I can't find a unique
+	// one in 100 tries, then give up.
+	int i = 0;
+	while (tempDir.exists() && i < 100) {
+	    tempDirName = tempSysDirName + File.separator + FileUtil.prefix + generateUniqueContentFolderID() + "_"
+		    + suffix;
+	    tempDir = new File(tempDirName);
+	    i++;
 	}
-	
-	/**
-     * Creates a subdirectory under the parent directory <code>parentDirName</code>
-     * If the parent or child directory is null, FileUtilException is thrown.
+	if (tempDir.exists()) {
+	    throw new FileUtilException(
+		    "Unable to create temporary directory. The temporary filename/directory that we would use to extract files already exists: "
+			    + tempDirName);
+	}
+
+	tempDir.mkdirs();
+	return tempDirName;
+    }
+
+    /**
+     * This method creates a directory with the name <code>directoryName</code>. Also creates any necessary parent
+     * directories that may not yet exist.
      * 
+     * If the directoryname is null or an empty string, a FileUtilException is thrown
+     * 
+     * @param directoryName
+     *                the name of the directory to create
+     * @return boolean. Returns true if the directory is created and false otherwise
+     * @throws FileUtilException
+     *                 if the directory name is null or an empty string
+     */
+    public static boolean createDirectory(String directoryName) throws FileUtilException {
+	boolean isCreated = false;
+	// check directoryName to see if its empty or null
+	if (directoryName == null || directoryName.length() == 0) {
+	    throw new FileUtilException("A directory name must be specified");
+	}
+
+	File dir = new File(directoryName);
+	isCreated = dir.exists() ? false : dir.mkdirs();
+
+	return isCreated;
+    }
+
+    /**
+     * Creates a subdirectory under the parent directory <code>parentDirName</code> If the parent or child directory
+     * is null, FileUtilException is thrown.
+     * 
      * If the parent directory has not been created yet, it will be created.
      * 
      * 
-	 * @param parentDirName The name of the parent directory in which the subdirectory should be created in
-	 * @param subDirName The name of the subdirectory to create
-	 * @return boolean. Returns true if the subdirectory was created and false otherwise
-	 * @throws FileUtilException if the parent/child directory name is null or empty.
-	 */
-	public static boolean createDirectory(String parentDirName, String subDirName) throws FileUtilException
-	{
-		boolean isSubDirCreated = false;
-		boolean isParentDirCreated;
-	
-		if (parentDirName == null || parentDirName.length()==0 || subDirName == null || subDirName.length() == 0)
-			throw new FileUtilException("A parent or subdirectory name must be specified");
-	
-		File parentDir = new File(parentDirName);
-		if (!parentDir.exists())
-			isParentDirCreated = createDirectory(parentDirName);
-		else
-			isParentDirCreated = true; //parent directory already exists
-		
-		if (trailingForwardSlashPresent(parentDirName)) /* for eg. "parentDirectoryName/" <-- slash at end of name */
-			parentDirName = removeTrailingForwardSlash(parentDirName);
-		
-		//concatenate the two together
-		String combinedDirName = parentDirName + File.separator + subDirName;
-		
-		isSubDirCreated = createDirectory(combinedDirName);
-				
-		return isSubDirCreated && isParentDirCreated;
+     * @param parentDirName
+     *                The name of the parent directory in which the subdirectory should be created in
+     * @param subDirName
+     *                The name of the subdirectory to create
+     * @return boolean. Returns true if the subdirectory was created and false otherwise
+     * @throws FileUtilException
+     *                 if the parent/child directory name is null or empty.
+     */
+    public static boolean createDirectory(String parentDirName, String subDirName) throws FileUtilException {
+	boolean isSubDirCreated = false;
+	boolean isParentDirCreated;
+
+	if (parentDirName == null || parentDirName.length() == 0 || subDirName == null || subDirName.length() == 0) {
+	    throw new FileUtilException("A parent or subdirectory name must be specified");
 	}
-	
-	/**
-	 * If the directory name specified has a slash at the end of it
-	 * such as "directoryName/", then the slash will be removed
-	 * and "directoryName" will be returned. The createDirectory(parentdir, childdir)
-	 * method requires that there is no slash at the end of the directory name.
-	 * @param stringToModify
-	 * @return
-	 */
-	public static String removeTrailingForwardSlash(String stringToModify)
-	{
-		String stringWithoutSlashAtEnd = stringToModify.substring(0, stringToModify.length()-1);
-		return stringWithoutSlashAtEnd;
+
+	File parentDir = new File(parentDirName);
+	if (!parentDir.exists()) {
+	    isParentDirCreated = createDirectory(parentDirName);
+	} else {
+	    isParentDirCreated = true; // parent directory already exists
 	}
-	
-	/**
-	 * Checks to see if there is a slash at the end of the string.
-	 * 
-	 * @param stringToCheck the directoryName to check
-	 * @return boolean. Returns true if there is a slash at the end and false if not.
-	 */
-	public static boolean trailingForwardSlashPresent(String stringToCheck)
-	{
-		int indexOfSlash = stringToCheck.lastIndexOf("/");
-		if (indexOfSlash == (stringToCheck.length()-1))
-			return true;
-		else
-			return false;
+
+	if (trailingForwardSlashPresent(parentDirName)) {
+	    parentDirName = removeTrailingForwardSlash(parentDirName);
 	}
-	
-	public static boolean directoryExist(String directoryToCheck)
-	{
-		File dir = new File(directoryToCheck);
-		return dir.exists();
+
+	// concatenate the two together
+	String combinedDirName = parentDirName + File.separator + subDirName;
+
+	isSubDirCreated = createDirectory(combinedDirName);
+
+	return isSubDirCreated && isParentDirCreated;
+    }
+
+    /**
+     * If the directory name specified has a slash at the end of it such as "directoryName/", then the slash will be
+     * removed and "directoryName" will be returned. The createDirectory(parentdir, childdir) method requires that there
+     * is no slash at the end of the directory name.
+     * 
+     * @param stringToModify
+     * @return
+     */
+    public static String removeTrailingForwardSlash(String stringToModify) {
+	String stringWithoutSlashAtEnd = stringToModify.substring(0, stringToModify.length() - 1);
+	return stringWithoutSlashAtEnd;
+    }
+
+    /**
+     * Checks to see if there is a slash at the end of the string.
+     * 
+     * @param stringToCheck
+     *                the directoryName to check
+     * @return boolean. Returns true if there is a slash at the end and false if not.
+     */
+    public static boolean trailingForwardSlashPresent(String stringToCheck) {
+	int indexOfSlash = stringToCheck.lastIndexOf("/");
+	if (indexOfSlash == stringToCheck.length() - 1) {
+	    return true;
+	} else {
+	    return false;
 	}
-	
-	private static String generateDumpFilename(String id, String extension) throws FileUtilException {
-		// get dump directory name and make sure directory exists
-		String dumpDirectory = Configuration.get(ConfigurationKeys.LAMS_DUMP_DIR);
-		if ( dumpDirectory == null ) {
-			dumpDirectory = TEMP_DIR;
-		}
-		createDirectory(dumpDirectory);
-	
-		String dumpFilename = dumpDirectory+File.separator
-			+id+System.currentTimeMillis()
-			+( extension != null ? "."+extension : "");
-		
-		File dumpFile = new File(dumpFilename);
-		int i = 0;
-		while ( dumpFile.exists() && i < 100 ) {
-			dumpFilename = dumpDirectory+File.separator
-				+id+System.currentTimeMillis()+"_"+i
-				+( extension != null ? "."+extension : "");
-			dumpFile = new File(dumpFilename);
-		}
-		if ( dumpFile.exists() ) {
-			throw new FileUtilException("Unable to create dump file. The filename that we would use already exists: "
-					+dumpFile);
-		}
-		
-		return dumpFilename;
+    }
+
+    public static boolean directoryExist(String directoryToCheck) {
+	File dir = new File(directoryToCheck);
+	return dir.exists();
+    }
+
+    private static String generateDumpFilename(String id, String extension) throws FileUtilException {
+	// get dump directory name and make sure directory exists
+	String dumpDirectory = Configuration.get(ConfigurationKeys.LAMS_DUMP_DIR);
+	if (dumpDirectory == null) {
+	    dumpDirectory = FileUtil.TEMP_DIR;
 	}
-	/** 
-	 * Dump some data to a file in the Dump Directory. The directory is set in the LAMS
-	 * configuration file. These dumps are primarily for support/debugging/problem reporting
-	 * uses.
-	 * 
-	 * If the dump directory is not set, it will revert to the system temp directory.
-	 * 
-	 * Used by the FlashCrashDump servlet initially, may be used by other dump methods in future.
-	 * 
-	 * @param data data to dump
-	 * @param id some identification name for the string. Does not need to be unique. e.g. FLASH_jsmith
-	 * @param extension optional extension to be added to filename e.g. xml. Note: do not include the "." - that
-	 * will be added automatically.
-	 * 
-	 * @author Fiona Malikoff
-	 * @throws FileUtilException 
-	 */
-	public static String createDumpFile(byte[] data, String id, String extension) throws FileUtilException {
-		String dumpFilename = generateDumpFilename(id, extension);
-		OutputStream dumpFile = null;
-		try {
-			dumpFile = new FileOutputStream(dumpFilename);
-			dumpFile.write(data);
-		} catch (IOException e) {
-			log.error("Unable to write dump out byte array to dump file. ID: "+id
-					+" Dump: "+data+" Exception "+e.getMessage(), e);
-			throw new FileUtilException(e);
-		} finally {
-			try {
-				if ( dumpFile != null )
-				dumpFile.close();
-			} catch (IOException e) {
-				log.error("Unable to close dump file. ID: "+id
-						+" Dump: "+data+" Exception "+e.getMessage(), e);
-				throw new FileUtilException(e);
-			}
-		}
-		return dumpFilename;		
+	createDirectory(dumpDirectory);
+
+	String dumpFilename = dumpDirectory + File.separator + id + System.currentTimeMillis()
+		+ (extension != null ? "." + extension : "");
+
+	File dumpFile = new File(dumpFilename);
+	int i = 0;
+	while (dumpFile.exists() && i < 100) {
+	    dumpFilename = dumpDirectory + File.separator + id + System.currentTimeMillis() + "_" + i
+		    + (extension != null ? "." + extension : "");
+	    dumpFile = new File(dumpFilename);
 	}
-	/**
-	 * get file name from a string which may include directory information.
-	 * For example : "c:\\dir\\ndp\\pp.txt"; will return pp.txt.?
-	 * If file has no path infomation, then just return input fileName.
-	 * 
-	 */
-	public static String getFileName(String fileName){
-		if(fileName == null)
-			return "";
-			
-		fileName = fileName.trim();
+	if (dumpFile.exists()) {
+	    throw new FileUtilException("Unable to create dump file. The filename that we would use already exists: "
+		    + dumpFile);
+	}
 
-		int dotPos = fileName.lastIndexOf("/");
-		int dotPos2 = fileName.lastIndexOf("\\");
-		dotPos = Math.max(dotPos,dotPos2);
-		if (dotPos == -1){
-			return fileName;
-		}
-		return fileName.substring(dotPos + 1, fileName.length());
-		
-	}	
-	/** 
-	 * Get file directory info.
-	 * @param fileName with path info.
-	 * @return return only path info with the given fileName
-	 */
-	public static String getFileDirectory(String fileName){
-		if(fileName == null)
-			return "";
-		
-		fileName = fileName.trim();
+	return dumpFilename;
+    }
 
-		int dotPos = fileName.lastIndexOf("/");
-		int dotPos2 = fileName.lastIndexOf("\\");
-		dotPos = Math.max(dotPos,dotPos2);
-		if (dotPos == -1){
-			return "";
+    /**
+     * Dump some data to a file in the Dump Directory. The directory is set in the LAMS configuration file. These dumps
+     * are primarily for support/debugging/problem reporting uses.
+     * 
+     * If the dump directory is not set, it will revert to the system temp directory.
+     * 
+     * Used by the FlashCrashDump servlet initially, may be used by other dump methods in future.
+     * 
+     * @param data
+     *                data to dump
+     * @param id
+     *                some identification name for the string. Does not need to be unique. e.g. FLASH_jsmith
+     * @param extension
+     *                optional extension to be added to filename e.g. xml. Note: do not include the "." - that will be
+     *                added automatically.
+     * 
+     * @author Fiona Malikoff
+     * @throws FileUtilException
+     */
+    public static String createDumpFile(byte[] data, String id, String extension) throws FileUtilException {
+	String dumpFilename = generateDumpFilename(id, extension);
+	OutputStream dumpFile = null;
+	try {
+	    dumpFile = new FileOutputStream(dumpFilename);
+	    dumpFile.write(data);
+	} catch (IOException e) {
+	    FileUtil.log.error("Unable to write dump out byte array to dump file. ID: " + id + " Dump: " + data
+		    + " Exception " + e.getMessage(), e);
+	    throw new FileUtilException(e);
+	} finally {
+	    try {
+		if (dumpFile != null) {
+		    dumpFile.close();
 		}
-		//return the last char is '/'
-		return fileName.substring(0,dotPos+1);
-	
+	    } catch (IOException e) {
+		FileUtil.log.error("Unable to close dump file. ID: " + id + " Dump: " + data + " Exception "
+			+ e.getMessage(), e);
+		throw new FileUtilException(e);
+	    }
 	}
-	/**
-	 * Merge two input parameter into full path and adjust File.separator to 
-	 * OS default separator as well.
-	 * 
-	 * @param path 
-	 * @param file could be file name,or sub directory path.
-	 * @return
-	 */
-	public static String getFullPath(String path, String file){
-		String fullpath;
-		if(path.endsWith(File.separator))
-			fullpath = path + file;
-		else
-			fullpath = path + File.separator + file;
-		
-		return makeCanonicalPath(fullpath);
-		
+	return dumpFilename;
+    }
+
+    /**
+     * get file name from a string which may include directory information. For example : "c:\\dir\\ndp\\pp.txt"; will
+     * return pp.txt.? If file has no path infomation, then just return input fileName.
+     * 
+     */
+    public static String getFileName(String fileName) {
+	if (fileName == null) {
+	    return "";
 	}
-	
-	public static String makeCanonicalPath(String pathfile){
-		if(File.separator.indexOf("\\") != -1)
-			pathfile = pathfile.replaceAll("\\/","\\\\");
-		else
-			pathfile = pathfile.replaceAll("\\\\",File.separator);
-		
-		return pathfile;
+
+	fileName = fileName.trim();
+
+	int dotPos = fileName.lastIndexOf("/");
+	int dotPos2 = fileName.lastIndexOf("\\");
+	dotPos = Math.max(dotPos, dotPos2);
+	if (dotPos == -1) {
+	    return fileName;
 	}
-	
-  public static void copyFile(File in, File out) throws Exception {
-	     FileChannel sourceChannel = new FileInputStream(in).getChannel();
-	     FileChannel destinationChannel = new FileOutputStream(out).getChannel();
-	     sourceChannel.transferTo(0, sourceChannel.size(), destinationChannel);
-	     sourceChannel.close();
-	     destinationChannel.close();
-   }
-	/**
-	 * get file extension name from a String, such as from "textabc.doc", return "doc"
-	 * fileName also can contain directory infomation.
-	 */
-	public static String getFileExtension(String fileName) {
-		if(fileName == null)
-			return "";
-			
-		fileName = fileName.trim();
-		int dotPos = fileName.lastIndexOf(".");
-		if (dotPos == -1)
-			return "";
-		return fileName.substring(dotPos + 1, fileName.length());
+	return fileName.substring(dotPos + 1, fileName.length());
+
+    }
+
+    /**
+     * Get file directory info.
+     * 
+     * @param fileName
+     *                with path info.
+     * @return return only path info with the given fileName
+     */
+    public static String getFileDirectory(String fileName) {
+	if (fileName == null) {
+	    return "";
 	}
-	
-	/**
-	 * Check whether file is executable according to its extenstion and executable extension name list from LAMS configuaration.
-	 * @param filename
-	 * @return
-	 */
-	  public static boolean isExecutableFile(String filename){
-		  String extname = FileUtil.getFileExtension(filename);
-		  log.debug("Check executable file for extension name " + extname);
-		  
-		  if(StringUtils.isBlank(extname))
-			  return false;
-		  extname = "." + extname;
-		  
-		  String exeListStr = Configuration.get(ConfigurationKeys.EXE_EXTENSIONS);
-		  String[] extList = StringUtils.split(exeListStr, ',');
-		  boolean executable = false;
-		  for (String ext : extList) {
-			if(StringUtils.equalsIgnoreCase(ext, extname)){
-				executable = true;
-				break;
-			}
+
+	fileName = fileName.trim();
+
+	int dotPos = fileName.lastIndexOf("/");
+	int dotPos2 = fileName.lastIndexOf("\\");
+	dotPos = Math.max(dotPos, dotPos2);
+	if (dotPos == -1) {
+	    return "";
+	}
+	// return the last char is '/'
+	return fileName.substring(0, dotPos + 1);
+
+    }
+
+    /**
+     * Merge two input parameter into full path and adjust File.separator to OS default separator as well.
+     * 
+     * @param path
+     * @param file
+     *                could be file name,or sub directory path.
+     * @return
+     */
+    public static String getFullPath(String path, String file) {
+	String fullpath;
+	if (path.endsWith(File.separator)) {
+	    fullpath = path + file;
+	} else {
+	    fullpath = path + File.separator + file;
+	}
+
+	return makeCanonicalPath(fullpath);
+
+    }
+
+    public static String makeCanonicalPath(String pathfile) {
+	if (File.separator.indexOf("\\") != -1) {
+	    pathfile = pathfile.replaceAll("\\/", "\\\\");
+	} else {
+	    pathfile = pathfile.replaceAll("\\\\", File.separator);
+	}
+
+	return pathfile;
+    }
+
+    public static void copyFile(File in, File out) throws Exception {
+	FileChannel sourceChannel = new FileInputStream(in).getChannel();
+	FileChannel destinationChannel = new FileOutputStream(out).getChannel();
+	sourceChannel.transferTo(0, sourceChannel.size(), destinationChannel);
+	sourceChannel.close();
+	destinationChannel.close();
+    }
+
+    /**
+     * get file extension name from a String, such as from "textabc.doc", return "doc" fileName also can contain
+     * directory infomation.
+     */
+    public static String getFileExtension(String fileName) {
+	if (fileName == null) {
+	    return "";
+	}
+
+	fileName = fileName.trim();
+	int dotPos = fileName.lastIndexOf(".");
+	if (dotPos == -1) {
+	    return "";
+	}
+	return fileName.substring(dotPos + 1, fileName.length());
+    }
+
+    /**
+     * Check whether file is executable according to its extenstion and executable extension name list from LAMS
+     * configuaration.
+     * 
+     * @param filename
+     * @return
+     */
+    public static boolean isExecutableFile(String filename) {
+	String extname = FileUtil.getFileExtension(filename);
+	FileUtil.log.debug("Check executable file for extension name " + extname);
+
+	if (StringUtils.isBlank(extname)) {
+	    return false;
+	}
+	extname = "." + extname;
+
+	String exeListStr = Configuration.get(ConfigurationKeys.EXE_EXTENSIONS);
+	String[] extList = StringUtils.split(exeListStr, ',');
+	boolean executable = false;
+	for (String ext : extList) {
+	    if (StringUtils.equalsIgnoreCase(ext, extname)) {
+		executable = true;
+		break;
+	    }
+	}
+
+	return executable;
+    }
+
+    /**
+     * Clean up any old directories in the java tmp directory, where the directory name starts with lamszip_ or lamstmp_
+     * and is <numdays> days old or older. This has the potential to be a heavy call - it has to do complete directory
+     * listing and then recursively delete the files and directories as needed.
+     * 
+     * Note: this method has not been tested as it is rather hard to write a junit test for!
+     * 
+     * @param directories
+     * @return number of directories deleted
+     */
+    public static int cleanupOldFiles(File[] directories) {
+	int numDeleted = 0;
+	if (directories != null) {
+	    for (int i = 0; i < directories.length; i++) {
+		if (FileUtil.deleteDirectory(directories[i])) {
+		    FileUtil.log.info("Directory " + directories[i].getPath() + " deleted.");
+		} else {
+		    FileUtil.log.info("Directory " + directories[i].getPath()
+			    + " partially deleted - some directories/files could not be deleted.");
 		}
-		  
-		  return executable;
-	  }
-	  
-	  /** Clean up any old directories in the java tmp directory, where the 
-		 * directory name starts with lamszip_ or lamstmp_ and is <numdays> days old 
-		 * or older. This has the potential to be a heavy call - it has to
-		 * do  complete directory listing and then recursively delete the 
-		 * files and directories as needed.
-		 * 
-		 * Note: this method has not been tested as it is rather hard to write
-		 * a junit test for!
-		 * 
-		 * @param directories 
-		 * @return number of directories deleted
-		 */
-		public static int cleanupOldFiles(File[] directories) {
-			int numDeleted = 0;
-			if ( directories != null ) {
-			    for ( int i=0; i < directories.length; i++) {
-		    	    if ( FileUtil.deleteDirectory(directories[i]) ) {
-		    	        log.info("Directory "+directories[i].getPath()+" deleted.");
-		    	    } else {
-		    	        log.info("Directory "+directories[i].getPath()+" partially deleted - some directories/files could not be deleted.");
-		    	    }
-		    	    numDeleted++;
-			    }
-			}
-			return numDeleted;
-		}
-		
-		/**
-		 * List files in temp directory older than numDays.
-		 * @param numDays Number of days old that the directory should be to be 
-		 * deleted. Must be greater than 0
-		 * @return array of files older than input date
-		 * @throws FileUtilException if numDays <= 0
-		 */
-		public static File[] getOldTempFiles(int numDays) throws FileUtilException {
-			// Contract checking 
-		    if ( numDays < 0 ) {
-		        throw new FileUtilException("Invalid getOldTempFiles call - the parameter numDays is "+
-		                numDays+". Must not be less than 0.");
+		numDeleted++;
+	    }
+	}
+	return numDeleted;
+    }
+
+    /**
+     * List files in temp directory older than numDays.
+     * 
+     * @param numDays
+     *                Number of days old that the directory should be to be deleted. Must be greater than 0
+     * @return array of files older than input date
+     * @throws FileUtilException
+     *                 if numDays <= 0
+     */
+    public static File[] getOldTempFiles(int numDays) throws FileUtilException {
+	// Contract checking
+	if (numDays < 0) {
+	    throw new FileUtilException("Invalid getOldTempFiles call - the parameter numDays is " + numDays
+		    + ". Must not be less than 0.");
+	}
+
+	// calculate comparison date
+	long newestDateToKeep = System.currentTimeMillis() - numDays * FileUtil.numMilliSecondsInADay;
+	Date date = new Date(newestDateToKeep);
+	FileUtil.log.info("Getting all temp zipfile expanded directories before " + date.toString()
+		+ " (server time) (" + newestDateToKeep + ")");
+
+	File tempSysDir = new File(FileUtil.TEMP_DIR);
+	File candidates[] = tempSysDir.listFiles(new TempDirectoryFilter(newestDateToKeep, FileUtil.log));
+	return candidates;
+    }
+
+    /**
+     * Recursively calculates size in bytes of given file or directory.
+     * 
+     * @param file
+     * @return Size in bytes.
+     */
+    public static long calculateFileSize(File file) {
+	if (file != null) {
+	    if (file.isFile()) {
+		return file.length();
+	    } else if (file.isDirectory()) {
+		File[] fileList = file.listFiles();
+		long totalSize = 0;
+		if (fileList != null) {
+		    for (int i = 0; i < fileList.length; i++) {
+			totalSize += calculateFileSize(fileList[i]);
 		    }
-			
-			// calculate comparison date
-			long newestDateToKeep = System.currentTimeMillis() - ( numDays * numMilliSecondsInADay);
-			Date date = new Date(newestDateToKeep);
-		    log.info("Getting all temp zipfile expanded directories before "+date.toString()+" (server time) ("+newestDateToKeep+")");
-		    
-			File tempSysDir = new File(TEMP_DIR);
-			File candidates[] = tempSysDir.listFiles(new TempDirectoryFilter(newestDateToKeep, log));
-			return candidates;
+		    return totalSize;
+		} else {
+		    return 0;
 		}
-		
-		/**
-		 * Recursively calculates size in bytes of given file or directory.
-		 * @param file
-		 * @return Size in bytes.
-		 */
-		public static long calculateFileSize(File file) {
-			if (file != null) {
-				if (file.isFile()) {
-					return file.length();
-				} else if (file.isDirectory()) {
-					File[] fileList = file.listFiles();
-					long totalSize = 0;
-					if (fileList != null) {
-						for (int i=0; i<fileList.length; i++) {
-							totalSize += calculateFileSize(fileList[i]);
-						}
-						return totalSize;
-					} else {
-						return 0;
-					}
-				}
-			} else {
-				return 0;
-			}
-			return 0;
-		}
+	    }
+	} else {
+	    return 0;
+	}
+	return 0;
+    }
 
-		/**
-		 * Remove chars from a file name that may be invalid on a file system.
-		 * @param name
-		 * @return a filename that can be saved to a file system.
-		 */
-		public static String stripInvalidChars(String name) {
-			name = name.replaceAll("\\\\", "");
-			name = name.replaceAll("\\/", "");
-			name = name.replaceAll("\\:", "");
-			name = name.replaceAll("\\*", "");
-			name = name.replaceAll("\\?", "");
-			name = name.replaceAll("\\>", "");
-			name = name.replaceAll("\\<", "");
-			name = name.replaceAll("\\|", "");
-			name = name.replaceAll("\\#", "");
-			name = name.replaceAll("\\%", "");
-			name = name.replaceAll("\\$", "");
-			name = name.replaceAll("\\;", "");
-			return name;
+    /**
+     * Remove chars from a file name that may be invalid on a file system.
+     * 
+     * @param name
+     * @return a filename that can be saved to a file system.
+     */
+    public static String stripInvalidChars(String name) {
+	name = name.replaceAll("\\\\", "");
+	name = name.replaceAll("\\/", "");
+	name = name.replaceAll("\\:", "");
+	name = name.replaceAll("\\*", "");
+	name = name.replaceAll("\\?", "");
+	name = name.replaceAll("\\>", "");
+	name = name.replaceAll("\\<", "");
+	name = name.replaceAll("\\|", "");
+	name = name.replaceAll("\\#", "");
+	name = name.replaceAll("\\%", "");
+	name = name.replaceAll("\\$", "");
+	name = name.replaceAll("\\;", "");
+	return name;
+    }
+
+    /**
+     * Encode a filename in such a way that the UTF-8 characters won't be munged during the download by a browser. Need
+     * the request to work out the user's browser type
+     * 
+     * @return encoded filename
+     * @throws UnsupportedEncodingException
+     */
+    public static String encodeFilenameForDownload(HttpServletRequest request, String unEncodedFilename)
+	    throws UnsupportedEncodingException {
+
+	// Different browsers handle stream downloads differently LDEV-1243
+	String agent = request.getHeader("USER-AGENT");
+	String filename = null;
+
+	if (null != agent && -1 != agent.indexOf("MSIE")) {
+	    // if MSIE then urlencode it
+	    filename = URLEncoder.encode(unEncodedFilename, "UTF-8");
+
+	} else if (null != agent && -1 != agent.indexOf("Mozilla")) {
+	    // if Mozilla then base64 url_safe encoding
+	    filename = MimeUtility.encodeText(unEncodedFilename, "UTF-8", "B");
+
+	} else {
+	    // any others use same filename.
+	    filename = unEncodedFilename;
+
+	}
+
+	return filename;
+    }
+
+    public static String generateUniqueContentFolderID() {
+
+	String newUniqueContentFolderID = null;
+	Properties props = new Properties();
+
+	IdentifierGenerator uuidGen = new UUIDHexGenerator();
+	((Configurable) uuidGen).configure(Hibernate.STRING, props, null);
+
+	// lowercase to resolve OS issues
+	newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase();
+
+	return newUniqueContentFolderID;
+    }
+
+    /**
+     * Call xstream to get the POJOs from the XML file. To make it backwardly compatible we catch any exceptions due to
+     * added fields, remove the field using the ToolContentVersionFilter functionality and try to reparse. We can't
+     * nominate the problem fields in advance as we are making XML created by newer versions of LAMS compatible with an
+     * older version.
+     * 
+     * This logic depends on the exception message containing the text. When we upgrade xstream, we must check that this
+     * message doesn't change.
+     * 
+     * <pre>
+     * 	com.thoughtworks.xstream.converters.ConversionException: unknownField : unknownField
+     * 	---- Debugging information ----
+     * 	required-type       : org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO 
+     * 	cause-message       : unknownField : unknownField 
+     * 	class               : org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO 
+     * 	message             : unknownField : unknownField 
+     * 	line number         : 15 
+     * 	path                : /org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO/unknownField 
+     * 	cause-exception     : com.thoughtworks.xstream.alias.CannotResolveClassException 
+     * 	-------------------------------
+     * </pre>
+     */
+    public static Object getObjectFromXML(XStream xStream, String fullFilePath) throws JDOMException, IOException {
+
+	Reader file = null;
+	XStream conversionXml = xStream != null ? xStream : new XStream();
+	ConversionException finalException = null;
+	String lastFieldRemoved = "";
+	ToolContentVersionFilter contentFilter = null;
+	// cap the maximum number of retries to 30 - if we add more than 30 new
+	// fields then we need to rethink our
+	// strategy
+	int maxRetries = 30;
+	int numTries = 0;
+
+	while (true) {
+	    try {
+
+		if (numTries > maxRetries) {
+		    break;
 		}
-		
-		/** Encode a filename in such a way that the UTF-8 characters won't be munged during the download by a browser. Need the
-		 * request to work out the user's browser type 
-		 * @return encoded filename
-		 * @throws UnsupportedEncodingException 
-		 */
-		public static String encodeFilenameForDownload(HttpServletRequest request, String unEncodedFilename) throws UnsupportedEncodingException {
-			
-			// Different browsers handle stream downloads differently LDEV-1243
-			String agent = request.getHeader("USER-AGENT");
-			String filename = null;
-			
-			if (null != agent && -1 != agent.indexOf("MSIE"))
-			{
-				// if MSIE then urlencode it
-				filename = URLEncoder.encode(unEncodedFilename, "UTF-8");
+		numTries++;
 
+		file = new InputStreamReader(new FileInputStream(fullFilePath), "UTF-8");
+		return conversionXml.fromXML(file);
+
+	    } catch (ConversionException ce) {
+		FileUtil.log.debug("Failed import", ce);
+		finalException = ce;
+		file.close();
+
+		if (ce.getMessage() == null) {
+		    // can't retry, so get out of here!
+		    break;
+
+		} else {
+		    // try removing the field from our XML and retry
+		    String message = ce.getMessage();
+		    String classname = extractValue(message, "required-type");
+		    String fieldname = extractValue(message, "message");
+		    if (fieldname == null || fieldname.equals("")
+			    || lastFieldRemoved.equals(classname + "." + fieldname)) {
+			// can't retry, so get out of here!
+			break;
+		    } else {
+			if (contentFilter == null) {
+			    contentFilter = new ToolContentVersionFilter();
 			}
-			else if (null != agent && -1 != agent.indexOf("Mozilla"))
-			{
-				// if Mozilla then base64 url_safe encoding
-				filename = MimeUtility.encodeText(unEncodedFilename, "UTF-8", "B");
-				
+
+			Class problemClass = getClass(classname);
+			if (problemClass == null) {
+			    // can't retry, so get out of here!
+			    break;
 			}
-			else 
-			{
-				// any others use same filename. 
-				filename = unEncodedFilename;
-				
-			}
 
-			return filename;
+			contentFilter.removeField(problemClass, fieldname);
+			contentFilter.transformXML(fullFilePath);
+			lastFieldRemoved = classname + "." + fieldname;
+			FileUtil.log.debug("Retrying import after removing field " + fieldname);
+			continue;
+		    }
 		}
-		
-		public static String generateUniqueContentFolderID() {
-			
-			String newUniqueContentFolderID = null;
-			Properties props = new Properties();
-			
-			IdentifierGenerator uuidGen = new UUIDHexGenerator();
-			( (Configurable) uuidGen).configure(Hibernate.STRING, props, null);
-			
-			// lowercase to resolve OS issues
-			newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase();
-			
-			return newUniqueContentFolderID;
+	    } finally {
+		if (file != null) {
+		    file.close();
 		}
-}
+	    }
+	}
+	throw finalException;
+    }
+
+    /**
+     * Extract the class name or field name from a ConversionException message
+     */
+    private static String extractValue(String message, String fieldToLookFor) {
+	try {
+	    int startIndex = message.indexOf(fieldToLookFor);
+	    if (startIndex > -1) {
+		startIndex = message.indexOf(":", startIndex + 1);
+		if (startIndex > -1 && startIndex + 2 < message.length()) {
+		    startIndex = startIndex + 2;
+		    int endIndex = message.indexOf(" ", startIndex);
+		    String value = message.substring(startIndex, endIndex);
+		    return value.trim();
+		}
+	    }
+	} catch (ArrayIndexOutOfBoundsException e) {
+	}
+	return "";
+    }
+
+    private static Class getClass(String classname) {
+	try {
+	    return Class.forName(classname);
+	} catch (ClassNotFoundException e) {
+	    FileUtil.log.error("Trying to remove unwanted fields from import but we can't find the matching class "
+		    + classname + ". Aborting retry.", e);
+	    return null;
+	}
+    }
+}
\ No newline at end of file