Index: lams_central/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/build.xml,v
diff -u -r1.18 -r1.19
--- lams_central/build.xml	30 Sep 2005 01:36:42 -0000	1.18
+++ lams_central/build.xml	13 Oct 2005 03:12:00 -0000	1.19
@@ -137,6 +137,7 @@
   				webxml="${webinf}/web.xml">
 			<webinf dir="${webinf}">
 				<include name="*.xml"/>
+				<include name="*.tld"/>
 				<include name="*.properties"/>
 				<include name="struts/**"/>
 				<include name="jstl/**"/>
@@ -215,6 +216,7 @@
 	            <include name="**/*Servlet.java" />
 	            <include name="**/*Action.java" />
 	            <include name="**/*ActionForm.java" />
+	            <include name="**/*Tag.java" />
 	         </fileset>
 
 	         <deploymentdescriptor 
@@ -227,6 +229,16 @@
 	         				destdir="${webinf.struts}"
 	         				version="1.2" 
 	         				mergedir="${conf.xdoclet}"/>
+			 
+			 <jsptaglib jspversion="1.1"
+						taglibversion="1.0"
+					 	shortname="lams"
+			 			displayname="LAMSTags"
+					 	description="LAMS custom tags"
+			 			filename="lams.tld"
+					 	validatexml="true"
+						destdir="${webinf}"
+        				mergedir="${conf.xdoclet}"/>
 	     </webdoclet>
 	</target>
 		
Index: lams_central/conf/xdoclet/taglibs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/taglibs.xml,v
diff -u -r1.2 -r1.3
--- lams_central/conf/xdoclet/taglibs.xml	19 Sep 2005 01:02:18 -0000	1.2
+++ lams_central/conf/xdoclet/taglibs.xml	13 Oct 2005 03:11:38 -0000	1.3
@@ -75,3 +75,8 @@
     <taglib-uri>fck-editor</taglib-uri>
     <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 </taglib>
+
+ <taglib>
+   <taglib-uri>tags-lams</taglib-uri>
+   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+</taglib>
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java	13 Oct 2005 03:11:38 -0000	1.1
@@ -0,0 +1,127 @@
+/***************************************************************************
+ * 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.web.tag;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.apache.commons.beanutils.PropertyUtils;
+
+/**
+ * Output a property from the userDTO object in the shared session.
+ * 
+ * Has a single paramter "property", which is the name of the property from the UserDTO to be accessed.
+ * May be: 	userID, firstName, lastName, login, email.
+ * 
+ * Doesn't support theme yet - to be added when we work out what we want from the theme details.
+ * 
+ * @jsp.tag name="user"
+ * 			bodycontent="empty"
+ * 			display-name="user details"
+ * 			description="Output details from the shared session UserDTO object"
+ * 	
+ * @author Fiona Malikoff
+ */
+public class UserTag extends TagSupport {
+
+	private static final Logger log = Logger.getLogger(UserTag.class);
+
+	/** The property to be output */
+	private String property = null;
+	/**
+	 * 
+	 */
+	public UserTag() {
+		super();
+	}
+	
+	public int doStartTag() throws JspException {
+	   	HttpSession ss = SessionManager.getSession();
+	   	if ( ss != null ) {
+	   		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	   		if ( user != null ) {
+	   			processProperty(user);
+	   		} else {
+		   		log.warn("UserTag unable to access user details as userDTO is missing. Session is "+ss);
+	   		}
+	   	} else {
+	   		log.warn("UserTag unable to access user details as shared session is missing");
+	   	}
+	   	
+    	return SKIP_BODY;
+	}
+
+	public int doEndTag() {
+		return EVAL_PAGE;
+	}
+	
+	private void processProperty(UserDTO user) throws JspException {
+		try {
+
+			if ( property != null ) {
+				Object value = null;
+				
+		        try {
+		            value = PropertyUtils.getProperty(user, property);
+		        } catch (Exception e) {
+					log.warn("UserTag unable to write out user details due to exception while accessing property value. User id "+user.getUserID(), e);
+		        }
+
+		        if ( value != null ) {
+		        	JspWriter writer = pageContext.getOut();
+		        	writer.print(value);
+		        }
+				
+			}
+			
+		} catch ( IOException e ) {
+				log.error("UserTag unable to write out user details due to IOException. User id "+user.getUserID(), e);
+				throw new JspException(e);
+		}
+	}
+	/**
+	 * @jsp.attribute required="true" 
+	 * 		rtexprvalue="true" 
+	 * 		type="String"
+	 * 		description="Property of UserDTO to be accessed."
+	 * 
+	 * @return Returns the property.
+	 */
+	public String getProperty() {
+		return property;
+	}
+	/**
+	 * @param property The property to set.
+	 */
+	public void setProperty(String property) {
+		this.property = property;
+	}
+}
Index: lams_central/web/author.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/author.jsp,v
diff -u -r1.1 -r1.2
--- lams_central/web/author.jsp	19 Sep 2005 02:22:32 -0000	1.1
+++ lams_central/web/author.jsp	13 Oct 2005 03:11:38 -0000	1.2
@@ -1,3 +1,4 @@
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 <HTML>
 <HEAD>
