Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -r7d61f3a246aa312f45abd20249237d0864c396a4 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
Binary files differ
Index: lams_learning/conf/xdoclet/taglibs.xml
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -86,3 +86,11 @@
 	<taglib-uri>tags-xml_rt</taglib-uri>
 	<taglib-location>/WEB-INF/jstl/tlds/x-rt.tld</taglib-location>
 </taglib>
+
+<!--  ======================================================== -->	
+<!--   LAMS Tag Library -->
+<!--  ======================================================== -->	
+<taglib>
+   <taglib-uri>tags-lams</taglib-uri>
+   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+</taglib>
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -0,0 +1,118 @@
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
+package org.lamsfoundation.lams.learning.web.action;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
+import org.lamsfoundation.lams.lesson.dto.LessonDTO;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+
+/** 
+ * 
+ * <p>The action servlet that interacts with the dummy learner interface. Based
+ * on LearnerAction. To be removed when the Flash interface is built.</p>
+ * 
+ * ----------------XDoclet Tags--------------------
+ * 
+ * @struts:action path="/dummylearner" 
+ *                parameter="method" 
+ *                validate="false"
+ * @struts.action-exception key="error.system.learner" scope="request"
+ *                          type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
+ *                          path=".systemError"
+ * 							handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
+ * @struts:action-forward name="controlActivity" path="/controlBottomFrame.jsp"
+ * 
+ * ----------------XDoclet Tags--------------------
+ * 
+ */
+public class DummyLearnerAction extends LamsDispatchAction 
+{
+    //---------------------------------------------------------------------
+    // Instance variables
+    //---------------------------------------------------------------------
+	private static Logger log = Logger.getLogger(DummyLearnerAction.class);
+	
+    //---------------------------------------------------------------------
+    // Class level constants - Struts forward
+    //---------------------------------------------------------------------
+    private static final String CONTROL_ACTIVITY = "controlActivity";
+    
+    // Session attributes
+    private static final String PARAM_LESSONS = "lessons";
+    
+    /**
+     * <p>The Struts dispatch method that retrieves all active lessons for a 
+     * requested user.</p>
+     * 
+     * @param mapping An ActionMapping class that will be used by the Action class to tell
+     * the ActionServlet where to send the end-user.
+     *
+     * @param form The ActionForm class that will contain any data submitted
+     * by the end-user via a form.
+     * @param request A standard Servlet HttpServletRequest class.
+     * @param response A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where
+     *         the user is to go next.
+     * @throws IOException
+     * @throws ServletException
+     */
+    public ActionForward getActiveLessons(ActionMapping mapping,
+                                          ActionForm form,
+                                          HttpServletRequest request,
+                                          HttpServletResponse response) throws IOException,
+                                                                          ServletException
+    {
+        //initialize service object
+        ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+
+        //get learner.
+        User learner = LearningWebUtil.getUserData(getServlet().getServletContext());
+        if(log.isDebugEnabled())
+            log.debug("Getting active lessons for leaner:"+learner.getFullName()+"["+learner.getUserId()+"]");
+
+        LessonDTO [] lessons = learnerService.getActiveLessonsFor(learner);
+        request.getSession().setAttribute(PARAM_LESSONS, lessons); 
+        
+        return mapping.findForward(CONTROL_ACTIVITY);
+    }
+
+
+
+}
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
===================================================================
diff -u -r571c9c2146353e8a22f613a1283422f0b799928e -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(.../GroupingAction.java)	(revision 571c9c2146353e8a22f613a1283422f0b799928e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(.../GroupingAction.java)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -155,7 +155,7 @@
         //get current user and lesson data via http. It ensures they are availabe
         //in the http session. If not, we assume parameters are coming from 
         //request or falsh and we can create learner and lesson objects.
-        User learner = LearningWebUtil.getUserData(request,getServlet().getServletContext());
+        User learner = LearningWebUtil.getUserData(getServlet().getServletContext());
         Lesson lesson = LearningWebUtil.getLessonData(request,getServlet().getServletContext());
         
         Activity groupingActivity = LearningWebUtil.getActivityFromRequest(request,learnerService);
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
===================================================================
diff -u -r70bc80f5a9f065d4e01234bc06515295eff8edde -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(.../LearnerAction.java)	(revision 70bc80f5a9f065d4e01234bc06515295eff8edde)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(.../LearnerAction.java)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -124,7 +124,7 @@
         ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
         //get learner.
-        User learner = LearningWebUtil.getUserData(request, getServlet().getServletContext());
+        User learner = LearningWebUtil.getUserData(getServlet().getServletContext());
         if(log.isDebugEnabled())
             log.debug("Getting active lessons for leaner:"+learner.getFullName()+"["+learner.getUserId()+"]");
 
@@ -169,7 +169,7 @@
         ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
         //get user and lesson based on request.
-        User learner = LearningWebUtil.getUserData(request, getServlet().getServletContext());
+        User learner = LearningWebUtil.getUserData(getServlet().getServletContext());
         Lesson lesson = LearningWebUtil.getLessonData(request,getServlet().getServletContext());
 
         
@@ -343,7 +343,7 @@
         ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
         //getting requested object according to coming parameters
-        User learner = LearningWebUtil.getUserData(request, getServlet().getServletContext());
+        User learner = LearningWebUtil.getUserData(getServlet().getServletContext());
         Activity requestedActivity = learnerService.getActivity(new Long(activityId));
         
         //preparing tranfer object for flash
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
diff -u -r571c9c2146353e8a22f613a1283422f0b799928e -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision 571c9c2146353e8a22f613a1283422f0b799928e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -24,6 +24,7 @@
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -34,7 +35,10 @@
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 /**
@@ -59,35 +63,29 @@
 	public static final String PARAM_PROGRESS_ID = "progressId";
     
     /**
-     * Helper method to retrieve the user data. We always load up from http
-     * session first to optimize the performance. If no session cache available,
-     * we load it from data source.
+     * Helper method to retrieve the user data. Gets the id from the user details
+     * in the session then retrieves the real user object.
+     * 
      * @param request A standard Servlet HttpServletRequest class.
      * @param servletContext the servlet container that has all resources
      * @param surveyService the service facade of survey tool
      * @return the user data value object
      */
-    public static User getUserData(HttpServletRequest request, ServletContext servletContext)
+    public static User getUserData(ServletContext servletContext)
     {
-        //retrieve complete user data from http session
-        User currentUser = (User) request.getSession()
-                                              .getAttribute(ATTR_USER_DATA);
-        if(log.isDebugEnabled()&&currentUser!=null)
-            log.debug("user retrieved from http session:"+currentUser.getUserId());
-        
+        HttpSession ss = SessionManager.getSession();
+        UserDTO learner = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
         //if no session cache available, retrieve it from data source
-        if (currentUser == null)
-        {
-            int userId = WebUtil.readIntParam(request,PARAM_USER_ID);
-            currentUser = LearnerServiceProxy.getUserManagementService(servletContext)
-            								 .getUserById(new Integer(userId));
-            if(log.isDebugEnabled()&&currentUser!=null)
-                log.debug("user retrieved from database:"+currentUser.getUserId());
-            
-            //create session cache
-            request.getSession().setAttribute(ATTR_USER_DATA, currentUser);
+        if ( learner != null ) {
+	        User currentUser = LearnerServiceProxy.getUserManagementService(servletContext)
+	        								 .getUserById(learner.getUserID());
+	        if(log.isDebugEnabled()&&currentUser!=null)
+	            log.debug("user retrieved from database:"+currentUser.getUserId());
+	        
+	        return currentUser;
         }
-        return currentUser;
+        return null;
     }
     
     /**
@@ -130,7 +128,7 @@
             //initialize service object
             ILearnerService learnerService = LearnerServiceProxy.getLearnerService(servletContext);
 
-            User currentLearner = getUserData(request, servletContext);
+            User currentLearner = getUserData(servletContext);
             Lesson lesson = getLessonData(request,servletContext);
             LearnerProgress progress = learnerService.getProgress(currentLearner,lesson);
             bean = new SessionBean(currentLearner,lesson,progress);
@@ -179,7 +177,7 @@
             //initialize service object
             ILearnerService learnerService = LearnerServiceProxy.getLearnerService(servletContext);
 		    
-            User currentLearner = getUserData(request, servletContext);
+            User currentLearner = getUserData(servletContext);
             Lesson lesson = getLessonData(request,servletContext);
             
             learnerProgress = learnerService.getProgress(currentLearner,lesson);
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
===================================================================
diff -u -r6faa51252d8f8117db65e0a58ff295def4cf7af9 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java	(.../TestGateAction.java)	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java	(.../TestGateAction.java)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -130,15 +130,15 @@
      */
     private void initializeUserMap(boolean singleUser)
     {
-        User testUser = LearningWebUtil.getUserData(request,context);
+        User testUser = LearningWebUtil.getUserData(context);
         Lesson lesson = LearningWebUtil.getLessonData(request,context);
         LessonLearnerDataManager.cacheLessonUser(context,lesson,testUser);
         
         if(!singleUser)
         {
             request.getSession().removeAttribute("user");
             addRequestParameter(LearningWebUtil.PARAM_USER_ID, "1");
-            User testUser2 = LearningWebUtil.getUserData(request,context);
+            User testUser2 = LearningWebUtil.getUserData(context);
             LessonLearnerDataManager.cacheLessonUser(context,lesson,testUser2);
         }
 
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
===================================================================
diff -u -r571c9c2146353e8a22f613a1283422f0b799928e -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	(.../TestGroupingAction.java)	(revision 571c9c2146353e8a22f613a1283422f0b799928e)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	(.../TestGroupingAction.java)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -148,7 +148,7 @@
      */
     private void initializeUserMap()
     {
-        User testUser = LearningWebUtil.getUserData(request,context);
+        User testUser = LearningWebUtil.getUserData(context);
         Lesson lesson = LearningWebUtil.getLessonData(request,context);
         
         LessonLearnerDataManager.cacheLessonUser(context,lesson,testUser);
Index: lams_learning/web/WEB-INF/lams.tld
===================================================================
diff -u
--- lams_learning/web/WEB-INF/lams.tld	(revision 0)
+++ lams_learning/web/WEB-INF/lams.tld	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<taglib>
+
+   <tlibversion>1.0</tlibversion>
+   <jspversion>1.1</jspversion>
+   <shortname>lams</shortname>
+
+   <info><![CDATA[LAMS custom tags]]></info>
+
+   <tag>
+
+      <name>LAMSURL</name>
+      <tagclass>org.lamsfoundation.lams.web.tag.LAMSURLTag</tagclass>
+      <info><![CDATA[Output the Server URL as defined in the lams.xml configuration file.]]></info>
+
+   </tag>
+   <tag>
+
+      <name>user</name>
+      <tagclass>org.lamsfoundation.lams.web.tag.UserTag</tagclass>
+      <info><![CDATA[Output details from the shared session UserDTO object]]></info>
+
+      <attribute>
+         <name>property</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <name>css</name>
+      <tagclass>org.lamsfoundation.lams.web.tag.CssTag</tagclass>
+      <info><![CDATA[Output stylesheet based on the user preferences.]]></info>
+
+   </tag>
+   <tag>
+
+      <name>WebAppURL</name>
+      <tagclass>org.lamsfoundation.lams.web.tag.WebAppURLTag</tagclass>
+      <info><![CDATA[Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/]]></info>
+
+   </tag>
+
+</taglib>
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -14,14 +14,14 @@
   <form-beans>
 
     <form-bean
-      name="activityForm"
-      type="org.lamsfoundation.lams.learning.web.form.ActivityForm"
-    />
-    <form-bean
       name="testDblSubmitForm"
       type="org.lamsfoundation.lams.learning.web.form.TestDblSubmitForm"
     />
     <form-bean
+      name="activityForm"
+      type="org.lamsfoundation.lams.learning.web.form.ActivityForm"
+    />
+    <form-bean
       name="optionsActivityForm"
       type="org.lamsfoundation.lams.learning.web.form.OptionsActivityForm"
     />
@@ -86,8 +86,10 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/gate"
-      type="org.lamsfoundation.lams.learning.web.action.GateAction"
+      path="/grouping"
+      type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
+      name="GroupingForm"
+      scope="request"
       parameter="method"
       unknown="false"
       validate="false"
@@ -100,31 +102,19 @@
         scope="request"
       />
       <forward
-        name="waiting"
-        path=".gateWaiting"
+        name="viewGrouping"
+        path="/grouping.do?method=viewGrouping"
         redirect="false"
       />
-    </action>
-    <action
-      path="/DisplayOptionsActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
-      name="optionsActivityForm"
-      scope="request"
-      input="/Activity.do"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="displayOptions"
-        path=".optionsActivity"
+        name="showGroup"
+        path=".grouping"
         redirect="false"
       />
     </action>
     <action
-      path="/grouping"
-      type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
-      name="GroupingForm"
-      scope="request"
+      path="/learner"
+      type="org.lamsfoundation.lams.learning.web.action.LearnerAction"
       parameter="method"
       unknown="false"
       validate="false"
@@ -137,33 +127,75 @@
         scope="request"
       />
       <forward
-        name="viewGrouping"
-        path="/grouping.do?method=viewGrouping"
+        name="displayActivity"
+        path="/DisplayActivity.do"
         redirect="false"
       />
       <forward
-        name="showGroup"
-        path=".grouping"
+        name="welcome"
+        path=".welcome"
         redirect="false"
       />
     </action>
     <action
-      path="/LoadToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.LoadToolActivityAction"
+      path="/CompleteActivity"
+      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
+    </action>
+    <action
+      path="/DisplayToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
+      path="/test/DblSubmit"
+      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
+      name="testDblSubmitForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="displayTool"
-        path=".loadToolActivity"
+        name="display"
+        path="/test/dblSubmitTest.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/learner"
-      type="org.lamsfoundation.lams.learning.web.action.LearnerAction"
+      path="/ChooseActivity"
+      type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
+      path="/DisplayOptionsActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
+      name="optionsActivityForm"
+      scope="request"
+      input="/Activity.do"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayOptions"
+        path=".optionsActivity"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/gate"
+      type="org.lamsfoundation.lams.learning.web.action.GateAction"
       parameter="method"
       unknown="false"
       validate="false"
@@ -176,33 +208,44 @@
         scope="request"
       />
       <forward
-        name="displayActivity"
-        path="/DisplayActivity.do"
+        name="waiting"
+        path=".gateWaiting"
         redirect="false"
       />
-      <forward
-        name="welcome"
-        path=".welcome"
-        redirect="false"
-      />
     </action>
     <action
-      path="/CompleteActivity"
-      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
-      name="activityForm"
-      scope="request"
+      path="/dummylearner"
+      type="org.lamsfoundation.lams.learning.web.action.DummyLearnerAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
+      <exception
+        key="error.system.learner"
+        type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
+        handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
+        path=".systemError"
+        scope="request"
+      />
+      <forward
+        name="controlActivity"
+        path="/controlBottomFrame.jsp"
+        redirect="false"
+      />
     </action>
     <action
-      path="/DisplayToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
+      path="/LoadToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.LoadToolActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
+      <forward
+        name="displayTool"
+        path=".loadToolActivity"
+        redirect="false"
+      />
     </action>
     <action
       path="/DisplayActivity"
@@ -239,20 +282,6 @@
       />
     </action>
     <action
-      path="/test/DblSubmit"
-      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
-      name="testDblSubmitForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="display"
-        path="/test/dblSubmitTest.jsp"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/DisplayParallelActivity"
       type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivityAction"
       name="activityForm"
@@ -295,15 +324,6 @@
         redirect="false"
       />
     </action>
-    <action
-      path="/ChooseActivity"
-      type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
-      name="activityForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-    </action>
 
    <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r29cf7c9f1421fde2bc6a38c5f56632b5acc11d70 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 29cf7c9f1421fde2bc6a38c5f56632b5acc11d70)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -40,6 +40,7 @@
 		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
 		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
 		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 
 	</param-value>
 </context-param>
 <listener>
@@ -189,6 +190,12 @@
 		<description>Export Portfolio Download Page</description>		
 		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportDownloadServlet</servlet-class>
 	</servlet>
+	<servlet>
+		<servlet-name>exportNotSupported</servlet-name>
+		<display-name>Export Portfolio Unavailable</display-name>
+		<description>Tool does not support portfolio exports</description>
+		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportNotSupportedServlet</servlet-class>
+	</servlet>
 
   <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
@@ -226,6 +233,11 @@
 		<url-pattern>/exportDownload</url-pattern>
 </servlet-mapping>
 
+<servlet-mapping>
+	<servlet-name>exportNotSupported</servlet-name>
+	<url-pattern>/exportNotSupported</url-pattern>
+</servlet-mapping>
+
    <session-config>
       <session-timeout>120</session-timeout>
    </session-config>
@@ -327,6 +339,14 @@
 	<taglib-location>/WEB-INF/jstl/tlds/x-rt.tld</taglib-location>
 </taglib>
 
+<!--  ======================================================== -->	
+<!--   LAMS Tag Library -->
+<!--  ======================================================== -->	
+<taglib>
+   <taglib-uri>tags-lams</taglib-uri>
+   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+</taglib>
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
Index: lams_learning/web/controlBottomFrame.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/controlBottomFrame.jsp	(.../controlBottomFrame.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/controlBottomFrame.jsp	(.../controlBottomFrame.jsp)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -23,12 +23,14 @@
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html:html locale="true" xhtml="true">
 
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-		<link href="css/learner.css" rel="stylesheet" type="text/css">
+		<link href="<lams:LAMSURL/>/css/default.css" rel="stylesheet" type="text/css"/>
 		<title>Learner :: LAMS</title>
 		<SCRIPT LANGUAGE="VBScript">
 			<!-- 
@@ -94,19 +96,43 @@
 		<!-- URL's used in the movie-->
 		<!-- text used in the movie-->
 		<!--Flash UI component-->
-		<OBJECT classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+		<!-- OBJECT classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
 				codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" name="leftUI"
-				WIDTH="100%" HEIGHT="100%" ALIGN="" id="leftUI">
-			<PARAM NAME=movie VALUE="LearnerLeftUI.swf" />
-			<PARAM NAME=quality VALUE="high" />
-			<PARAM NAME=scale VALUE="noscale" />
-			<PARAM NAME=salign VALUE="LT" />
-			<PARAM NAME=flashvars VALUE="pollInterval=10000" />
-			<!--<PARAM NAME=bgcolor VALUE=#D0D0E8>-->
-			<EMBED src="LearnerLeftUI.swf?pollInterval=10000"  WIDTH="100%" HEIGHT="100%" ALIGN="" quality=high scale=noscale salign=LT
-					TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/go/getflashplayer" swliveconnect=true name="leftUI">
-			</EMBED> 
-		</OBJECT>
+				WIDTH="100%" HEIGHT="100%" ALIGN="" id="leftUI"-->
+			<!-- PARAM NAME=movie VALUE="LearnerLeftUI.swf" -->
+			<!-- PARAM NAME=quality VALUE="high" -->
+			<!-- PARAM NAME=scale VALUE="noscale" -->
+			<!-- PARAM NAME=salign VALUE="LT" -->
+			<!-- PARAM NAME=flashvars VALUE="pollInterval=10000" -->
+			<!--<PARAM NAME=bgcolor VALUE=#D0D0E8 -->
+			<!-- EMBED src="LearnerLeftUI.swf?pollInterval=10000"  WIDTH="100%" HEIGHT="100%" ALIGN="" quality=high scale=noscale salign=LT
+					TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/go/getflashplayer" swliveconnect=true name="leftUI"-->
+			<!-- /EMBED-->
+		<!-- /OBJECT-->
 		
+
+		<h2>Available Lessons</H2>
+		<p>[Flash component goes here]</p>
+		<p>Select a lesson from the list below.</p>
+		<table width="100%" border="0" cellspacing="2" cellpadding="2" summary="This table is being used for layout purposes only">
+		<c:forEach var="lesson" items="${lessons}">
+		<c:if test="${lesson.lessonStateId<6}">
+			<TR><TD>
+				<A HREF="<lams:WebAppURL/>/learner.do?method=joinLesson&userId=<lams:user property="userID"/>&lessonId=<c:out value="${lesson.lessonId}"/>" target="contentFrame">
+				<STRONG><c:out value="${lesson.lessonName}"/></STRONG></A>
+			<c:choose>
+				<c:when test="${lesson.lessonStateId==1}">[Created]</c:when>
+				<c:when test="${lesson.lessonStateId==2}">[Scheduled]</c:when>
+				<c:when test="${lesson.lessonStateId==3}">[Started]</c:when>
+				<c:when test="${lesson.lessonStateId==4}">[Suspended]</c:when>
+				<c:when test="${lesson.lessonStateId==5}">[Finished]</c:when>
+			</c:choose>
+			<BR><c:out value="${lesson.lessonDescription}"/>
+			</TD></TR>
+			<TR><TD><HR></TD></TR>
+		</c:if>
+		</c:forEach>
+		</table>
+
 	</body>
 </html:html>
Index: lams_learning/web/controlFrame.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/controlFrame.jsp	(.../controlFrame.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/controlFrame.jsp	(.../controlFrame.jsp)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -25,18 +25,21 @@
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html:html locale="true" xhtml="true">
 
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-		<link href="css/learner.css" rel="stylesheet" type="text/css">
+		<lams:css/>
 		<title>Learner :: LAMS</title>
 	</head>
 
 	<frameset rows="40,*" cols="*" framespacing="0" frameborder="NO" border="0">
 		<frame src="controlTopFrame.jsp" name="topFrame" scrolling="NO" noresize >
-		<frame src="controlBottomFrame.jsp" name="bottomFrame" scrolling="NO">
+		<!-- real frame, which uses Flash <frame src="controlBottomFrame.jsp" name="bottomFrame" scrolling="NO"> -->
+		<frame src="dummylearner.do?method=getActiveLessons" name="bottomFrame" scrolling="NO">
 	</frameset>
 	
 	<noframes>
Index: lams_learning/web/controlTopFrame.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/controlTopFrame.jsp	(.../controlTopFrame.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/controlTopFrame.jsp	(.../controlTopFrame.jsp)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -16,19 +16,39 @@
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
 USA
 
+http://www.gnu.org/licenses/gpl.<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
 http://www.gnu.org/licenses/gpl.txt
 --%>
 
 <%@ page language="java"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html:html locale="true" xhtml="true">
 
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-		<link href="css/learner.css" rel="stylesheet" type="text/css">
+		<lams:css/>
 		<title>Learner :: LAMS</title>
 	</head>
 
@@ -37,6 +57,7 @@
 		<!-- URL's used in the movie-->
 		<!-- text used in the movie-->
 		<!--flash button pane-->
+		
 		<OBJECT classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
 				codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"
 				WIDTH="100%" HEIGHT="100%" ALIGN="">
@@ -48,6 +69,44 @@
 					TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/go/getflashplayer">
 			</EMBED>
 		</OBJECT>
+
 	
 	</body>
 </html:html>
+txt
+--%>
+
+<%@ page language="java"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<html:html locale="true" xhtml="true">
+
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+		<link href="<lams:LAMSURL/>/css/default.css" rel="stylesheet" type="text/css"/>
+		<title>Learner :: LAMS</title>
+	</head>
+
+	<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+
+		<!-- URL's used in the movie-->
+		<!-- text used in the movie-->
+		<!--flash button pane-->
+		<OBJECT classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+				codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"
+				WIDTH="100%" HEIGHT="100%" ALIGN="">
+			<PARAM NAME=movie VALUE="LearnerTopUI.swf" />
+			<PARAM NAME=quality VALUE=high />
+			<PARAM NAME=scale VALUE=noscale />
+			<PARAM NAME=salign VALUE=LT />
+			<EMBED src="LearnerTopUI.swf" quality=high scale=noscale salign=LT  WIDTH="100%" HEIGHT="100%" ALIGN=""
+					TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/go/getflashplayer">
+			</EMBED>
+		</OBJECT>
+	
+	</body>
+</html:html>
Index: lams_learning/web/layout/activityLayout.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/layout/activityLayout.jsp	(.../activityLayout.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/layout/activityLayout.jsp	(.../activityLayout.jsp)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -24,6 +24,8 @@
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html:html locale="true" xhtml="true">
 
@@ -33,7 +35,7 @@
 	<head>
 		<title><c:out value="${pageTitle}" /></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-		<link href="<c:url value="/css/learner.css" />" rel="stylesheet" type="text/css" />
+		<lams:css/>
 	  <script language="JavaScript" type="text/JavaScript">
 	        <!--
 	        function pviiClassNew(obj, new_style) { //v2.7 by PVII
Index: lams_learning/web/layout/layout.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/layout/layout.jsp	(.../layout.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/layout/layout.jsp	(.../layout.jsp)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -24,6 +24,8 @@
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html:html locale="true" xhtml="true">
 
@@ -34,11 +36,12 @@
 	<head>
 		<title>LAMS</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+		<lams:css/>
 		<link href="css/learner.css" rel="stylesheet" type="text/css">
 	</head>
 
 	<c:choose>
-		<c:when test="${includeBodyToag}">
+		<c:when test="${includeBodyTag}">
 		
 			<body>
 				<tiles:insert attribute="body" />
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -58,12 +58,10 @@
 		</script>
 		
 		<div align="center">
-			<table width="100%" border="0" align="center" bgcolor="#9DC5EC" summary="This table is being used for layout purposes">
+			<table width="100%" border="0" align="center" summary="This table is being used for layout purposes">
 				<tr>
 					<td valign="top">
-						<div align="center" class="heading">
-							<fmt:message key="message.activity.loading" />
-						</div>
+						<H1><fmt:message key="message.activity.loading" /></H1>
 					</td>
 				</tr>
 			</table>
Index: lams_learning/web/main.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/main.jsp	(.../main.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/main.jsp	(.../main.jsp)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -24,16 +24,17 @@
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html:html locale="true" xhtml="true">
 
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-		<link href="css/learner.css" rel="stylesheet" type="text/css">
+		<lams:css/>
 		<title>Learner :: LAMS</title>
-		<script language="JavaScript" type="text/JavaScript"><!--
-			// TODO: replace with proper URL
-			var serverURL = "http://127.0.0.1:8080/lams/learning/";
+		<script language="JavaScript" type="text/JavaScript">
+			<!--
+			var serverURL = <lams:LAMSURL/>;
 			//-->
 		</script>
 	</head>
Index: lams_learning/web/welcome.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/welcome.jsp	(.../welcome.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/welcome.jsp	(.../welcome.jsp)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -9,11 +9,4 @@
           	</div>
         </td>
     </tr>
-    <TR>
-		<TD>
-			<html:link href="/lams/learning/learner.do?method=joinLesson&userId=2&lessonId=2" target="_self" >
-				Join a started Lesson
-			</html:link>
-		</TD>
-    </TR>
 </table>