Index: lams_contentrepository/build.properties
===================================================================
diff -u -r831887e4c41c73bf70a79e10d6f279e2bcfd11a8 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_contentrepository/build.properties	(.../build.properties)	(revision 831887e4c41c73bf70a79e10d6f279e2bcfd11a8)
+++ lams_contentrepository/build.properties	(.../build.properties)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,22 +1,3 @@
-#   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 
-
 # project-wide properties 
 product=lams-contentrepository
 
Index: lams_contentrepository/build.xml
===================================================================
diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_contentrepository/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
+++ lams_contentrepository/build.xml	(.../build.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,34 +1,5 @@
 <?xml version="1.0"?>
 
-<!-- 
-  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 
--->
-
-<!-- 
-The DOCTYPE declaration declares the location of database-specific parts of the
-Ant build file. 
--->
-<!DOCTYPE project [
-	<!ENTITY properties SYSTEM "file:./properties.xml">
-]>
-
 <project name="LAMS-ContentRepository" basedir="." default="usage">
 
 	<!-- import properties from the specified file -->
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
===================================================================
diff -u -r3b0119f1c5ef6fd0fb497a0219c2dd2f7cdf6d52 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision 3b0119f1c5ef6fd0fb497a0219c2dd2f7cdf6d52)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<!-- 
-  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 
--->
-
-
 <!--
   - Application context definition for content repository application context.
   - Requires lams.jar applicationContent.xml.
