Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r5a73c233a01cff87c681dfc9cdd20d2e4a64d6f4 -rc09b25205f064fec423af2757330fae1c09af94a
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 5a73c233a01cff87c681dfc9cdd20d2e4a64d6f4)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c09b25205f064fec423af2757330fae1c09af94a)
@@ -14,8 +14,8 @@
   <form-beans>
 
     <form-bean
-      name="testForm"
-      type="org.lamsfoundation.lams.learning.web.form.TestForm"
+      name="toolTestForm"
+      type="org.lamsfoundation.lams.learning.web.form.ToolTestForm"
     />
     <form-bean
       name="activityForm"
@@ -72,6 +72,26 @@
       />
     </action>
     <action
+      path="/toolTest"
+      type="org.lamsfoundation.lams.learning.web.action.ToolTestAction"
+      name="toolTestForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="display"
+        path="/toolTest.jsp"
+        redirect="false"
+      />
+      <forward
+        name="next"
+        path=".requestDisplay"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/test"
       type="org.lamsfoundation.lams.learning.web.action.TestAction"
       name="testForm"
@@ -140,7 +160,16 @@
       />
     </action>
 
-    <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
+<action path="/requestDisplay"
+	type="org.apache.struts.actions.ForwardAction"
+	parameter=".requestDisplay"/>
+<action path="/parallelWait"
+	type="org.apache.struts.actions.ForwardAction"
+	parameter=".parallelWait"/>
+<action path="/lessonComplete"
+	type="org.apache.struts.actions.ForwardAction"
+	parameter=".lessonComplete"/>
+
   </action-mappings>
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r38c01724131da36d933f7ef6861313f1355dc6b6 -rc09b25205f064fec423af2757330fae1c09af94a
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 38c01724131da36d933f7ef6861313f1355dc6b6)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision c09b25205f064fec423af2757330fae1c09af94a)
@@ -14,20 +14,6 @@
 	</param-value>
 </context-param>
 
-<!-- The hibernate filter configuration -->
-<!-- context-param>
-	<param-name>HIBERNATE_FILTER_SESSION_FACTORY_JNDI</param-name>
-	<param-value>java:comp/env/hibernate/SessionFactory</param-value>
-</context-param>
-<context-param>
-	<param-name>HIBERNATE_FILTER_REQUEST_ATTRIBUTE_ID</param-name>
-	<param-value>HibernateSession</param-value>
-</context-param>
-<context-param>
-	<param-name>HIBERNATE_FILTER_USE_PROXY</param-name>
-	<param-value>true</param-value>
-</context-param-->
-
 <filter>
 	<filter-name>HibernateFilter</filter-name>
 	<filter-class>org.springframework.orm.hibernate.support.OpenSessionInViewFilter</filter-class>