Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DummyLearnerAction.java,v
diff -u -r1.8 -r1.9
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java	1 Jun 2006 22:58:57 -0000	1.8
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java	6 Jun 2006 02:35:26 -0000	1.9
@@ -41,6 +41,7 @@
 import org.lamsfoundation.lams.lesson.dto.LessonDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 /** 
@@ -144,7 +145,7 @@
 
         //get user and lesson based on request.
         Integer learner = LearningWebUtil.getUserId();
-        long lessonID = WebUtil.readLongParam(request,LearningWebUtil.PARAM_LESSON_ID);
+        long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
 
         
         if(log.isDebugEnabled())
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java,v
diff -u -r1.14 -r1.15
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	2 Jun 2006 07:56:26 -0000	1.14
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	6 Jun 2006 02:35:26 -0000	1.15
@@ -46,6 +46,7 @@
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 /**
@@ -158,7 +159,7 @@
         	groups.addAll(grouping.getGroups());
         
         request.getSession().setAttribute(GROUPS,groups);
-        request.setAttribute(LearningWebUtil.PARAM_ACTIVITY_ID,	activity.getActivityId());
+        request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID,	activity.getActivityId());
         
         return mapping.findForward(SHOW_GROUP);
     }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v
diff -u -r1.22 -r1.23
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	1 Jun 2006 22:58:57 -0000	1.22
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	6 Jun 2006 02:35:26 -0000	1.23
@@ -146,7 +146,7 @@
 	
 	        //get user and lesson based on request.
 	        Integer learner = LearningWebUtil.getUserId();
-	        long lessonID = WebUtil.readLongParam(request,LearningWebUtil.PARAM_LESSON_ID);
+	        long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
 	
 	        
 	        if(log.isDebugEnabled())
@@ -361,7 +361,7 @@
     	try {
 	
 	        //get parameter
-	        long activityId = WebUtil.readLongParam(request,LearningWebUtil.PARAM_ACTIVITY_ID);
+	        long activityId = WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID);
 	        
 	        //initialize service object
 	        ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java,v
diff -u -r1.17 -r1.18
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	1 Jun 2006 04:47:53 -0000	1.17
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	6 Jun 2006 02:35:26 -0000	1.18
@@ -38,16 +38,15 @@
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceException;
 import org.lamsfoundation.lams.learningdesign.Activity;
-import org.lamsfoundation.lams.learningdesign.ParallelActivity;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
-import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * This class contains the standard struts action mappings for errors as
@@ -321,8 +320,9 @@
 
         if (activity != null)
         {
-       		url += url.indexOf("?") > -1 ? "&" : "?";
-       		url += "activityId=" + activity.getActivityId();
+            url = WebUtil.appendParameterToURL(url,
+            		AttributeNames.PARAM_ACTIVITY_ID,
+            		activity.getActivityId().toString());
         }
         if (useContext)
         {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java,v
diff -u -r1.11 -r1.12
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	1 Jun 2006 22:58:57 -0000	1.11
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	6 Jun 2006 02:35:26 -0000	1.12
@@ -53,9 +53,7 @@
     //---------------------------------------------------------------------
     // Class level constants - session attributes
     //---------------------------------------------------------------------
-	public static final String PARAM_LESSON_ID = "lessonId";
-	public static final String PARAM_ACTIVITY_ID = "activityId";
-	public static final String PARAM_PROGRESS_ID = "progressId";
+	public static final String PARAM_PROGRESS_ID = "progressID";
     
     /**
      * Helper method to retrieve the user data. Gets the id from the user details
@@ -84,12 +82,12 @@
     public static Long getLessonId(HttpServletRequest request)
     {
         HttpSession ss = SessionManager.getSession();
-        Long lessonId = (Long)ss.getAttribute(PARAM_LESSON_ID);
+        Long lessonId = (Long)ss.getAttribute(AttributeNames.PARAM_LESSON_ID);
         
         if(lessonId ==null)
         {
             // not in the session - is it in the request?
-            lessonId = WebUtil.readLongParam(request,PARAM_LESSON_ID,true);
+            lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID,true);
         }
         return lessonId;
     }
@@ -108,9 +106,9 @@
     {
         HttpSession ss = SessionManager.getSession();
         if ( lessonId != null ) {
-        	ss.setAttribute(PARAM_LESSON_ID, lessonId);
+        	ss.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
         } else {
-        	ss.removeAttribute(PARAM_LESSON_ID);
+        	ss.removeAttribute(AttributeNames.PARAM_LESSON_ID);
         }
     }
    
@@ -183,7 +181,7 @@
         
         if(activity == null)
         {
-            long activityId = WebUtil.readLongParam(request,PARAM_ACTIVITY_ID);
+            long activityId = WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID);
             
             activity = learnerService.getActivity(new Long(activityId));
             
Index: lams_learning/web/dummyControlFrame.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/dummyControlFrame.jsp,v
diff -u -r1.3 -r1.4
--- lams_learning/web/dummyControlFrame.jsp	25 May 2006 01:02:50 -0000	1.3
+++ lams_learning/web/dummyControlFrame.jsp	6 Jun 2006 02:35:26 -0000	1.4
@@ -69,7 +69,7 @@
 			<c:if test="${lesson.lessonDescription}">
 				<BR><c:out value="${lesson.lessonDescription}"/>
 			</c:if>
-			<BR><A HREF="<lams:WebAppURL/>dummylearner.do?method=joinLesson&userId=<lams:user property="userID"/>&lessonId=<c:out value="${lesson.lessonID}"/>" target="contentFrame">Participate</A>
+			<BR><A HREF="<lams:WebAppURL/>dummylearner.do?method=joinLesson&userId=<lams:user property="userID"/>&lessonID=<c:out value="${lesson.lessonID}"/>" target="contentFrame">Participate</A>
 			<BR><A HREF=javascript:openPopUp('<lams:WebAppURL/>exportWaitingPage.jsp?mode=learner&lessonID=<c:out value="${lesson.lessonID}"/>');>Export Portfolio</A>
 			</TD></TR>
 			<TR><TD><HR></TD></TR>
Index: lams_learning/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.7 -r1.8
--- lams_learning/web/optionsActivity.jsp	24 Apr 2006 04:26:35 -0000	1.7
+++ lams_learning/web/optionsActivity.jsp	6 Jun 2006 02:35:26 -0000	1.8
@@ -30,7 +30,7 @@
 			var form = document.forms[0];
 			var elements = form.elements;
 			for (var i = 0; i < elements.length; i++) {
-				if (elements[i].name == "activityId") {
+				if (elements[i].name == "activityID") {
 					if (elements[i].checked) {
 						validated = true;
 						break;
@@ -109,7 +109,7 @@
 														<%--html:img page="/images/tick.gif" /--%>
 													</c:when>
 													<c:otherwise>
-														<input type="radio" name="activityId"
+														<input type="radio" name="activityID"
 															value="<c:out value="${activityURL.activityId}"/>" />
 													</c:otherwise>
 												</c:choose>
@@ -156,7 +156,7 @@
 	</html:form>
 	<html:form action="/CompleteActivity" method="POST">
 		<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
-		<input type="hidden" name="activityId" value="<c:out value="${optionsActivityForm.activityId}" />" />
+		<input type="hidden" name="activityID" value="<c:out value="${optionsActivityForm.activityId}" />" />
 	</html:form>
 </div>
 
Index: lams_learning/web/requestURL.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/requestURL.jsp,v
diff -u -r1.5 -r1.6
--- lams_learning/web/requestURL.jsp	1 Jun 2006 04:47:53 -0000	1.5
+++ lams_learning/web/requestURL.jsp	6 Jun 2006 02:35:26 -0000	1.6
@@ -33,9 +33,6 @@
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	</head>
 	
-		<%--c:if test="${empty activityId}">
-			<bean:parameter id="activityId" name="activityId" />
-		</c:if--%>
 		<c:if test="${empty url}">
 			<bean:parameter id="url" name="url" />
 		</c:if>
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.25 -r1.26
--- lams_learning/web/WEB-INF/struts/struts-config.xml	17 May 2006 07:25:02 -0000	1.25
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	6 Jun 2006 02:35:26 -0000	1.26
@@ -118,15 +118,20 @@
         scope="request"
       />
       <forward
-        name="viewGrouping"
+        name="viewGroup"
         path="/grouping.do?method=viewGrouping"
         redirect="false"
       />
       <forward
         name="showGroup"
-        path=".grouping"
+        path=".showgroup"
         redirect="false"
       />
+      <forward
+        name="waitGroup"
+        path=".waitgroup"
+        redirect="false"
+      />
     </action>
     <action
       path="/dummylearner"
Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.15 -r1.16
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	17 May 2006 07:25:02 -0000	1.15
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	6 Jun 2006 02:35:26 -0000	1.16
@@ -91,11 +91,16 @@
 		<put name="body" value="/notebook/detail.jsp"/>
 	</definition>
 	<!-- Grouping definitions -->
-	<definition name=".grouping" extends=".activityLayout">
-		<put name="pageTitle" value="Grouping Result" />
+	<definition name=".showgroup" extends=".activityLayout">
+		<put name="pageTitle" value="Grouping" />
 		<put name="title" value="Grouping" />
-		<put name="body" value="/grouping/grouping.jsp"/>
+		<put name="body" value="/grouping/show.jsp"/>
 	</definition>
+	<definition name=".waitgroup" extends=".groupWaitLayout">
+		<put name="pageTitle" value="Grouping" />
+		<put name="title" value="Grouping" />
+		<put name="body" value="/grouping/wait.jsp"/>
+	</definition>
 	<!-- Gate definitions -->
 	<definition name=".synchGate" extends=".gateLayout">
 		<put name="body" value="/gate/synchGateContent.jsp"/>
Index: lams_learning/web/grouping/show.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/grouping/show.jsp,v
diff -u -r1.1 -r1.2
--- lams_learning/web/grouping/show.jsp	2 Jun 2006 07:56:26 -0000	1.1
+++ lams_learning/web/grouping/show.jsp	6 Jun 2006 02:35:26 -0000	1.2
@@ -27,7 +27,7 @@
 
 <div align="center">
 
-	<html:form action="/grouping.do?method=completeActivity&userId=${user.userId}&lessonId=${lesson.lessonId}&activityId=${activityId}" target="_self">
+	<html:form action="/grouping.do?method=completeActivity&userId=${user.userId}&lessonId=${lesson.lessonId}&activityID=${activityID}" target="_self">
 
 		<h1><fmt:message key="label.view.groups.title"/></h1>
 		<table width="100%" border="0" cellpadding="3" cellspacing="4" class="body" summary="This table is being used for layout purposes">