Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r014f8d44ccd74d20a8c00442ee9dd013521f4aea -re23e3efb1b812146c7fbd114f16ebac155b1b327
Binary files differ
Index: lams_central/web/toolcontent/learning-design-ims.xslt
===================================================================
diff -u -r534d8b05f0646a33c5eb6e11be9a32d97b3014dd -re23e3efb1b812146c7fbd114f16ebac155b1b327
--- lams_central/web/toolcontent/learning-design-ims.xslt	(.../learning-design-ims.xslt)	(revision 534d8b05f0646a33c5eb6e11be9a32d97b3014dd)
+++ lams_central/web/toolcontent/learning-design-ims.xslt	(.../learning-design-ims.xslt)	(revision e23e3efb1b812146c7fbd114f16ebac155b1b327)
@@ -53,6 +53,8 @@
 						<activities>
 							<!-- ================================== lams activities ================================== -->
 							<xsl:apply-templates select="*//org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="tool"/>
+							<xsl:apply-templates select="*//org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="group"/>
+							<xsl:apply-templates select="*//org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="gate"/>
 							<xsl:apply-templates select="*//org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="complex"/>
 							<!-- ================================== lams Tansitions ================================== -->
 							<xsl:apply-templates select="*/transitions"/>
@@ -82,12 +84,23 @@
 	
 	<!-- ================================== lams activities ================================== -->
 	<xsl:template match="org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="tool">
-		<xsl:if test="not((activityTypeID = 6) or (activityTypeID = 7) or (activityTypeID = 8))">
+		<xsl:if test="(activityTypeID = 1)">
 			<xsl:call-template name="tool"/>
 		</xsl:if>
 		<xsl:apply-templates select="org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="tool"/>
 	</xsl:template>
-	
+	<xsl:template match="org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="group">
+		<xsl:if test="(activityTypeID = 2)">
+			<xsl:call-template name="group"/>
+		</xsl:if>
+		<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: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:call-template name="complex"/>
@@ -112,6 +125,40 @@
 			</lams:lams-tool-activity>
 		</learning-activity>
 	</xsl:template>
+	<!-- ================================== lams Grouping activities ================================== -->
+	<xsl:template name="group">
+		<learning-activity xsl:use-attribute-sets="groupIdentifier">
+			<title>
+				<xsl:value-of select="activityTitle"/>
+			</title>
+			<environment-ref xsl:use-attribute-sets="groupEnvRef"/>
+			<complete-activity>
+				<user-choice/>
+			</complete-activity>
+			<lams:lams-tool-activity>
+				<xsl:for-each select="node() | @*">
+					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+				</xsl:for-each>
+			</lams:lams-tool-activity>
+		</learning-activity>
+	</xsl:template>
+	<!-- ================================== lams Gate activities ================================== -->
+	<xsl:template name="gate">
+		<learning-activity xsl:use-attribute-sets="gateIdentifier">
+			<title>
+				<xsl:value-of select="activityTitle"/>
+			</title>
+			<environment-ref xsl:use-attribute-sets="gateEnvRef"/>
+			<complete-activity>
+				<user-choice/>
+			</complete-activity>
+			<lams:lams-tool-activity>
+				<xsl:for-each select="node() | @*">
+					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+				</xsl:for-each>
+			</lams:lams-tool-activity>
+		</learning-activity>
+	</xsl:template>
 	<!-- ================================== lams Complex activities ================================== -->
 	<xsl:template name="complex">
 		<activity-structure xsl:use-attribute-sets="complexAttr">
@@ -132,7 +179,7 @@
 			</lams:lams-complex-activity>
 		</activity-structure>
 	</xsl:template>
-	<!-- ================================== lams Tansitions ================================== -->
+	<!-- ================================== lams Transitions ================================== -->
 	<xsl:template match="transitions">
 		<activity-structure identifier="A-sequence" structure-type="sequence">
 			<title>LAMS Learning design sequence</title>
