Index: lams_learning/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/build.xml	8 Feb 2005 04:52:57 -0000	1.2
+++ lams_learning/build.xml	21 Feb 2005 05:32:49 -0000	1.3
@@ -1,6 +1,25 @@
 <?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 [
 ]>
 
Index: lams_learning/conf/xdoclet/filter-mappings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/filter-mappings.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/xdoclet/filter-mappings.xml	30 Jan 2005 22:56:27 -0000	1.1
+++ lams_learning/conf/xdoclet/filter-mappings.xml	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,4 +1,23 @@
+<!--
+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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/filters.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/xdoclet/filters.xml	30 Jan 2005 22:56:27 -0000	1.1
+++ lams_learning/conf/xdoclet/filters.xml	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,4 +1,24 @@
+<!--
+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.hibernate.support.OpenSessionInViewFilter</filter-class>
Index: lams_learning/conf/xdoclet/global-forwards.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/global-forwards.xml,v
diff -u -r1.3 -r1.4
--- lams_learning/conf/xdoclet/global-forwards.xml	17 Feb 2005 02:58:58 -0000	1.3
+++ lams_learning/conf/xdoclet/global-forwards.xml	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,3 +1,24 @@
+<!--
+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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/servlet-mappings.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/xdoclet/servlet-mappings.xml	21 Jan 2005 04:28:19 -0000	1.1
+++ lams_learning/conf/xdoclet/servlet-mappings.xml	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,5 +1,26 @@
-	<servlet-mapping>
-		<servlet-name>action</servlet-name>
-	    <url-pattern>*.do</url-pattern>
-	</servlet-mapping>
+<!--
+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>
+</servlet-mapping>
 	
\ No newline at end of file
Index: lams_learning/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/servlets.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/conf/xdoclet/servlets.xml	28 Jan 2005 02:36:25 -0000	1.2
+++ lams_learning/conf/xdoclet/servlets.xml	21 Feb 2005 05:31:39 -0000	1.3
@@ -1,39 +1,47 @@
-    	<!--
-	  - Loads the root application context of this web app at startup,
-	  - by default from "/WEB-INF/applicationContext.xml".
-		- Note that it is preferable to use ContextLoaderListener in a servlet container
-		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
-		-
-	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
-	  - to access it anywhere in the web application, outside of the framework.
-	  -
-	  - The root context is the parent of all servlet-specific contexts.
-	  - This means that its beans are automatically available in these child contexts,
-	  - both for getBean(name) calls and (external) bean references.
-		-->
-	<servlet>
-		<servlet-name>context</servlet-name>
-		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet>
-	    <servlet-name>action</servlet-name>
-	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-	    <init-param>
-	      <param-name>config</param-name>
-	      <param-value>/WEB-INF/struts/struts-config.xml</param-value>
-	    </init-param>
-	    <init-param>
-	      <param-name>debug</param-name>
-	      <param-value>999</param-value>
-	    </init-param>
-	    <init-param>
-	      <param-name>detail</param-name>
-	      <param-value>2</param-value>
-	    </init-param>
-	    <init-param>
-	      <param-name>validate</param-name>
-	      <param-value>true</param-value>
-	    </init-param>
-	    <load-on-startup>2</load-on-startup>
-    </servlet>
\ No newline at end of file
+<!--
+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>
+	<load-on-startup>1</load-on-startup>
+</servlet>
+<servlet>
+    <servlet-name>action</servlet-name>
+    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>/WEB-INF/struts/struts-config.xml</param-value>
+    </init-param>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>999</param-value>
+    </init-param>
+    <init-param>
+      <param-name>detail</param-name>
+      <param-value>2</param-value>
+    </init-param>
+    <init-param>
+      <param-name>validate</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+</servlet>
Index: lams_learning/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-actions.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/xdoclet/struts-actions.xml	1 Feb 2005 23:10:34 -0000	1.1
+++ lams_learning/conf/xdoclet/struts-actions.xml	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,4 +1,24 @@
+<!--
+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="/requestDisplay"
 	type="org.apache.struts.actions.ForwardAction"
 	parameter=".requestDisplay"/>
