Index: lams_learning/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-forms.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/conf/xdoclet/struts-forms.xml	21 Feb 2005 05:31:39 -0000	1.2
+++ lams_learning/conf/xdoclet/struts-forms.xml	1 Apr 2005 06:03:39 -0000	1.3
@@ -18,3 +18,5 @@
 
 http://www.gnu.org/licenses/gpl.txt
 -->
+<form-bean name="GroupingForm"  type="org.apache.struts.validator.DynaValidatorForm">
+</form-bean>
\ No newline at end of file
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.1 -r1.2
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	31 Mar 2005 07:36:22 -0000	1.1
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	1 Apr 2005 06:03:39 -0000	1.2
@@ -57,7 +57,8 @@
  * 
  * ----------------XDoclet Tags--------------------
  * 
- * @struts:action path="/grouping" 
+ * @struts:action name = "GroupingForm"
+ * 				  path="/grouping" 
  *                parameter="method" 
  *                validate="false"
  * @struts.action-exception key="error.system.learner" scope="request"
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/Attic/TestGroupingAction.java,v
diff -u -r1.1 -r1.2
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	1 Apr 2005 02:28:01 -0000	1.1
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	1 Apr 2005 06:03:39 -0000	1.2
@@ -124,7 +124,7 @@
         actionPerform();
     
         verifyNoActionErrors();
-        verifyForwardPath(".grouping");
+        verifyTilesForward("showGroup",".grouping");
         
         List groups = (List)httpSession.getAttribute("groups");
         assertNotNull("verify groups",groups);
Index: lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/web/WEB-INF/spring/Attic/learningApplicationContext.xml,v
diff -u -r1.5 -r1.6
--- lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml	31 Mar 2005 07:36:23 -0000	1.5
+++ lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml	1 Apr 2005 06:03:39 -0000	1.6
@@ -33,6 +33,7 @@
 				<prop key="calculateProgress">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
 				<prop key="completeToolSession">PROPAGATION_REQUIRES_NEW,ISOLATION_READ_COMMITTED</prop>
 				<prop key="exitLesson">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="performGrouping">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
 			</props>
 		</property>
 	</bean> 
Index: lams_learning/test/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/test/web/WEB-INF/struts/tiles-defs.xml	14 Mar 2005 07:12:03 -0000	1.2
+++ lams_learning/test/web/WEB-INF/struts/tiles-defs.xml	1 Apr 2005 06:03:39 -0000	1.3
@@ -77,5 +77,11 @@
 		<put name="title" value="Journal" />
 		<put name="body" value="/notebook/detail.jsp"/>
 	</definition>
+	<!-- Grouping definitions -->
+	<definition name=".grouping" extends=".activityLayout">
+		<put name="pageTitle" value="Grouping Result" />
+		<put name="title" value="Grouping" />
+		<put name="body" value="/grouping/grouping.jsp"/>
+	</definition>
 	
 </tiles-definitions>
\ No newline at end of file
Index: lams_learning/web/grouping/grouping.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/grouping/Attic/grouping.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/grouping/grouping.jsp	1 Apr 2005 06:03:39 -0000	1.1
@@ -0,0 +1,79 @@
+<!--
+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
+-->
+
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html-el" %>
+<%@ taglib uri="/WEB-INF/struts/struts-bean-el.tld" prefix="bean-el" %>
+<%@ taglib uri="/WEB-INF/struts/struts-logic-el.tld" prefix="logic-el" %>
+<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>		
+<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
+
+<div align="center">
+
+	<html-el:form action="/grouping.do?method=completeActivity" method="GET">
+
+		<span class="error">
+			<%-- Struts error messages --%>
+		</span>
+		
+		<table width="100%" border="0" cellpadding="3" cellspacing="4" class="body" summary="This table is being used for layout purposes">
+			<tr bgcolor="#999999"> 
+				<td colspan="2" align="left" class="bodyBold">
+					<table width="100%" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td class="bodyBold"><font color="#FFFFFF">Grouping Result</font></td>
+							<td align="right" class="smallText">
+								<font color="#FFFFFF">
+								</font>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<logic-el:iterate id="group" name="groups" indexId="gId"> 
+			<tr>
+				<td align="right" class="bodyBold" style="{border-right: solid #CCCCCC 1px; border-bottom: solid #CCCCCC 1px; }">
+					Group <c:out value="${gId+1}"/>
+				</td>
+				<td width="85%" align="left" class="body"  style="{border-bottom: solid #CCCCCC 1px; }">
+					<table width="100%" border="0" cellpadding="0" cellspacing="0">
+						<c:forEach items="${group.users}" var="user">
+						<tr>
+							<td class="bodyBold">
+								<c:out value="${user.firstName}"/>,
+								<c:out value="${user.lastName}"/>
+							</td>
+						</tr>
+						</c:forEach>
+					</table>		
+				</td>
+			</tr>
+			</logic-el:iterate>
+			<tr> 
+				<td align="right" valign="top" class="bodyBold">&nbsp;</td>
+				<td align="right">
+					<html-el:submit styleClass="button" value="Finished" onmouseover="pviiClassNew(this,'buttonover')" onmouseout="pviiClassNew(this,'button')"/> 
+				</td>
+			</tr>
+		</table>
+
+	</html-el:form>
+
+</div>
\ No newline at end of file