@@ -159,27 +206,33 @@
 		</environments>
 	</xsl:template>
 	<xsl:template match="org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO" mode="env">
-			<xsl:if test="not((activityTypeID = 6) or (activityTypeID = 7) or (activityTypeID = 8))">
-		<environment xsl:use-attribute-sets="toolEnvIdentifier">
-			<title>
-				<xsl:value-of select="activityTitle"/>
-			</title>
-			<service  xsl:use-attribute-sets="serviceAttr">
-				<tool_interface xmlns="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0">
-					<tool_id>
-						<identifier type="URN">URN:LAMS:<xsl:value-of select="toolSignature"/>-<xsl:value-of select="toolContentID"/></identifier>
-					</tool_id>
-					<tool_version><xsl:value-of select="toolVersion"/></tool_version>
-					<tool_contents>
-						<xsl:variable name="filename">
-							<xsl:value-of select="toolContentID"/>.xml
-						</xsl:variable>
-						<xsl:copy-of select="document($filename)"/>
-					</tool_contents>
-				</tool_interface>
-			</service>
-		</environment>
-			</xsl:if>
+		<xsl:if test="(activityTypeID = 2)">
+			<environment xsl:use-attribute-sets="groupEnvIdentifier"></environment>
+		</xsl:if>
+		<xsl:if test="(activityTypeID = 3) or (activityTypeID = 4) or (activityTypeID = 5)">
+			<environment xsl:use-attribute-sets="gateEnvIdentifier"></environment>
+		</xsl:if>
+		<xsl:if test="(activityTypeID = 1)">
+			<environment xsl:use-attribute-sets="toolEnvIdentifier">
+				<title>
+					<xsl:value-of select="activityTitle"/>
+				</title>
+				<service  xsl:use-attribute-sets="serviceAttr">
+					<tool_interface xmlns="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0">
+						<tool_id>
+							<identifier type="URN">URN:LAMS:<xsl:value-of select="toolSignature"/>-<xsl:value-of select="toolContentID"/></identifier>
+						</tool_id>
+						<tool_version><xsl:value-of select="toolVersion"/></tool_version>
+						<tool_contents>
+							<xsl:variable name="filename">
+								<xsl:value-of select="toolContentID"/>.xml
+							</xsl:variable>
+							<xsl:copy-of select="document($filename)"/>
+						</tool_contents>
+					</tool_interface>
+				</service>
+			</environment>
+		</xsl:if>
 	</xsl:template>
 	<!-- ================================== some attributes ================================== -->	
 	<xsl:attribute-set name="ldIdentifier">
@@ -194,6 +247,22 @@
 		<xsl:attribute name="ref">A-<xsl:value-of select="toolSignature"/>-<xsl:value-of select="toolContentID"/></xsl:attribute>
 	</xsl:attribute-set>
 	
+	<xsl:attribute-set name="groupIdentifier">
+		<xsl:attribute name="identifier">A-group-<xsl:value-of select="activityID"/></xsl:attribute>
+	</xsl:attribute-set>
+	
+	<xsl:attribute-set name="groupRef">
+		<xsl:attribute name="ref">A-group-<xsl:value-of select="activityID"/></xsl:attribute>
+	</xsl:attribute-set>
+	
+	<xsl:attribute-set name="gateIdentifier">
+		<xsl:attribute name="identifier">A-gate-<xsl:value-of select="activityID"/></xsl:attribute>
+	</xsl:attribute-set>
+	
+	<xsl:attribute-set name="gateRef">
+		<xsl:attribute name="ref">A-gate-<xsl:value-of select="activityID"/></xsl:attribute>
+	</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="structure-type">
@@ -210,6 +279,20 @@
 		<xsl:attribute name="ref">E-<xsl:value-of select="toolSignature"/>-<xsl:value-of select="toolContentID"/></xsl:attribute>
 	</xsl:attribute-set>
 	