Index: lams_learning/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-forms.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/xdoclet/struts-forms.xml	21 Jan 2005 04:28:19 -0000	1.1
+++ lams_learning/conf/xdoclet/struts-forms.xml	21 Feb 2005 05:31:39 -0000	1.2
@@ -1 +1,20 @@
+<!--
+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
+-->
Index: lams_learning/conf/xdoclet/struts-message-resources.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-message-resources.xml,v
diff -u -r1.3 -r1.4
--- lams_learning/conf/xdoclet/struts-message-resources.xml	28 Jan 2005 02:36:25 -0000	1.3
+++ lams_learning/conf/xdoclet/struts-message-resources.xml	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,2 +1,22 @@
+<!--
+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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-plugins.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/xdoclet/struts-plugins.xml	21 Jan 2005 04:28:19 -0000	1.1
+++ lams_learning/conf/xdoclet/struts-plugins.xml	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,7 +1,27 @@
+<!--
+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" />
 	<set-property property="definitions-parser-details" value="0" />
 	<set-property property="definitions-parser-validate" value="true" />
-</plug-in>
\ No newline at end of file
+</plug-in>
Index: lams_learning/conf/xdoclet/taglibs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/taglibs.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/xdoclet/taglibs.xml	21 Jan 2005 04:28:19 -0000	1.1
+++ lams_learning/conf/xdoclet/taglibs.xml	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,3 +1,23 @@
+<!--
+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
+-->
    
 <!-- Struts Tag Library Defintions -->
 <taglib>
@@ -58,4 +78,3 @@
 	<taglib-uri>http://java.sun.com/jstl/xml_rt</taglib-uri>
 	<taglib-location>/WEB-INF/jstl/x-rt.tld</taglib-location>
 </taglib>
-	
\ No newline at end of file
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-settings.xml,v
diff -u -r1.3 -r1.4
--- lams_learning/conf/xdoclet/web-settings.xml	28 Jan 2005 02:36:25 -0000	1.3
+++ lams_learning/conf/xdoclet/web-settings.xml	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,3 +1,24 @@
+<!--
+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>
@@ -7,4 +28,4 @@
 	<param-value>
 		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml
 	</param-value>
