Index: lams_central/web/toolcontent/learning-design-ims.xslt
===================================================================
diff -u -r0b3fc47e4fa8ad1509b51be79238d823241f0605 -reb79a21f2f297559b5cf91266e21e75994033d3e
--- lams_central/web/toolcontent/learning-design-ims.xslt	(.../learning-design-ims.xslt)	(revision 0b3fc47e4fa8ad1509b51be79238d823241f0605)
+++ lams_central/web/toolcontent/learning-design-ims.xslt	(.../learning-design-ims.xslt)	(revision eb79a21f2f297559b5cf91266e21e75994033d3e)
@@ -37,9 +37,15 @@
 					</title>
 					<!-- ================================== lams LD ================================== -->
 					<xsl:for-each select="/*/*">
-						<xsl:if test="(count(ancestor::*) =1) and (name(.) !='activities') and (name(.) != 'transitions')">
+						<xsl:if test="(count(ancestor::*) =1) and (name(.) !='activities') and (name(.) != 'transitions') and name(.) !='title' and name(.) !='groupings' and name(.) !='branchMappings'">
 								<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
 						</xsl:if>
+						<xsl:if test="(count(ancestor::*) =1) and (name(.) = 'groupings')">
+							<xsl:call-template name="groupings"/>
+						</xsl:if>
+						<xsl:if test="(count(ancestor::*) =1) and (name(.) = 'branchMappings')">
+							<xsl:call-template name="branchMappings"/>
+						</xsl:if>
 					</xsl:for-each>
 
 					<components>
@@ -94,13 +100,13 @@
 		<xsl:apply-templates select="org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="group"/>
 	</xsl:template>
 	<xsl:template match="org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="gate">
-		<xsl:if test="(activityTypeID = 3) or (activityTypeID = 4) or (activityTypeID = 5)">
+		<xsl:if test="(activityTypeID = 3) or (activityTypeID = 4) or (activityTypeID = 5) or (activityTypeID = 9)">
 			<xsl:call-template name="gate"/>
 		</xsl:if>
 		<xsl:apply-templates select="org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="gate"/>
 	</xsl:template>
 	<xsl:template match="org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="complex">
-		<xsl:if test="(activityTypeID = 6) or (activityTypeID = 7) or (activityTypeID = 8)">
+		<xsl:if test="(activityTypeID = 6) or (activityTypeID = 7) or (activityTypeID = 8) or (activityTypeID = 10) or (activityTypeID = 11) or (activityTypeID = 12) or (activityTypeID = 13)">
 			<xsl:call-template name="complex"/>
 		</xsl:if>
 		<xsl:apply-templates select="org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="complex"/>
@@ -140,6 +146,44 @@
 			</lams:lams-tool-activity>
 		</learning-activity>
 	</xsl:template>
+	
+	<xsl:template name="groupings">
+		<lams:lams-groupings>
+			<xsl:for-each select="*">
+				<xsl:call-template name="grouping"/>
+			</xsl:for-each>
+		</lams:lams-groupings>
+	</xsl:template>
+		
+	<xsl:template name="grouping">
+		<lams:lams-grouping>
+			<xsl:for-each select="node() | @*">
+					<xsl:if test="name(.) != 'groups'">
+						<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+					</xsl:if>
+					<xsl:if test="name(.) = 'groups'">
+						<xsl:call-template name="groups"/>
+					</xsl:if>
+			</xsl:for-each>
+		</lams:lams-grouping>
+	</xsl:template>
+
+	<xsl:template name="groups">
+		<lams:groups>
+		<xsl:for-each select="org.lamsfoundation.lams.learningdesign.dto.GroupDTO">
+ 			<xsl:call-template name="actualGroup"/>
+		</xsl:for-each>
+		</lams:groups>
+	</xsl:template>
+
+	<xsl:template name="actualGroup">
+		<lams:lams-group>
+			<xsl:for-each select="node() | @*">
+				<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+			</xsl:for-each>
+		</lams:lams-group>
+	</xsl:template>
+	
 	<!-- ================================== lams Gate activities ================================== -->
 	<xsl:template name="gate">
 		<learning-activity xsl:use-attribute-sets="gateIdentifier">
@@ -173,7 +217,10 @@
 					<xsl:if test="(activityTypeID = 2)">
 						<learning-activity-ref  xsl:use-attribute-sets="groupRef"/>
 					</xsl:if>
-					<xsl:if test="(activityTypeID = 6) or (activityTypeID = 7) or (activityTypeID = 8)">
+					<xsl:if test="(activityTypeID = 3) or (activityTypeID = 4) or (activityTypeID = 5) or (activityTypeID = 9)">
+						<learning-activity-ref  xsl:use-attribute-sets="gateRef"/>
+					</xsl:if>
+					<xsl:if test="(activityTypeID = 6) or (activityTypeID = 7) or (activityTypeID = 8) or (activityTypeID = 10) or (activityTypeID = 11) or (activityTypeID = 12) or (activityTypeID = 13) ">
 						<learning-activity-ref  xsl:use-attribute-sets="complexRef"/>
 					</xsl:if>
 				</xsl:if>