@@ -218,19 +219,18 @@
 <!-- URL's used in the movie-->
 <!-- text used in the movie-->
 <!--Library-->
-
 <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
  codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" name="authoring"
  width="100%" height="100%" align="" id="authoring">
   <param name="allowScriptAccess" value="sameDomain" />
 
-  <param name="movie" value="lams_authoring.swf?serverURL=<%=pathToRoot%>">
+  <param name="movie" value="lams_authoring.swf?userID=<lams:user property="userID"/>&serverURL=<%=pathToRoot%>">
   <param name="quality" value="high">
   <param name="scale" value="noscale">
   <param name="bgcolor" value="#B3B7C8">
   <embed 
 	 
-	  src="lams_authoring.swf?serverURL=<%=pathToRoot%>"
+	  src="lams_authoring.swf?userID=<lams:user property="userID"/>&serverURL=<%=pathToRoot%>"
 	  quality="high" 
 	  scale="noscale" 
 	  bgcolor="#B3B7C8"  
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/lams.tld,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/web/WEB-INF/lams.tld	13 Oct 2005 03:11:38 -0000	1.1
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<taglib>
+
+   <tlibversion>1.0</tlibversion>
+   <jspversion>1.1</jspversion>
+   <shortname>lams</shortname>
+
+   <info><![CDATA[LAMS custom tags]]></info>
+
+   <tag>
+
+      <name>user</name>
+      <tagclass>org.lamsfoundation.lams.web.tag.UserTag</tagclass>
+      <info><![CDATA[Output details from the shared session UserDTO object]]></info>
+
+      <attribute>
+         <name>property</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+
+</taglib>
Index: lams_central/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/web.xml,v
diff -u -r1.8 -r1.9
--- lams_central/web/WEB-INF/web.xml	19 Sep 2005 01:02:18 -0000	1.8
+++ lams_central/web/WEB-INF/web.xml	13 Oct 2005 03:11:38 -0000	1.9
@@ -27,37 +27,49 @@
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
 				classpath:/org/lamsfoundation/lams/applicationContext.xml
+				classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 				classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
 	</param-value>
 </context-param>
 
-    <!--
-    To use non XDoclet filters, create a filters.xml file that
-    contains the additional filters (eg Sitemesh) and place it in your
-    project's merge dir.  Don't include filter-mappings in this file,
-    include them in a file called filter-mappings.xml and put that in
-    the same directory.
-    -->
+    <filter>
+    <filter-name>SystemSessionFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+         </filter-class>
+  </filter>
+  <filter>
+    <filter-name>hibernateFilter</filter-name>
+    <filter-class>
+      org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
+    </filter-class>
+	<init-param>
+		<param-name>sessionFactoryBeanName</param-name>
+		<param-value>coreSessionFactory</param-value>
+	</init-param>
+   </filter>
 
-    <!--
-    To use non XDoclet filter-mappings, create a filter-mappings.xml file that
-    contains the additional filter-mappings and place it in your
-    project's merge dir.
-    -->
+    <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/*</url-pattern> 
+  </filter-mapping>
+    <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+  </filter-mapping>
 
   <listener>
 	<listener-class>
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
+</listener>	
+<listener>
 	<listener-class>
  		org.lamsfoundation.lams.web.SessionListener
  	</listener-class>
-	<listener-class>
-	  org.lamsfoundation.lams.web.SharedSession
-	</listener-class>
-</listener>	
+</listener>
 
    <servlet>
       <servlet-name>storeLD</servlet-name>
@@ -268,6 +280,11 @@
     <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 </taglib>
 
+ <taglib>
+   <taglib-uri>tags-lams</taglib-uri>
+   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+</taglib>
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>