-</context-param>
\ No newline at end of file
+</context-param>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/LearningResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/Attic/LearningResources.properties,v
diff -u -r1.1 -r1.2
--- lams_learning/src/java/org/lamsfoundation/lams/learning/LearningResources.properties	28 Jan 2005 02:17:16 -0000	1.1
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/LearningResources.properties	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,3 +1,23 @@
+
+# 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
+
 # Resources for parameter 'com.lamsinternational.lams.learning.LearningResources'
 # Project P/lams_learning
 message.activity.loading=The next task is loading. Please wait....
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java,v
diff -u -r1.4 -r1.5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	18 Feb 2005 06:10:09 -0000	1.4
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	21 Feb 2005 05:31:39 -0000	1.5
@@ -1,9 +1,24 @@
 /*
- * ProgressEngine.java
- *
- * Created on 07 December 2004, 10:42
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.progress;
 
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressException.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressException.java,v
diff -u -r1.1 -r1.2
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressException.java	28 Jan 2005 02:17:16 -0000	1.1
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressException.java	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,9 +1,24 @@
 /*
- * ProgressException.java
- *
- * Created on 07 December 2004, 10:59
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.progress;
 
 /**
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java,v
diff -u -r1.5 -r1.6
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	17 Feb 2005 00:18:04 -0000	1.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	21 Feb 2005 05:31:40 -0000	1.6
@@ -1,9 +1,24 @@
 /*
- * ILearnerService.java
- *
- * Created on 18 January 2005, 15:23
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.service;
 
 import java.util.List;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.9 -r1.10
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	21 Feb 2005 04:16:41 -0000	1.9
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	21 Feb 2005 05:31:40 -0000	1.10
@@ -1,8 +1,24 @@
 /*
- * LearnerService.java
- *
- * Created on 11 January 2005, 15:42
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.service;
 
 import java.util.Iterator;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java,v
diff -u -r1.1 -r1.2
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java	28 Jan 2005 02:17:16 -0000	1.1
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java	21 Feb 2005 05:31:40 -0000	1.2
@@ -1,8 +1,24 @@
 /*
- * LearnerServiceException.java
- *
- * Created on 12 January 2005, 10:46
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.service;
 
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java,v
diff -u -r1.2 -r1.3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java	21 Feb 2005 03:57:42 -0000	1.2
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java	21 Feb 2005 05:31:40 -0000	1.3
@@ -1,3 +1,24 @@
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.service;
 
 import javax.servlet.ServletContext;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java,v
diff -u -r1.5 -r1.6
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	17 Feb 2005 03:01:37 -0000	1.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	21 Feb 2005 05:31:39 -0000	1.6
@@ -1,6 +1,24 @@
-//Created by MyEclipse Struts
-// XSL source (default): platform:/plugin/com.genuitec.eclipse.cross.easystruts.eclipse_3.8.2/xslt/JavaClass.xsl
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import javax.servlet.http.*;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/ChooseActivity.java,v
diff -u -r1.2 -r1.3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivity.java	17 Feb 2005 03:01:37 -0000	1.2
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivity.java	21 Feb 2005 05:31:39 -0000	1.3
@@ -1,7 +1,24 @@
 /*
- * Created on 4/02/2005
- *
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/CompleteActivity.java,v
diff -u -r1.3 -r1.4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivity.java	18 Feb 2005 05:11:15 -0000	1.3
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivity.java	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,7 +1,24 @@
 /*
- * Created on 4/02/2005
- *
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DisplayActivity.java,v
diff -u -r1.4 -r1.5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java	17 Feb 2005 03:01:37 -0000	1.4
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java	21 Feb 2005 05:31:39 -0000	1.5
@@ -1,6 +1,24 @@
-//Created by MyEclipse Struts
-// XSL source (default): platform:/plugin/com.genuitec.eclipse.cross.easystruts.eclipse_3.8.2/xslt/JavaClass.xsl
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import javax.servlet.http.*;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayLoadToolActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DisplayLoadToolActivity.java,v
diff -u -r1.2 -r1.3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayLoadToolActivity.java	21 Feb 2005 03:57:57 -0000	1.2
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayLoadToolActivity.java	21 Feb 2005 05:31:39 -0000	1.3
@@ -1,6 +1,24 @@
-//Created by MyEclipse Struts
-// XSL source (default): platform:/plugin/com.genuitec.eclipse.cross.easystruts.eclipse_3.8.2/xslt/JavaClass.xsl
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import javax.servlet.http.*;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DisplayOptionsActivity.java,v
diff -u -r1.5 -r1.6
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java	21 Feb 2005 03:57:57 -0000	1.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java	21 Feb 2005 05:31:39 -0000	1.6
@@ -1,8 +1,24 @@
 /*
- * Created on 14/01/2005
- *
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
- */
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import java.util.ArrayList;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DisplayParallelActivity.java,v
diff -u -r1.5 -r1.6
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java	21 Feb 2005 03:57:57 -0000	1.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java	21 Feb 2005 05:31:39 -0000	1.6
@@ -1,6 +1,24 @@
-//Created by MyEclipse Struts
-// XSL source (default): platform:/plugin/com.genuitec.eclipse.cross.easystruts.eclipse_3.8.2/xslt/JavaClass.xsl
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import javax.servlet.http.*;
@@ -55,7 +73,6 @@
 		form.setActivityId(activity.getActivityId());
 
 		List activityURLs = new ArrayList();