@@ -185,6 +232,36 @@
 			</lams:lams-complex-activity>
 		</activity-structure>
 	</xsl:template>
+	<!-- ================================== lams Branch Mappings and Conditions ================================== -->
+	<xsl:template name="branchMappings">
+		<lams:lams-branchMappings>
+			<xsl:for-each select="*">
+				<xsl:call-template name="branchActivityEntry"/>
+			</xsl:for-each>
+		</lams:lams-branchMappings>
+	</xsl:template>
+		
+	<xsl:template name="branchActivityEntry">
+		<lams:lams-branchActivityEntry>
+			<xsl:for-each select="node() | @*">
+					<xsl:if test="name(.) != 'condition'">
+						<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+					</xsl:if>
+					<xsl:if test="name(.) = 'condition'">
+						<xsl:call-template name="condition"/>
+					</xsl:if>
+			</xsl:for-each>
+		</lams:lams-branchActivityEntry>
+	</xsl:template>
+
+	<xsl:template name="condition">
+		<lams:lams-condition>
+			<xsl:for-each select="node() | @*">
+				<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+			</xsl:for-each>
+		</lams:lams-condition>
+	</xsl:template>
+	
 	<!-- ================================== lams Transitions ================================== -->
 	<xsl:template match="transitions">
 		<activity-structure identifier="A-sequence" structure-type="sequence">
@@ -270,16 +347,20 @@
 	</xsl:attribute-set>
 	
 	<xsl:attribute-set name="complexAttr">
-		<xsl:attribute name="identifier">S-<xsl:if test="activityTypeID=6">PARALLEL</xsl:if><xsl:if test="activityTypeID=7">OPTIONS</xsl:if><xsl:if test="activityTypeID=8">SEQUENCE</xsl:if>-<xsl:value-of select="activityID"/></xsl:attribute>
+		<xsl:attribute name="identifier">S-<xsl:if test="activityTypeID=6">PARALLEL</xsl:if><xsl:if test="activityTypeID=7">SELECTION</xsl:if><xsl:if test="activityTypeID=8">SEQUENCE</xsl:if><xsl:if test="activityTypeID=10">BRANCHING</xsl:if><xsl:if test="activityTypeID=11">BRANCHING</xsl:if><xsl:if test="activityTypeID=12">BRANCHING</xsl:if><xsl:if test="activityTypeID=13">SELECTION</xsl:if>-<xsl:value-of select="activityID"/></xsl:attribute>
 		<xsl:attribute name="structure-type">
 			<xsl:if test="activityTypeID=6">PARALLEL</xsl:if>
-			<xsl:if test="activityTypeID=7">OPTIONS</xsl:if>
+			<xsl:if test="activityTypeID=7">SELECTION</xsl:if>
 			<xsl:if test="activityTypeID=8">SEQUENCE</xsl:if>
+			<xsl:if test="activityTypeID=10">SEQUENCE</xsl:if>
+			<xsl:if test="activityTypeID=11">SEQUENCE</xsl:if>
+			<xsl:if test="activityTypeID=12">SEQUENCE</xsl:if>
+			<xsl:if test="activityTypeID=13">SELECTION</xsl:if>
 		</xsl:attribute>
 	</xsl:attribute-set>
 	
 	<xsl:attribute-set name="complexRef">
-		<xsl:attribute name="ref">S-<xsl:if test="activityTypeID=6">PARALLEL</xsl:if><xsl:if test="activityTypeID=7">OPTIONS</xsl:if><xsl:if test="activityTypeID=8">SEQUENCE</xsl:if>-<xsl:value-of select="activityID"/></xsl:attribute>
+		<xsl:attribute name="ref">S-<xsl:if test="activityTypeID=6">PARALLEL</xsl:if><xsl:if test="activityTypeID=7">SELECTION</xsl:if><xsl:if test="activityTypeID=8">SEQUENCE</xsl:if><xsl:if test="activityTypeID=10">BRANCHING</xsl:if><xsl:if test="activityTypeID=11">BRANCHING</xsl:if><xsl:if test="activityTypeID=12">BRANCHING</xsl:if><xsl:if test="activityTypeID=13">SELECTION</xsl:if>-<xsl:value-of select="activityID"/></xsl:attribute>
 	</xsl:attribute-set>
 	
 	
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -reb79a21f2f297559b5cf91266e21e75994033d3e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 870373d635bc769aee2dc271e6ff12818fcfcea6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision eb79a21f2f297559b5cf91266e21e75994033d3e)
@@ -37,7 +37,6 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -48,7 +47,6 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -113,8 +111,6 @@
 import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO;
 import org.lamsfoundation.lams.learningdesign.dto.ToolOutputBranchActivityEntryDTO;
 import org.lamsfoundation.lams.learningdesign.dto.TransitionDTO;