+	<xsl:attribute-set name="groupEnvIdentifier">
+		<xsl:attribute name="identifier">E-group-<xsl:value-of select="activityID"/></xsl:attribute>
+	</xsl:attribute-set>	
+	<xsl:attribute-set name="groupEnvRef">
+		<xsl:attribute name="ref">E-group-<xsl:value-of select="activityID"/></xsl:attribute>
+	</xsl:attribute-set>
+	
+	<xsl:attribute-set name="gateEnvIdentifier">
+		<xsl:attribute name="identifier">E-gate-<xsl:value-of select="activityID"/></xsl:attribute>
+	</xsl:attribute-set>	
+	<xsl:attribute-set name="gateEnvRef">
+		<xsl:attribute name="ref">E-gate-<xsl:value-of select="activityID"/></xsl:attribute>
+	</xsl:attribute-set>
+	
 	<xsl:attribute-set name="serviceAttr">
 		<xsl:attribute name="identifier">S-<xsl:value-of select="toolSignature"/>-<xsl:value-of select="toolContentID"/></xsl:attribute>
 		<xsl:attribute name="isvisible">true</xsl:attribute>
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -re7737e14ad9727695f6884df5d3b7255d0a9ea41 -re23e3efb1b812146c7fbd114f16ebac155b1b327
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision e7737e14ad9727695f6884df5d3b7255d0a9ea41)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision e23e3efb1b812146c7fbd114f16ebac155b1b327)
@@ -163,7 +163,8 @@
 	private static final String FILTER_METHOD_MIDDLE = "To";
 	
 	//IMS format some tag name
-	private static final String IMS_TAG_RESOURCES="resources";
+	private static final String IMS_FILE_NAME_EXT = "_imsld";
+	private static final String IMS_TAG_RESOURCES = "resources";
 	private static final String IMS_TAG_RESOURCE = "resource";
 	private static final String IMS_ATTR_IDENTIFIER = "identifier";
 	private static final String IMS_TAG_FILE = "file";
@@ -176,6 +177,10 @@
 		//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 
+	private static final String IMS_TAG_GROUPING = "group";
+	private static final String IMS_TAG_GATE = "gate";
+	
 	//temporarily file for IMS XSLT file
 	private static final String XSLT_PARAM_RESOURCE_FILE = "resourcesFile";
 	private static final String IMS_RESOURCES_FILE_NAME = "resources.xml";
@@ -399,6 +404,7 @@
 			//get learning desing and serialize it to XML file.
 			ILearningDesignService service =  getLearningDesignService();
 			LearningDesignDTO ldDto = service.getLearningDesignDTO(learningDesignId);
+			ldDto.setTitle(ldDto.getTitle().concat(IMS_FILE_NAME_EXT));
 			XStream designXml = new XStream();
 			designXml.toXML(ldDto,ldFile);
 			ldFile.close();
@@ -548,7 +554,17 @@
 		for (AuthoringActivityDTO actDto : sortedActList) {
 			log.debug("Export IMS: Put actitivies " + actDto.getActivityTitle() + "[" +actDto.getToolContentID()+"] into Transition <learning-activity-ref> tag.");
 			Element ref = new Element(IMS_TAG_LEARING_ACTIIVTY_REF);
-			Attribute att = new Attribute(IMS_ATTR_REF,IMS_PREFIX_ACTIVITY_REF +  actDto.getToolSignature() + "-" + actDto.getToolContentID());
+			Attribute att = null;
+			
+			//
+			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))
+				att = new Attribute(IMS_ATTR_REF,IMS_PREFIX_ACTIVITY_REF + IMS_TAG_GATE + "-" + actDto.getActivityID());
+			else 
+				att = new Attribute(IMS_ATTR_REF,IMS_PREFIX_ACTIVITY_REF +  actDto.getToolSignature() + "-" + actDto.getToolContentID());
+			
 			ref.setAttribute(att);
 			transChildren.add(ref);
 		}