-		// TODO: Need to get order somehow
 		Set subActivities = parallelActivity.getActivities();
 		Iterator i = subActivities.iterator();
 		while (i.hasNext()) {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DisplayToolActivity.java,v
diff -u -r1.5 -r1.6
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java	21 Feb 2005 03:57:57 -0000	1.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java	21 Feb 2005 05:31:39 -0000	1.6
@@ -1,6 +1,24 @@
-//Created by MyEclipse Struts
-// XSL source (default): platform:/plugin/com.genuitec.eclipse.cross.easystruts.eclipse_3.8.2/xslt/JavaClass.xsl
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import javax.servlet.http.*;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java,v
diff -u -r1.3 -r1.4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java	21 Feb 2005 03:57:42 -0000	1.3
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,7 +1,24 @@
 /*
- * Created on 13/01/2005
- *
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.bean;
 
 /**
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/SessionBean.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/Attic/SessionBean.java,v
diff -u -r1.3 -r1.4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/SessionBean.java	8 Feb 2005 04:34:47 -0000	1.3
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/SessionBean.java	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,7 +1,24 @@
 /*
- * Created on 14/01/2005
- *
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.bean;
 
 import org.lamsfoundation.lams.usermanagement.*;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java,v
diff -u -r1.2 -r1.3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java	8 Feb 2005 04:34:47 -0000	1.2
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java	21 Feb 2005 05:31:40 -0000	1.3
@@ -1,6 +1,24 @@
-//Created by MyEclipse Struts
-// XSL source (default): platform:/plugin/com.genuitec.eclipse.cross.easystruts.eclipse_3.8.2/xslt/JavaClass.xsl
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.form;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java,v
diff -u -r1.2 -r1.3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java	8 Feb 2005 04:34:47 -0000	1.2
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java	21 Feb 2005 05:31:40 -0000	1.3
@@ -1,7 +1,24 @@
 /*
- * Created on 14/01/2005
- *
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.form;
 
 /**
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappings.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/Attic/ActionMappings.java,v
diff -u -r1.4 -r1.5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappings.java	21 Feb 2005 03:55:25 -0000	1.4
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappings.java	21 Feb 2005 05:31:40 -0000	1.5
@@ -1,7 +1,24 @@
 /*
- * Created on 8/02/2005
- *
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.util;
 
 import org.apache.struts.action.ActionForward;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappingsWithToolWait.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/Attic/ActionMappingsWithToolWait.java,v
diff -u -r1.3 -r1.4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappingsWithToolWait.java	21 Feb 2005 03:55:25 -0000	1.3
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappingsWithToolWait.java	21 Feb 2005 05:31:40 -0000	1.4
@@ -1,7 +1,24 @@
 /*
- * Created on 8/02/2005
- *
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.util;
 
 import org.apache.struts.action.ActionForward;
Index: lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/WEB-INF/spring/Attic/learningApplicationContext.xml,v
diff -u -r1.3 -r1.4
--- lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml	17 Feb 2005 00:19:32 -0000	1.3
+++ lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml	21 Feb 2005 05:31:40 -0000	1.4
@@ -11,13 +11,21 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-	<bean id="learnerService" class="org.lamsfoundation.lams.learning.service.TestLearnerService" singleton="false">
-		<construtor-arg>
+	<bean id="learnerService" class="org.lamsfoundation.lams.learning.service.DummyLearnerService" singleton="false">
+		<constructor-arg>
 			<ref bean="progressEngine"/>
-		</construtor-arg>
+		</constructor-arg>
 		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
 	</bean>
+	
+	<bean id="toolService" class="org.lamsfoundation.lams.tool.service.DummyToolService" singleton="false">
+	</bean>
 
-	<bean id="progressEngine" class="org.lamsfoundation.lams.learning.ProgressEngine.java" singleton="false">
+	<bean id="progressEngine" class="org.lamsfoundation.lams.learning.progress.ProgressEngine" singleton="false">
 	</bean>
+	
+	<bean id="actionMappings" class="org.lamsfoundation.lams.learning.web.util.ActionMappingsWithToolWait" singleton="false">
+		<property name="toolService"><ref bean="toolService"/></property>
+	</bean>
+	
 </beans>
Index: lams_learning/test/java/org/lamsfoundation/lams/BaseTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/Attic/BaseTestCase.java,v
diff -u -r1.1 -r1.2
--- lams_learning/test/java/org/lamsfoundation/lams/BaseTestCase.java	8 Feb 2005 04:44:01 -0000	1.1
+++ lams_learning/test/java/org/lamsfoundation/lams/BaseTestCase.java	21 Feb 2005 05:31:40 -0000	1.2
@@ -1,3 +1,24 @@
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams;
 
 import net.sf.hibernate.Session;
@@ -11,15 +32,10 @@
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import junit.framework.TestCase;
-/*
- * Created on Dec 4, 2004
- */
 
 /**
- * @author manpreet
+ * @author daveg
  *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class BaseTestCase extends TestCase {
 	
Index: lams_learning/test/java/org/lamsfoundation/lams/DblSubmitTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/Attic/DblSubmitTest.java,v
diff -u -r1.1 -r1.2
--- lams_learning/test/java/org/lamsfoundation/lams/DblSubmitTest.java	8 Feb 2005 04:41:54 -0000	1.1
+++ lams_learning/test/java/org/lamsfoundation/lams/DblSubmitTest.java	21 Feb 2005 05:31:40 -0000	1.2
@@ -1,9 +1,24 @@
 /*
- * Created on 7/02/2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams;
 
 import junit.framework.TestCase;
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/service/Attic/DummyLearnerService.java,v
diff -u -r1.4 -r1.5
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java	21 Feb 2005 04:01:47 -0000	1.4
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java	21 Feb 2005 05:31:39 -0000	1.5
@@ -1,7 +1,24 @@
 /*
- * Created on 18/01/2005
- *
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.service;
 
 import java.util.HashSet;
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyLessonAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/Attic/DummyLessonAction.java,v
diff -u -r1.1 -r1.2
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyLessonAction.java	8 Feb 2005 04:40:55 -0000	1.1
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyLessonAction.java	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,9 +1,24 @@
 /*
- * Created on 27/01/2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/Attic/DummyToolAction.java,v
diff -u -r1.3 -r1.4
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java	21 Feb 2005 04:02:03 -0000	1.3
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,9 +1,24 @@
 /*
- * Created on 27/01/2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import java.io.IOException;
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDblSubmitAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/Attic/TestDblSubmitAction.java,v
diff -u -r1.1 -r1.2
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDblSubmitAction.java	8 Feb 2005 04:43:00 -0000	1.1
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDblSubmitAction.java	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,6 +1,24 @@
-//Created by MyEclipse Struts
-// XSL source (default): platform:/plugin/com.genuitec.eclipse.cross.easystruts.eclipse_3.8.4/xslt/JavaClass.xsl
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.action;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/form/DummyToolForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/web/form/Attic/DummyToolForm.java,v
diff -u -r1.2 -r1.3
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/form/DummyToolForm.java	21 Feb 2005 04:02:02 -0000	1.2
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/form/DummyToolForm.java	21 Feb 2005 05:31:39 -0000	1.3
@@ -1,9 +1,24 @@
 /*
- * Created on 27/01/2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.form;
 
 import org.apache.struts.action.ActionForm;
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/form/TestDblSubmitForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/web/form/Attic/TestDblSubmitForm.java,v
diff -u -r1.1 -r1.2
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/form/TestDblSubmitForm.java	8 Feb 2005 04:43:00 -0000	1.1
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/form/TestDblSubmitForm.java	21 Feb 2005 05:31:39 -0000	1.2
@@ -1,13 +1,31 @@
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.learning.web.form;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
 
-//Created by MyEclipse Struts
-// XSL source (default): platform:/plugin/com.genuitec.eclipse.cross.easystruts.eclipse_3.8.4/xslt/JavaClass.xsl
-
 /** 
  * MyEclipse Struts
  * Creation date: 02-03-2005
Index: lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/tool/service/Attic/DummyToolService.java,v
diff -u -r1.1 -r1.2
--- lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java	21 Feb 2005 04:03:11 -0000	1.1
+++ lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java	21 Feb 2005 05:31:40 -0000	1.2
@@ -1,7 +1,24 @@
 /*
- * Created on 21/02/2005
- *
- */
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
 package org.lamsfoundation.lams.tool.service;
 
 import java.util.List;
Index: lams_learning/web/lessonComplete.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/lessonComplete.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/lessonComplete.jsp	24 Jan 2005 00:37:29 -0000	1.2
+++ lams_learning/web/lessonComplete.jsp	21 Feb 2005 05:31:39 -0000	1.3
@@ -1,4 +1,24 @@
- 
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> 
 <%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%>
Index: lams_learning/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.3 -r1.4
--- lams_learning/web/optionsActivity.jsp	8 Feb 2005 04:46:06 -0000	1.3
+++ lams_learning/web/optionsActivity.jsp	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,4 +1,24 @@
- 
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> 
 <%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%>
Index: lams_learning/web/parallelActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/parallelActivity.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/parallelActivity.jsp	24 Jan 2005 00:37:29 -0000	1.2
+++ lams_learning/web/parallelActivity.jsp	21 Feb 2005 05:31:39 -0000	1.3
@@ -1,4 +1,24 @@
- 
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> 
 <%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%>
Index: lams_learning/web/partialCompleted.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/partialCompleted.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/partialCompleted.jsp	24 Jan 2005 00:37:29 -0000	1.2
+++ lams_learning/web/partialCompleted.jsp	21 Feb 2005 05:31:39 -0000	1.3
@@ -1,4 +1,24 @@
- 
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> 
 <%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%>
Index: lams_learning/web/requestDisplayActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/requestDisplayActivity.jsp,v
diff -u -r1.4 -r1.5
--- lams_learning/web/requestDisplayActivity.jsp	8 Feb 2005 04:43:02 -0000	1.4
+++ lams_learning/web/requestDisplayActivity.jsp	21 Feb 2005 05:31:39 -0000	1.5
@@ -1,4 +1,24 @@
- 
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> 
 <%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%>
Index: lams_learning/web/toolActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/toolActivity.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/toolActivity.jsp	24 Jan 2005 00:37:29 -0000	1.2
+++ lams_learning/web/toolActivity.jsp	21 Feb 2005 05:31:39 -0000	1.3
@@ -1,3 +1,23 @@
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> 
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.5 -r1.6
--- lams_learning/web/WEB-INF/web.xml	1 Feb 2005 23:18:00 -0000	1.5
+++ lams_learning/web/WEB-INF/web.xml	21 Feb 2005 05:31:40 -0000	1.6
@@ -1,5 +1,25 @@
 <?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 web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app >
Index: lams_learning/web/WEB-INF/spring/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/applicationContext.xml,v
diff -u -r1.4 -r1.5
--- lams_learning/web/WEB-INF/spring/applicationContext.xml	17 Feb 2005 03:02:24 -0000	1.4
+++ lams_learning/web/WEB-INF/spring/applicationContext.xml	21 Feb 2005 05:31:39 -0000	1.5
@@ -1,4 +1,25 @@
 <?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_learning/web/WEB-INF/spring/dataAccessContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/dataAccessContext.xml,v
diff -u -r1.3 -r1.4
--- lams_learning/web/WEB-INF/spring/dataAccessContext.xml	8 Feb 2005 04:48:17 -0000	1.3
+++ lams_learning/web/WEB-INF/spring/dataAccessContext.xml	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,8 +1,29 @@
 <?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">
 
 <!--
-  - Application context definition for lams survey data access layer.
+    - Application context definition for lams data access layer.
 	- Accessed by business layer objects defined in "applicationContext.xml"
 	- (see web.xml's "contextConfigLocation").
 	-
Index: lams_learning/web/WEB-INF/spring/dbConnection.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/dbConnection.properties,v
diff -u -r1.3 -r1.4
--- lams_learning/web/WEB-INF/spring/dbConnection.properties	17 Feb 2005 03:02:24 -0000	1.3
+++ lams_learning/web/WEB-INF/spring/dbConnection.properties	21 Feb 2005 05:31:39 -0000	1.4
@@ -1,3 +1,23 @@
+
+# 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
+
 # Properties file with Hibernate-related settings.
 # Applied by PropertyPlaceholderConfigurer from "dbConnection.xml".
 # Targetted at system administrators, to avoid touching the context XML files.
Index: lams_learning/web/WEB-INF/spring/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/learningApplicationContext.xml,v
diff -u -r1.4 -r1.5
--- lams_learning/web/WEB-INF/spring/learningApplicationContext.xml	21 Feb 2005 04:03:50 -0000	1.4
+++ lams_learning/web/WEB-INF/spring/learningApplicationContext.xml	21 Feb 2005 05:31:39 -0000	1.5
@@ -1,11 +1,26 @@
 <?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">
 
-<!--
-  - Application context definition for lams survey business layer.
-	- Contains bean references to the transaction manager and to the DAOs in
-	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
-	-->
 <beans>
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	24 Jan 2005 00:36:52 -0000	1.2
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	21 Feb 2005 05:31:39 -0000	1.3
@@ -1,5 +1,25 @@
 <?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 tiles-definitions PUBLIC
    "-//Apache Software Foundation//DTD Tiles Configuration//EN"
    "http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
Index: lams_learning/web/css/learner.css
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/css/Attic/learner.css,v
diff -u -r1.1 -r1.2
--- lams_learning/web/css/learner.css	21 Jan 2005 04:22:14 -0000	1.1
+++ lams_learning/web/css/learner.css	21 Feb 2005 05:31:40 -0000	1.2
@@ -1,3 +1,24 @@
+<!--
+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/layout/activityLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/Attic/activityLayout.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/layout/activityLayout.jsp	24 Jan 2005 00:37:09 -0000	1.2
+++ lams_learning/web/layout/activityLayout.jsp	21 Feb 2005 05:31:40 -0000	1.3
@@ -1,3 +1,24 @@
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%>
 <%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%>
Index: lams_learning/web/layout/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/layout.jsp,v
diff -u -r1.1 -r1.2
--- lams_learning/web/layout/layout.jsp	21 Jan 2005 04:22:14 -0000	1.1
+++ lams_learning/web/layout/layout.jsp	21 Feb 2005 05:31:40 -0000	1.2
@@ -1,3 +1,24 @@
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%>
 <%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%>
@@ -16,14 +37,17 @@
 		<link href="css/learner.css" rel="stylesheet" type="text/css">
 	</head>
 
-	<c:if test="${includeBodyTag}">
-		<body>
-	</c:if>
-
+	<c:choose>
+		<c:when test="${includeBodyToag}">
+		
+			<body>
+				<tiles:insert attribute="body" />
+			</body>
+			
+		</c:when>
+		<c:otherwise>
 			<tiles:insert attribute="body" />
-
-	<c:if test="${includeBodyTag}">
-		</body>
-	</c:if>
+		</c:otherwise>
+	</c:choose>
 	
 </html:html>
\ No newline at end of file
Index: lams_learning/web/test/dblSubmitTest.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/test/dblSubmitTest.jsp,v
diff -u -r1.1 -r1.2
--- lams_learning/web/test/dblSubmitTest.jsp	8 Feb 2005 04:46:04 -0000	1.1
+++ lams_learning/web/test/dblSubmitTest.jsp	21 Feb 2005 05:31:40 -0000	1.2
@@ -1,3 +1,23 @@
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%>
Index: lams_learning/web/test/dummyTool.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/test/dummyTool.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/test/dummyTool.jsp	21 Feb 2005 04:05:54 -0000	1.2
+++ lams_learning/web/test/dummyTool.jsp	21 Feb 2005 05:31:40 -0000	1.3
@@ -1,3 +1,23 @@
+<%--
+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="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%>