-import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter.AddedField;
-import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter.RemovedField;
 import org.lamsfoundation.lams.lesson.LessonClass;
 import org.lamsfoundation.lams.tool.SystemTool;
 import org.lamsfoundation.lams.tool.Tool;
@@ -124,7 +120,6 @@
 import org.lamsfoundation.lams.tool.dao.IToolContentDAO;
 import org.lamsfoundation.lams.tool.dao.IToolDAO;
 import org.lamsfoundation.lams.tool.dao.IToolImportSupportDAO;
-import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.util.Configuration;
@@ -133,9 +128,6 @@
 import org.lamsfoundation.lams.util.FileUtilException;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.VersionUtil;
-import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
-import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
-import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
 import org.springframework.beans.BeansException;
@@ -198,13 +190,14 @@
 	//this is not IMS standard tag, temporarily use to gather all tools node list
 	private static final String IMS_TAG_TRANSITIONS = "transitions";
 
-	// this is not IMS standard tag, temp use to ref grouping/gate activities 
+	// this is not IMS standard tag, term used to ref grouping/gate activities 
 	private static final String IMS_TAG_GROUPING = "group";
 	private static final String IMS_TAG_GATE = "gate";
 	
-	private static final String IMS_TAG_OPTIONAL = "OPTIONS";
+	private static final String IMS_TAG_OPTIONAL = "SELECTION";
 	private static final String IMS_TAG_PARALLEL = "PARALLEL";
 	private static final String IMS_TAG_SEQUENCE = "SEQUENCE";
+	private static final String IMS_TAG_BRANCHING = "BRANCHING";
 	
 	//temporarily file for IMS XSLT file
 	private static final String XSLT_PARAM_RESOURCE_FILE = "resourcesFile";
@@ -482,7 +475,7 @@
 				if(format == PACKAGE_FORMAT_IMS){
 					handleIMS(rootDir, activity,resChildren);
 				}
-			} //end all acitivites export
+			} //end all activities export
 			
 			try {
 				//handle IMS format
@@ -503,7 +496,7 @@
 				}
 				
 			} catch (Exception e) {
-				log.error(e);
+				log.error("Error thrown while creating IMS LD XML", e);
 				throw new ExportToolContentException(e);
 			}
 			
@@ -591,7 +584,7 @@
 			if(actDto.getActivityTypeID().equals(Activity.GROUPING_ACTIVITY_TYPE))
 				att = new Attribute(IMS_ATTR_REF,IMS_PREFIX_ACTIVITY_REF + IMS_TAG_GROUPING + "-" + actDto.getActivityID());
 			else if(actDto.getActivityTypeID().equals(Activity.SCHEDULE_GATE_ACTIVITY_TYPE) || actDto.getActivityTypeID().equals(Activity.PERMISSION_GATE_ACTIVITY_TYPE)
-													  || actDto.getActivityTypeID().equals(Activity.SYNCH_GATE_ACTIVITY_TYPE))
+					|| actDto.getActivityTypeID().equals(Activity.SYNCH_GATE_ACTIVITY_TYPE) || actDto.getActivityTypeID().equals(Activity.SYSTEM_GATE_ACTIVITY_TYPE))
 				att = new Attribute(IMS_ATTR_REF,IMS_PREFIX_ACTIVITY_REF + IMS_TAG_GATE + "-" + actDto.getActivityID());
 			else if (actDto.getActivityTypeID().equals(Activity.OPTIONS_ACTIVITY_TYPE)
 					|| actDto.getActivityTypeID().equals(Activity.OPTIONS_WITH_SEQUENCES_TYPE))
@@ -600,7 +593,10 @@
 					att = new Attribute(IMS_ATTR_REF, IMS_PREFIX_COMPLEX_REF + IMS_TAG_PARALLEL + "-" + actDto.getActivityID());
 			else if(actDto.getActivityTypeID().equals(Activity.SEQUENCE_ACTIVITY_TYPE))
 					att = new Attribute(IMS_ATTR_REF, IMS_PREFIX_COMPLEX_REF + IMS_TAG_SEQUENCE + "-" + actDto.getActivityID());
-			 else 
+			else if(actDto.getActivityTypeID().equals(Activity.CHOSEN_BRANCHING_ACTIVITY_TYPE) || actDto.getActivityTypeID().equals(Activity.GROUP_BRANCHING_ACTIVITY_TYPE)
+					|| actDto.getActivityTypeID().equals(Activity.TOOL_BRANCHING_ACTIVITY_TYPE) )
+				att = new Attribute(IMS_ATTR_REF, IMS_PREFIX_COMPLEX_REF + IMS_TAG_BRANCHING + "-" + actDto.getActivityID());
+			else 
 				att = new Attribute(IMS_ATTR_REF,IMS_PREFIX_ACTIVITY_REF +  actDto.getToolSignature() + "-" + actDto.getToolContentID());
 			
 			ref.setAttribute(att);