Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -r7eaa24de10b2151186a637b21fa02e396fa09f1a
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c47073639465a5a05b59d8e975d5274e881a908a)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 7eaa24de10b2151186a637b21fa02e396fa09f1a)
@@ -1,41 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
+
 <struts-config>
-	<data-sources />
-	<form-beans>
-		<form-bean name="activity" type="com.lamsinternational.lams.learning.web.form.ActivityForm" />
-	</form-beans>
-	<global-exceptions />
-	<global-forwards />
-	<action-mappings>
-		<!-- Methods for ActivityAction are display, displayCurrent and complete. -->
-		<action path="/Activity"
-				type="com.lamsinternational.lams.learning.web.action.ActivityAction"
-				name="activity"
-				parameter="method"
-				scope="request"
-				validate="false">
-				
-			<!-- Load one or more URLs for the activity -->
-			<forward name="displaySingleActivity" path="/SingleActivity.jsp" />
-			<forward name="displayParallelActivity" path="/ParallelActivity.jsp" />
-			<forward name="displayOptionsActivity" path="/OptionsActivity.jsp" />
-			
-			<!-- Tell browser to request next activity. Not needed -->
-			<!-- forward name="singleActivityCompleted" path="/SingleActivityCompleted.jsp" /-->
-			<!-- Tell browser to request next activity. Needed because the parallel
-			activity frames need to be cleared. -->
-			<forward name="parallelActivityCompleted" path="/ParallelActivityCompleted.jsp" />
-			<!-- Display "Complete other activity" message -->
-			<forward name="partialCompleted" path="/MultiPartialCompleted.jsp" />
-			<!-- Display wait message -->
-			<forward name="syncWait" path="/SyncWait.jsp" />
-			
-			<forward name="sequenceComplete" path="/SequenceCompleted.jsp" />
-			
-			<!-- forward name="error" path="/Error.jsp" /-->
-		</action>
-	</action-mappings>
-	<controller bufferSize="4096" debug="0" />
-</struts-config>
 
+  <!-- ========== Data Sources Definitions =================================== -->
+  <!--
+    Define your Struts data sources in a file called struts-data-sources.xml and place
+    it in your merge directory.
+  -->
+
+  <!-- ========== Form Bean Definitions =================================== -->
+  <form-beans>
+
+    <form-bean
+      name="activityForm"
+      type="com.lamsinternational.lams.learning.web.form.ActivityForm"
+    />
+    <form-bean
+      name="optionsActivityForm"
+      type="com.lamsinternational.lams.learning.web.form.OptionsActivityForm"
+    />
+
+  </form-beans>
+
+  <!-- ========== Global Exceptions Definitions =================================== -->
+  <!--
+    Define your exceptions in a file called global-exceptions.xml and place
+    it in your merge directory.
+  -->
+
+  <!-- ========== Global Forward Definitions =================================== -->
+<global-forwards>
+	<forward name="error" path="/error.jsp" />
+	<forward name="noSessionError" path="/noSessionError.jsp" />
+</global-forwards>
+
+  <!-- ========== Action Mapping Definitions =================================== -->
+   <action-mappings>
+    <action
+      path="/Activity"
+      type="com.lamsinternational.lams.learning.web.action.ActivityAction"
+      name="activityForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayToolActivity"
+        path="/DisplayToolActivity.do"
+        redirect="false"
+      />
+      <forward
+        name="displayParallelActivity"
+        path="/DisplayParallelActivity.do"
+        redirect="false"
+      />
+      <forward
+        name="displayOptionsActivity"
+        path="/DisplayOptionsActivity.do"
+        redirect="false"
+      />
+      <forward
+        name="displayGateActivity"
+        path="/DisplayGateActivity.do"
+        redirect="false"
+      />
+      <forward
+        name="requestDisplay"
+        path=".requestDisplay"
+        redirect="false"
+      />
+      <forward
+        name="parallelWait"
+        path=".parallelWait"
+        redirect="true"
+      />
+      <forward
+        name="lessonComplete"
+        path=".lessonComplete"
+        redirect="true"
+      />
+    </action>
+    <action
+      path="/DisplayOptionsActivity"
+      type="com.lamsinternational.lams.learning.web.action.DisplayOptionsActivity"
+      name="optionsActivityForm"
+      scope="request"
+      input="/Activity.do"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayOptions"
+        path=".optionsActivity"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/DisplayToolActivity"
+      type="com.lamsinternational.lams.learning.web.action.DisplayToolActivity"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayTool"
+        path=".toolActivity"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/DisplayParallelActivity"
+      type="com.lamsinternational.lams.learning.web.action.DisplayParallelActivity"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayParallel"
+        path=".parallelActivity"
+        redirect="false"
+      />
+    </action>
+
+    <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
+  </action-mappings>
+
+   <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
+
+<plug-in className="org.apache.struts.tiles.TilesPlugin">
+	<set-property property="definitions-config" value="/WEB-INF/struts/tiles-defs.xml" />
+	<set-property property="definitions-debug" value="0" />
+	<set-property property="definitions-parser-details" value="0" />
+	<set-property property="definitions-parser-validate" value="true" />
+</plug-in>
+
+</struts-config>