Index: lams_central/web/toolcontent/learning-design-ims.xslt
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/learning-design-ims.xslt,v
diff -u -r1.6 -r1.7
--- lams_central/web/toolcontent/learning-design-ims.xslt	24 Nov 2006 06:09:46 -0000	1.6
+++ lams_central/web/toolcontent/learning-design-ims.xslt	27 Nov 2006 01:48:43 -0000	1.7
@@ -169,7 +169,15 @@
 			<xsl:for-each select="/*/*/*">
 				<xsl:sort select="orderID" order="ascending"/>
 				<xsl:if test="parentActivityID = $myid">
-					<learning-activity-ref  xsl:use-attribute-sets="toolRef"/>
+					<xsl:if test="(activityTypeID = 1)">
+						<learning-activity-ref  xsl:use-attribute-sets="toolRef"/>
+					</xsl:if>
+					<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)">
+						<learning-activity-ref  xsl:use-attribute-sets="complexRef"/>
+					</xsl:if>
 				</xsl:if>
 			</xsl:for-each>
 			<lams:lams-complex-activity>
@@ -272,6 +280,11 @@
 		</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-set>
+	
+	
 	<xsl:attribute-set name="toolEnvIdentifier">
 		<xsl:attribute name="identifier">E-<xsl:value-of select="toolSignature"/>-<xsl:value-of select="toolContentID"/></xsl:attribute>
 	</xsl:attribute-set>	
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v
diff -u -r1.54 -r1.55
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	27 Nov 2006 00:02:18 -0000	1.54
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	27 Nov 2006 01:48:41 -0000	1.55
@@ -173,6 +173,7 @@
 
 	private static final String IMS_PREFIX_RESOURCE_IDENTIFIER = "R-";
 	private static final String IMS_PREFIX_ACTIVITY_REF = "A-";
+	private static final String IMS_PREFIX_COMPLEX_REF = "S-";
 
 		//this is not IMS standard tag, temporarily use to gather all tools node list
 	private static final String IMS_TAG_TRANSITIONS = "transitions";
@@ -181,6 +182,10 @@
 	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_PARALLEL = "PARALLEL";
+	private static final String IMS_TAG_SEQUENCE = "SEQUENCE";
+	
 	//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";
@@ -548,10 +553,6 @@
 			AuthoringActivityDTO activityDTO = iter.next();
 			if(activityDTO.getParentActivityID() != null)
 				iter.remove();
-			if(activityDTO.getActivityTypeID() == Activity.SEQUENCE_ACTIVITY_TYPE
-				|| activityDTO.getActivityTypeID() == Activity.PARALLEL_ACTIVITY_TYPE
-				|| activityDTO.getActivityTypeID() == Activity.OPTIONS_ACTIVITY_TYPE)
-				iter.remove();
 		}
 		
 		for (AuthoringActivityDTO actDto : sortedActList) {
@@ -565,7 +566,18 @@
 			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 
+			else if(actDto.getActivityTypeID() == Activity.SEQUENCE_ACTIVITY_TYPE
+					|| actDto.getActivityTypeID() == Activity.PARALLEL_ACTIVITY_TYPE
+					|| actDto.getActivityTypeID() == Activity.OPTIONS_ACTIVITY_TYPE) {
+				
+				if(actDto.getActivityTypeID().equals(Activity.OPTIONS_ACTIVITY_TYPE))
+					att = new Attribute(IMS_ATTR_REF, IMS_PREFIX_COMPLEX_REF + IMS_TAG_OPTIONAL + "-" + actDto.getActivityID());
+				else if(actDto.getActivityTypeID().equals(Activity.PARALLEL_ACTIVITY_TYPE))
+					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 
 				att = new Attribute(IMS_ATTR_REF,IMS_PREFIX_ACTIVITY_REF +  actDto.getToolSignature() + "-" + actDto.getToolContentID());
 			
 			ref.setAttribute(att);