Index: lams_contentrepository/web/WEB-INF/struts/.struts-config.mex
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_contentrepository/web/WEB-INF/struts/.struts-config.mex	(.../.struts-config.mex)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/web/WEB-INF/struts/.struts-config.mex	(.../.struts-config.mex)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1 +1,90 @@
-<FlowViewLayout Version="1.1"><StrutsActivity path="/loginRepository.do" location="384,76" dimension="150,114" /><StrutsActivity path="/nodeSelection.do" location="384,265" dimension="150,114" /><StrutsActivity path="/addFileContent.do" location="375,435" dimension="150,140" /><StrutsActivity path="logout;6" location="84,1485" dimension="150,75" /><StrutsActivity path="/error.jsp" location="660,270" dimension="150,62" /><StrutsActivity path="/loginRepository.jsp" location="84,76" dimension="150,62" /><StrutsActivity path="/nodeSelection.jsp" location="90,300" dimension="150,62" /><StrutsActivity path="/packageList.jsp" location="984,493" dimension="150,62" /><StrutsActivity path="/addNode.jsp" location="615,495" dimension="150,62" /><StrutsActivity path="/loggedout.html" location="384,1834" dimension="150,62" /><StrutsActivity path="/logout.html" location="384,1485" dimension="150,62" /><StrutsActivity path="loginRepository.jsp" location="84,76" dimension="150,62" /><StrutsActivity path="bnd;6" location="84,1909" dimension="150,75" /><StrutsTransition id="/loginRepository.jsp,null,/loginRepository.do,2" routingType="0" /><StrutsTransition id="/addFileContent.do,success,/nodeSelection.do,1" routingType="0" /><StrutsTransition id="/nodeSelection.do,nodelist,/nodeSelection.jsp,1" routingType="0" /><StrutsTransition id="/loginRepository.do,success,/nodeSelection.do,1" routingType="0" /><StrutsTransition id="/nodeSelection.jsp,null,/nodeSelection.do,2" routingType="0" /><StrutsTransition id="/nodeSelection.do,error,/error.jsp,1" routingType="0" /><StrutsTransition id="logout;6,null,/loggedout.html,1" routingType="0" /><StrutsTransition id="/loginRepository.do,error,/error.jsp,1" routingType="0" /><StrutsTransition id="/addFileContent.do,error,/error.jsp,1" routingType="0" /><StrutsTransition id="/nodeSelection.do,packagelist,/packageList.jsp,1" routingType="0" /><StrutsTransition id="/addNode.jsp,null,/addFileContent.do,2" routingType="0" /></FlowViewLayout>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<FlowViewLayout Version="1.2">
+  <StrutsActivity path="/loginRepository.do" location="384,76" dimension="150,114" />
+  <StrutsActivity path="/addFileContent.do" location="375,435" dimension="150,140" />
+  <StrutsActivity path="/nodeSelection.do" location="384,265" dimension="150,114" />
+  <StrutsActivity path="logout;6" location="84,1485" dimension="150,75" />
+  <StrutsActivity path="/error.jsp" location="660,270" dimension="150,62" />
+  <StrutsActivity path="/loginRepository.jsp" location="84,76" dimension="150,62" />
+  <StrutsActivity path="nodeSelection.jsp" location="650,150" dimension="114,49" />
+  <StrutsActivity path="/nodeSelection.jsp" location="90,300" dimension="150,62" />
+  <StrutsActivity path="/packageList.jsp" location="984,493" dimension="150,62" />
+  <StrutsActivity path="/loggedout.html" location="384,1834" dimension="150,62" />
+  <StrutsActivity path="/addNode.jsp" location="615,495" dimension="150,62" />
+  <StrutsActivity path="/logout.html" location="384,1485" dimension="150,62" />
+  <StrutsActivity path="loginRepository.jsp" location="84,76" dimension="150,62" />
+  <StrutsActivity path="bnd;6" location="84,1909" dimension="150,75" />
+  <StrutsTransition id="/loginRepository.jsp,null,/loginRepository.do,2" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="234,107" />
+      <AbsolutePoint location="384,107" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="/nodeSelection.do,nodelist,/nodeSelection.jsp,1" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="384,322" />
+      <AbsolutePoint location="240,322" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="nodeSelection.jsp,null,/addFileContent.do,2" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="650,174" />
+      <AbsolutePoint location="579,174" />
+      <AbsolutePoint location="579,510" />
+      <AbsolutePoint location="525,510" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="/addFileContent.do,success,/nodeSelection.do,1" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="450,435" />
+      <AbsolutePoint location="450,379" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="/loginRepository.do,success,/nodeSelection.do,1" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="459,190" />
+      <AbsolutePoint location="459,265" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="/nodeSelection.jsp,null,/nodeSelection.do,2" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="240,352" />
+      <AbsolutePoint location="384,352" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="/nodeSelection.do,error,/error.jsp,1" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="534,317" />
+      <AbsolutePoint location="660,317" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="logout;6,null,/loggedout.html,1" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="159,1560" />
+      <AbsolutePoint location="159,1865" />
+      <AbsolutePoint location="384,1865" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="/loginRepository.do,error,/error.jsp,1" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="534,133" />
+      <AbsolutePoint location="779,133" />
+      <AbsolutePoint location="779,270" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="/nodeSelection.do,packagelist,/packageList.jsp,1" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="534,347" />
+      <AbsolutePoint location="1059,347" />
+      <AbsolutePoint location="1059,493" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+  <StrutsTransition id="/addFileContent.do,error,/error.jsp,1" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="525,478" />
+      <AbsolutePoint location="735,478" />
+      <AbsolutePoint location="735,332" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
+</FlowViewLayout>
+
Index: lams_contentrepository/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rb01fb12780783a75d4df4140bca833cd69bc940d -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_contentrepository/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision b01fb12780783a75d4df4140bca833cd69bc940d)
+++ lams_contentrepository/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -119,7 +119,7 @@
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-     <message-resources parameter="org.lamsfoundation.lams.contentrepository.struts.ApplicationResources"/>
+     <message-resources parameter="org.lamsfoundation.lams.contentrepository.applicationResources"/>
 
    <!-- Define your Struts plugins in a file called struts-plugins.xml and place it in your merge directory. -->
 
Index: lams_learning/build.xml
===================================================================
diff -u -rbcf3286528e2a9f2d45bdfb2ffb3eec7829b3b39 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/build.xml	(.../build.xml)	(revision bcf3286528e2a9f2d45bdfb2ffb3eec7829b3b39)
+++ lams_learning/build.xml	(.../build.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,29 +1,6 @@
 <?xml version="1.0"?>
-<!--
-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
--->
-
-<!DOCTYPE project [
-]>
-
-
 <project name="lams_learning" default="usage" basedir=".">
 
 	<!-- import properties from the specified file -->
Index: lams_learning/conf/xdoclet/filter-mappings.xml
===================================================================
diff -u -r05391c36b578d825a02985084cbdd948366ae182 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 05391c36b578d825a02985084cbdd948366ae182)
+++ lams_learning/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,23 +1,4 @@
-<!--
-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
--->
 <filter-mapping>
 	<filter-name>HibernateFilter</filter-name>
 	<url-pattern>*.do</url-pattern>
