Index: lams_learning/test/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r29879f8cfb5c99a316f3745364f1913c6c4559d3 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/test/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 29879f8cfb5c99a316f3745364f1913c6c4559d3)
+++ lams_learning/test/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -26,27 +26,7 @@
       type="org.lamsfoundation.lams.learning.web.form.OptionsActivityForm"
     />
 
-   <!--
-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
--->
-<form-bean name="GroupingForm"  type="org.apache.struts.validator.DynaValidatorForm">
+   <form-bean name="GroupingForm"  type="org.apache.struts.validator.DynaValidatorForm">
 </form-bean>
   </form-beans>
 
@@ -57,50 +37,14 @@
   -->
 
   <!-- ========== Global Forward Definitions =================================== -->
-  <!--
-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
--->
-
-<global-forwards>
+  <global-forwards>
 	<forward name="error" path="/error.jsp" />
 	<forward name="noSessionError" path="/noSessionError.jsp" />
 </global-forwards>
 
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <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"
@@ -121,6 +65,21 @@
       />
     </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="/grouping"
       type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
       name="GroupingForm"
@@ -148,6 +107,26 @@
       />
     </action>
     <action
+      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="/LoadToolActivity"
       type="org.lamsfoundation.lams.learning.web.action.LoadToolActivityAction"
       name="activityForm"
@@ -267,25 +246,6 @@
       />
     </action>
     <action
-      path="/exportPortfolio"
-      type="org.lamsfoundation.lams.learning.export.web.action.ExportPortfolioAction"
-      unknown="false"
-      validate="false"
-    >
-      <exception
-        key="error.system.exportPortfolio"
-        type="org.lamsfoundation.lams.learning.export.ExportPortfolioException"
-        handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
-        path=".systemError"
-        scope="request"
-      />
-      <forward
-        name="displayPortfolio"
-        path="/exportPortfolio.jsp"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/ChooseActivity"
       type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
       name="activityForm"
@@ -295,27 +255,6 @@
     >
     </action>
 
-   <!--
-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
--->
-
 <action path="/index"
 	type="org.apache.struts.actions.ForwardAction"
 	parameter="/main.jsp" />
@@ -338,50 +277,8 @@
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-  <!--
-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
--->
-
 <message-resources parameter="org.lamsfoundation.lams.learning.LearningResources" />
 
-  <!--
-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
--->
-
 <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" />