Index: lams_monitoring/conf/xdoclet/filter-mappings.xml
===================================================================
diff -u
--- lams_monitoring/conf/xdoclet/filter-mappings.xml	(revision 0)
+++ lams_monitoring/conf/xdoclet/filter-mappings.xml	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
@@ -0,0 +1,28 @@
+<!--
+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>
+</filter-mapping>
+<filter-mapping>
+	<filter-name>HibernateFilter</filter-name>
+	<url-pattern>*.jsp</url-pattern>
+</filter-mapping>
Index: lams_monitoring/conf/xdoclet/filters.xml
===================================================================
diff -u
--- lams_monitoring/conf/xdoclet/filters.xml	(revision 0)
+++ lams_monitoring/conf/xdoclet/filters.xml	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
@@ -0,0 +1,33 @@
+<!--
+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>
+	<init-param>
+		<param-name>sessionFactoryBeanName</param-name>
+		<param-value>coreSessionFactory</param-value>
+	</init-param>
+	<init-param>
+		<param-name>singleSession</param-name>
+		<param-value>true</param-value>
+	</init-param>
+</filter>
Index: lams_monitoring/conf/xdoclet/global-forwards.xml
===================================================================
diff -u
--- lams_monitoring/conf/xdoclet/global-forwards.xml	(revision 0)
+++ lams_monitoring/conf/xdoclet/global-forwards.xml	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
@@ -0,0 +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
+-->
+
+<global-forwards>
+</global-forwards>
Index: lams_monitoring/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u
--- lams_monitoring/conf/xdoclet/servlet-mappings.xml	(revision 0)
+++ lams_monitoring/conf/xdoclet/servlet-mappings.xml	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
@@ -0,0 +1,26 @@
+<!--
+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_monitoring/conf/xdoclet/servlets.xml
===================================================================
diff -u
--- lams_monitoring/conf/xdoclet/servlets.xml	(revision 0)
+++ lams_monitoring/conf/xdoclet/servlets.xml	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
@@ -0,0 +1,47 @@
+<!--
+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_monitoring/conf/xdoclet/struts-message-resources.xml
===================================================================
diff -u
--- lams_monitoring/conf/xdoclet/struts-message-resources.xml	(revision 0)
+++ lams_monitoring/conf/xdoclet/struts-message-resources.xml	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
@@ -0,0 +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.monitoring.MonitoringResources" />
Index: lams_monitoring/conf/xdoclet/taglibs.xml
===================================================================
diff -u
--- lams_monitoring/conf/xdoclet/taglibs.xml	(revision 0)
+++ lams_monitoring/conf/xdoclet/taglibs.xml	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
@@ -0,0 +1,80 @@
+<!--
+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>
+	<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>
Index: lams_monitoring/conf/xdoclet/web-settings.xml
===================================================================
diff -u
--- lams_monitoring/conf/xdoclet/web-settings.xml	(revision 0)
+++ lams_monitoring/conf/xdoclet/web-settings.xml	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
@@ -0,0 +1,34 @@
+<!--
+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.monitoring.MonitoringResources</param-value>
+</context-param>
+<context-param>
+	<param-name>contextConfigLocation</param-name>
+	<param-value>
+		/WEB-INF/spring/applicationContext.xml /WEB-INF/spring/toolApplicationContext.xml
+		/WEB-INF/spring/monitoringApplicationContext.xml /WEB-INF/spring/lessonApplicationContext.xml
+		/WEB-INF/spring/authoringApplicationContext.xml	
+		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/surveyApplicationContext.xml
+	</param-value>
+</context-param>
Index: lams_monitoring/lib/lams/lams-authoring.jar
===================================================================
diff -u -rdebc3108af4f3a9b67f1c7dfe6a958f1887d2d9d -rb395aaed7e903bdc2d4fbcc45a3191615e16f8d6
Binary files differ
Index: lams_monitoring/lib/lams/lams-tool-survey.jar
===================================================================
diff -u -rdebc3108af4f3a9b67f1c7dfe6a958f1887d2d9d -rb395aaed7e903bdc2d4fbcc45a3191615e16f8d6
Binary files differ
Index: lams_monitoring/lib/lams/lams.jar
===================================================================
diff -u -r704c8d12284841f9700e87df5ce6e5d9e97a7a28 -rb395aaed7e903bdc2d4fbcc45a3191615e16f8d6
Binary files differ
Index: lams_monitoring/lib/lams/lams_learning.jar
===================================================================
diff -u
Binary files differ
Index: lams_monitoring/lib/wddx/wddx-1.0a-lfl-0.2.jar
===================================================================
diff -u
Binary files differ