Index: lams_learning/conf/xdoclet/filters.xml
===================================================================
diff -u -r05391c36b578d825a02985084cbdd948366ae182 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 05391c36b578d825a02985084cbdd948366ae182)
+++ lams_learning/conf/xdoclet/filters.xml	(.../filters.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,24 +1,3 @@
-<!--
-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
--->
-
 <filter>
 	<filter-name>HibernateFilter</filter-name>
 	<filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
Index: lams_learning/conf/xdoclet/global-forwards.xml
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/global-forwards.xml	(.../global-forwards.xml)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/conf/xdoclet/global-forwards.xml	(.../global-forwards.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,24 +1,3 @@
-<!--
-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>
 	<forward name="error" path="/error.jsp" />
 	<forward name="noSessionError" path="/noSessionError.jsp" />
Index: lams_learning/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -r9f4fe68406ac46863346862a9d96bc87fe75d5b8 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 9f4fe68406ac46863346862a9d96bc87fe75d5b8)
+++ lams_learning/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,24 +1,3 @@
-<!--
-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
--->
-
 <servlet-mapping>
 	<servlet-name>action</servlet-name>
     <url-pattern>*.do</url-pattern>
Index: lams_learning/conf/xdoclet/servlets.xml
===================================================================
diff -u -r937a2bbf2f083f7f56308f58ef5a805114a3c760 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
+++ lams_learning/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,24 +1,3 @@
-<!--
-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
--->
-
 <servlet>
 	<servlet-name>context</servlet-name>
 	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
Index: lams_learning/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r7213f7efef305780b43d6d8f8c3f0616237ba8ec -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 7213f7efef305780b43d6d8f8c3f0616237ba8ec)
+++ lams_learning/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,24 +1,4 @@
-<!--
-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" />
Index: lams_learning/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r00814b62109df12f6079c1e88f964e3f12674fbb -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 00814b62109df12f6079c1e88f964e3f12674fbb)
+++ lams_learning/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,22 +1,2 @@
-<!--
-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>
\ No newline at end of file
Index: lams_learning/conf/xdoclet/struts-message-resources.xml
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/struts-message-resources.xml	(.../struts-message-resources.xml)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/conf/xdoclet/struts-message-resources.xml	(.../struts-message-resources.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,22 +1,2 @@
-<!--
-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" />
Index: lams_learning/conf/xdoclet/struts-plugins.xml
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/struts-plugins.xml	(.../struts-plugins.xml)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/conf/xdoclet/struts-plugins.xml	(.../struts-plugins.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,24 +1,4 @@
-<!--
-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" />
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
diff -u -re31eacad20a98ae3e96c81e488fbdc14af7343dc -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision e31eacad20a98ae3e96c81e488fbdc14af7343dc)
+++ lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,24 +1,4 @@
-<!--
-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
--->
-
 <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.learning.LearningResources</param-value>
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" />
Index: lams_learning/test/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r937a2bbf2f083f7f56308f58ef5a805114a3c760 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/test/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
+++ lams_learning/test/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -2,23 +2,23 @@
 
 <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
-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 free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
 
-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.
+  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
+  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
+  http://www.gnu.org/licenses/gpl.txt
 -->
 
 <tiles-definitions>
Index: lams_learning/test/web/WEB-INF/web.xml
===================================================================
diff -u -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b)
+++ lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,29 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app >
- <!--
-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
--->
-
+<web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
 <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.learning.LearningResources</param-value>
@@ -35,7 +12,14 @@
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-		classpath*:applicationContext.xml
+		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
+		classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 
+		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 
+		classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
+<!-- 		classpath:/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml -->
 	</param-value>
 </context-param>
 <listener>
@@ -44,28 +28,7 @@
 	</listener-class>
 </listener>	
 
-  <!--
-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
--->
-
-<filter>
+  <filter>
 	<filter-name>HibernateFilter</filter-name>
 	<filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
 	<init-param>
@@ -78,26 +41,20 @@
 	</init-param>
 </filter>
 
-  <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+<filter>
+       <filter-name>SystemSessionFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+         </filter-class>
+</filter>
 
-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.
+<filter>
+       <filter-name>LocaleFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.filter.LocaleFilter
+         </filter-class>
+</filter>
 
-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
--->
 <filter-mapping>
 	<filter-name>HibernateFilter</filter-name>
 	<url-pattern>*.do</url-pattern>
@@ -107,34 +64,23 @@
 	<url-pattern>*.jsp</url-pattern>
 </filter-mapping>
 
+<filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
+
+  <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
+
     <!--
     To use non XDoclet listeners, create a listeners.xml file that
     contains the additional listeners and place it in your
     project's merge dir.
     -->
 
- <!--
-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
--->
-
-<servlet>
+ <servlet>
 	<servlet-name>context</servlet-name>
 	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
 	<load-on-startup>1</load-on-startup>
@@ -161,30 +107,43 @@
     <load-on-startup>2</load-on-startup>
 </servlet>
 
-  <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+<servlet>
+		<description>Export Portfolio</description>		
+		<display-name>Export Portfolio</display-name>
+		<servlet-name>exportPortfolio</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.MainExportServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<description>Export Portfolio Download Page</description>		
+		<display-name>Export Portfolio Download</display-name>
+		<servlet-name>exportDownload</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportDownloadServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<description>Tool does not support portfolio exports</description>
+		<display-name>Export Portfolio Unavailable</display-name>
+		<servlet-name>exportNotSupported</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportNotSupportedServlet</servlet-class>
+	</servlet>
 
-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.
+  <servlet-mapping>
+	<servlet-name>action</servlet-name>
+    <url-pattern>*.do</url-pattern>
+</servlet-mapping>
 
-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.
+<servlet-mapping>
+		<servlet-name>exportPortfolio</servlet-name>
+		<url-pattern>/portfolioExport</url-pattern>
+</servlet-mapping>
 
-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
+<servlet-mapping>
+		<servlet-name>exportDownload</servlet-name>
+		<url-pattern>/exportDownload</url-pattern>
+</servlet-mapping>
 
-http://www.gnu.org/licenses/gpl.txt
--->
-
 <servlet-mapping>
-	<servlet-name>action</servlet-name>
-    <url-pattern>*.do</url-pattern>
+	<servlet-name>exportNotSupported</servlet-name>
+	<url-pattern>/exportNotSupported</url-pattern>
 </servlet-mapping>
 
    <session-config>
@@ -198,111 +157,101 @@
    <!ELEMENT mime-mapping (extension, mime-type)>
    -->
 
-   <!--
-   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
-   Organize error-pages.xml following this DTD slice:
+  <error-page>
+	<error-code>403</error-code>
+	<location>/403.html</location>
+</error-page>  
 
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
+  	<jsp-config>
+		<!--  ======================================================== -->	
+		<!-- Struts Tag Library Descriptors -->
+		<!--  ======================================================== -->	
+		<taglib>
+		    <taglib-uri>tags-bean</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-html</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-logic</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-tiles</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
+		</taglib>
+		<!--  ======================================================== -->	
+		<!--  JSTL 1.2 Tag Library 									   -->
+		<!--  ======================================================== -->	
+		  <taglib>
+		    <taglib-uri>tags-fmt</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-core</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-function</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-xml</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+		  </taglib>
+		<!--  ======================================================== -->	
+		<!--   Customized Tag Library -->
+		<!--  ======================================================== -->	
+		<taglib>
+		    <taglib-uri>fck-editor</taglib-uri>
+		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
+		</taglib>
+		<!--  ======================================================== -->	
+		<!--   LAMS Tag Library -->
+		<!--  ======================================================== -->	
+		<taglib>
+		   <taglib-uri>tags-lams</taglib-uri>
+		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+		</taglib>
+	</jsp-config>
 
-  <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+  	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-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.
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Export</web-resource-name>
+		    <url-pattern>/portfolioExport</url-pattern>
+		 </web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name> <!-- have to change this to TEACHER have it as AUTHOR so that I can test it with user mmm -->
+			<role-name>LEARNER</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-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.
+	<!--  Login Configuration -->
+  	<login-config>
+   		<auth-method>FORM</auth-method>
+		<realm-name>LAMS</realm-name>
+   		<form-login-config>
+    		<form-login-page>/login.jsp</form-login-page>
+    		<form-error-page>/login.jsp</form-error-page>
+   		</form-login-config>
+   	</login-config>
 
-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
--->
-<!-- Struts Tag Library Defintions -->
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-bean</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-bean.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-bean-el</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-bean-el.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-html</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-html.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-html-el</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-html-el.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-logic</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-logic.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-logic-el</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-logic-el.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-template</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-template.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-tiles</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-tiles.tld</taglib-location>
-</taglib>
-
-<!-- JSTL Tag Library Defintions -->
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/c.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/core_rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/c-rt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/fmt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/fmt_rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/fmt-rt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/xml</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/x.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/xml_rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/x-rt.tld</taglib-location>
-</taglib>
-
-   <!--
-   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
-   Organize web-security.xml following this DTD slice:
-
-   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
-   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
-   <!ELEMENT web-resource-name (#PCDATA)>
-   <!ELEMENT url-pattern (#PCDATA)>
-   <!ELEMENT http-method (#PCDATA)>
-   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-   <!ELEMENT transport-guarantee (#PCDATA)>
-
-   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-   <!ELEMENT auth-method (#PCDATA)>
-   <!ELEMENT realm-name (#PCDATA)>
-   <!ELEMENT form-login-config (form-login-page, form-error-page)>
-   <!ELEMENT form-login-page (#PCDATA)>
-   <!ELEMENT form-error-page (#PCDATA)>
-   -->
-
 </web-app>
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rb90f4079e450f3d98bdb9447be353aec922b0945 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision b90f4079e450f3d98bdb9447be353aec922b0945)
+++ lams_learning/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,28 +37,7 @@
   -->
 
   <!-- ========== 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>
@@ -296,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" />
@@ -339,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" />
Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r1d54b5509eea881872edc0028f5d9c4c1003068f -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 1d54b5509eea881872edc0028f5d9c4c1003068f)
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -2,25 +2,24 @@
 
 <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
-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 free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
 
-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.
+  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
+  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
+  http://www.gnu.org/licenses/gpl.txt
 -->
-
 <tiles-definitions>
 	
 	<!-- Standard layout with css. -->
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -re31eacad20a98ae3e96c81e488fbdc14af7343dc -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision e31eacad20a98ae3e96c81e488fbdc14af7343dc)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
- <!--
-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
--->
-
 <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.learning.LearningResources</param-value>
@@ -49,28 +28,7 @@
 	</listener-class>
 </listener>	
 
-  <!--
-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
--->
-
-<filter>
+  <filter>
 	<filter-name>HibernateFilter</filter-name>
 	<filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
 	<init-param>
@@ -97,26 +55,6 @@
          </filter-class>
 </filter>
 
-  <!--
-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
--->
 <filter-mapping>
 	<filter-name>HibernateFilter</filter-name>
 	<url-pattern>*.do</url-pattern>
@@ -142,28 +80,7 @@
     project's merge dir.
     -->
 
- <!--
-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
--->
-
-<servlet>
+ <servlet>
 	<servlet-name>context</servlet-name>
 	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
 	<load-on-startup>1</load-on-startup>
@@ -209,28 +126,7 @@
 		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportNotSupportedServlet</servlet-class>
 	</servlet>
 
-  <!--
-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
--->
-
-<servlet-mapping>
+  <servlet-mapping>
 	<servlet-name>action</servlet-name>
     <url-pattern>*.do</url-pattern>
 </servlet-mapping>
Index: lams_learning/web/css/learner.css
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/web/css/learner.css	(.../learner.css)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/web/css/learner.css	(.../learner.css)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,24 +1,4 @@
-<!--
-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
--->
-
 .mainHeader {
 	font-family: Verdana, Arial, Helvetica, sans-serif;
 	font-size: 16pt;
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,23 +1,3 @@
-<%--
-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-bean" prefix="bean"%> 
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
diff -u -rd2c7363ac0242caa259b49112d85ffa9671c30e6 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision d2c7363ac0242caa259b49112d85ffa9671c30e6)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-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
--->
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <!--
Index: lams_monitoring/test/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_monitoring/test/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_monitoring/test/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -13,6 +13,11 @@
   <!-- ========== Form Bean Definitions =================================== -->
   <form-beans>
 
+    <form-bean
+      name="DummyForm"
+      type="org.lamsfoundation.lams.monitoring.web.DummyForm"
+    />
+
    <form-bean name="GateForm"  type="org.apache.struts.action.DynaActionForm">
 	<form-property name="gate" type="org.lamsfoundation.lams.learningdesign.GateActivity" />
 	<form-property name="activityId" type="java.lang.Long" />
@@ -31,28 +36,7 @@
   -->
 
   <!-- ========== 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>
 </global-forwards>
 
   <!-- ========== Action Mapping Definitions =================================== -->
@@ -81,6 +65,11 @@
         path="/index.jsp"
         redirect="false"
       />
+      <forward
+        name="previewdeleted"
+        path="/previewdeleted.jsp"
+        redirect="false"
+      />
     </action>
     <action
       path="/gate"
@@ -114,35 +103,51 @@
         redirect="false"
       />
     </action>
+    <action
+      path="/dummy"
+      type="org.lamsfoundation.lams.monitoring.web.DummyMonitoringAction"
+      name="DummyForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <exception
+        key="error.system.monitor"
+        type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
+        handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
+        path=".systemError"
+        scope="request"
+      />
+      <forward
+        name="detail"
+        path="/dummyDetail.jsp"
+        redirect="false"
+      />
+      <forward
+        name="start"
+        path="/dummyStart.jsp"
+        redirect="false"
+      />
+      <forward
+        name="started"
+        path="/dummyStarted.jsp"
+        redirect="false"
+      />
+      <forward
+        name="control"
+        path="/dummyControlFrame.jsp"
+        redirect="false"
+      />
+    </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
   </action-mappings>
 
    <!-- 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)
+  <message-resources parameter="org.lamsfoundation.lams.monitoring.MonitoringResources" />
 
-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.monitoring.MonitoringResources" />
-
   <!-- ===================== Plugin Definition  ======================== -->
 <plug-in className="org.apache.struts.tiles.TilesPlugin">
 	<set-property property="definitions-config"
Index: lams_monitoring/test/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -rccd319d5814f7182b441e35cd615aa162fef83fb -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_monitoring/test/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision ccd319d5814f7182b441e35cd615aa162fef83fb)
+++ lams_monitoring/test/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
-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 free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
 
-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.
+  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
+  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
+  http://www.gnu.org/licenses/gpl.txt
 -->
- 
+
 <tiles-definitions>
 <!-- ============= template Definitions ====================== -->
 	<definition name=".baseDef" path="/template/template.jsp">
Index: lams_monitoring/test/web/WEB-INF/web.xml
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_monitoring/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_monitoring/test/web/WEB-INF/web.xml	(.../web.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,30 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app >
- <!--
-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
--->
-
-<context-param>
+<web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+ <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.monitoring.MonitoringResources</param-value>
 </context-param>
@@ -34,35 +11,35 @@
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml        					  
+		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-		classpath*:applicationContext.xml
+		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
+<!-- 		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml  -->
+		classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 
+		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 
+		classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
+<!-- 		classpath:/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml -->
+<!-- 		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml -->
 	</param-value>
 </context-param>
 
-  <!--
-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
--->
-
+  <filter>
+       <filter-name>SystemSessionFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+         </filter-class>
+</filter>
 <filter>
+       <filter-name>LocaleFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.filter.LocaleFilter
+         </filter-class>
+</filter>
+<filter>
 	<filter-name>HibernateFilter</filter-name>
 	<filter-class>org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter</filter-class>
 	<init-param>
@@ -75,29 +52,17 @@
 	</init-param>
 </filter>
 
-  <!--
-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
--->
+  <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
 <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
 	<filter-name>HibernateFilter</filter-name>
-	<url-pattern>*.do</url-pattern>
+	<url-pattern>/*</url-pattern>
 </filter-mapping>
 <filter-mapping>
 	<filter-name>HibernateFilter</filter-name>
@@ -110,27 +75,18 @@
 	</listener-class>
 </listener>	
 
- <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+   <servlet>
+      <servlet-name>performChosenGrouping</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.PerformChosenGroupingServlet</servlet-class>
 
-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.
+   </servlet>
+   <servlet>
+      <servlet-name>createLesson</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.CreateLessionServlet</servlet-class>
 
-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.
+   </servlet>
 
-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
--->
-<servlet>
+ <servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -152,32 +108,20 @@
     <load-on-startup>2</load-on-startup>
 </servlet>
 
-  <!--
-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
--->
-
-<servlet-mapping>
+  <servlet-mapping>
 	<servlet-name>action</servlet-name>
     <url-pattern>*.do</url-pattern>
 </servlet-mapping>
 
+   <servlet-mapping>
+      <servlet-name>performChosenGrouping</servlet-name>
+      <url-pattern>/monitoring/performChosenGrouping</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>createLesson</servlet-name>
+      <url-pattern>/monitoring/createLesson</url-pattern>
+   </servlet-mapping>
+
    <session-config>
       <session-timeout>120</session-timeout>
    </session-config>
@@ -196,86 +140,61 @@
    <!ELEMENT error-page ((error-code | exception-type), location)>
    -->
 
-  <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+  	<jsp-config>
+		<!--  ======================================================== -->	
+		<!-- Struts Tag Library Descriptors -->
+		<!--  ======================================================== -->	
+		<taglib>
+		    <taglib-uri>tags-bean</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-html</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-logic</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-tiles</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
+		</taglib>
+		<!--  ======================================================== -->	
+		<!--  JSTL 1.2 Tag Library 									   -->
+		<!--  ======================================================== -->	
+		  <taglib>
+		    <taglib-uri>tags-fmt</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-core</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-function</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-xml</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+		  </taglib>
+		<!--  ======================================================== -->	
+		<!--   Customized Tag Library -->
+		<!--  ======================================================== -->	
+		<taglib>
+		    <taglib-uri>fck-editor</taglib-uri>
+		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
+		</taglib>
+		<!--  ======================================================== -->	
+		<!--   LAMS Tag Library -->
+		<!--  ======================================================== -->	
+		<taglib>
+		   <taglib-uri>tags-lams</taglib-uri>
+		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+		</taglib>
+	</jsp-config>
 
-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
--->
-<!-- Struts Tag Library Defintions -->
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-bean</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-bean.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-bean-el</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-bean-el.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-html</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-html.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-html-el</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-html-el.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-logic</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-logic.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-logic-el</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-logic-el.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-template</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-template.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://jakarta.apache.org/struts/struts-tiles</taglib-uri>
-	<taglib-location>/WEB-INF/struts/struts-tiles.tld</taglib-location>
-</taglib>
-
-<!-- JSTL Tag Library Defintions -->
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/c.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/core_rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/c-rt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/fmt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/fmt_rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/fmt-rt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/xml</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/x.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>http://java.sun.com/jstl/xml_rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/x-rt.tld</taglib-location>
-</taglib>
-
    <!--
    To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
    Organize web-security.xml following this DTD slice:
Index: lams_monitoring/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r1d54b5509eea881872edc0028f5d9c4c1003068f -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_monitoring/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 1d54b5509eea881872edc0028f5d9c4c1003068f)
+++ lams_monitoring/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
-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 free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
 
-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.
+  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
+  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
+  http://www.gnu.org/licenses/gpl.txt
 -->
- 
 <tiles-definitions>
 <!-- ============= template Definitions ====================== -->
 	<definition name=".baseDef" path="/template/template.jsp">
Index: lams_tool_chat/build.properties
===================================================================
diff -u -red16d5f8991580c9160628f30a49e947a0b154bb -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_chat/build.properties	(.../build.properties)	(revision ed16d5f8991580c9160628f30a49e947a0b154bb)
+++ lams_tool_chat/build.properties	(.../build.properties)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,21 +1,3 @@
-#   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 
 
 # project-wide properties 
 signature=lachat11
Index: lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r8d5c540b1da67b18a80b3145c81c1ce04c2c17b2 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 8d5c540b1da67b18a80b3145c81c1ce04c2c17b2)
+++ lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
-<!-- 
-<!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration//EN"
-       "http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd">
-       
--->
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
 
-<!--
-	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
+  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
 -->
 
 <tiles-definitions>
Index: lams_tool_deploy/build.xml
===================================================================
diff -u -rc3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_deploy/build.xml	(.../build.xml)	(revision c3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f)
+++ lams_tool_deploy/build.xml	(.../build.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,26 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- *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
- */
--->
+
 <project name="lams_tool_deploy" default="usage" basedir=".">
 	
         <property name="classes.dir" value="build/classes"/>
Index: lams_tool_deploy/test/file/application.xml
===================================================================
diff -u -rb9682e51114d632fd77ff0feabf3f2de634744bd -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_deploy/test/file/application.xml	(.../application.xml)	(revision b9682e51114d632fd77ff0feabf3f2de634744bd)
+++ lams_tool_deploy/test/file/application.xml	(.../application.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,26 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- *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
- */
--->
+
 <application>
     <display-name>LAMS</display-name>
     <description>
Index: lams_tool_deploy/test/file/lams.ear/META-INF/application.xml
===================================================================
diff -u -r1855a35e5ad821637db0aebccb4449713d2651c5 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_deploy/test/file/lams.ear/META-INF/application.xml	(.../application.xml)	(revision 1855a35e5ad821637db0aebccb4449713d2651c5)
+++ lams_tool_deploy/test/file/lams.ear/META-INF/application.xml	(.../application.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,25 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><!--
-/*
- *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
- */
---><application>
+<application>
     <display-name>LAMS</display-name>
     <description>
     Learning Activty Management System
Index: lams_tool_example/build.properties
===================================================================
diff -u -rbb7c63e87a565c0227aed9eadb9047da764cfde8 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_example/build.properties	(.../build.properties)	(revision bb7c63e87a565c0227aed9eadb9047da764cfde8)
+++ lams_tool_example/build.properties	(.../build.properties)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,21 +1,3 @@
-#   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 
 
 # project-wide properties 
 signature=laex11
Index: lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -rbb753a6fb63b04b00f1bf56e369a5474177c9ada -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision bb753a6fb63b04b00f1bf56e369a5474177c9ada)
+++ lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -2,11 +2,11 @@
 /****************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * 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.
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
Index: lams_tool_example/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -rbb753a6fb63b04b00f1bf56e369a5474177c9ada -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_example/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision bb753a6fb63b04b00f1bf56e369a5474177c9ada)
+++ lams_tool_example/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -2,11 +2,11 @@
 /****************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * 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.
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
Index: lams_tool_example/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rbb753a6fb63b04b00f1bf56e369a5474177c9ada -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_example/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision bb753a6fb63b04b00f1bf56e369a5474177c9ada)
+++ lams_tool_example/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -2,11 +2,11 @@
 /****************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * 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.
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
Index: lams_tool_example/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rbb753a6fb63b04b00f1bf56e369a5474177c9ada -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_example/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision bb753a6fb63b04b00f1bf56e369a5474177c9ada)
+++ lams_tool_example/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -2,11 +2,11 @@
 /****************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * 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.
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
Index: lams_tool_example/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -rbb753a6fb63b04b00f1bf56e369a5474177c9ada -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_tool_example/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision bb753a6fb63b04b00f1bf56e369a5474177c9ada)
+++ lams_tool_example/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -2,11 +2,11 @@
 /****************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * 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.
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of