Index: lams_central/conf/xdoclet/listeners.xml
===================================================================
diff -u
--- lams_central/conf/xdoclet/listeners.xml	(revision 0)
+++ lams_central/conf/xdoclet/listeners.xml	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,8 @@
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+	<listener-class>
+ 		org.lamsfoundation.lams.web.SessionListener
+ 	</listener-class>
+</listener>	
\ No newline at end of file
Index: lams_central/conf/xdoclet/web-security.xml
===================================================================
diff -u
--- lams_central/conf/xdoclet/web-security.xml	(revision 0)
+++ lams_central/conf/xdoclet/web-security.xml	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,26 @@
+<security-constraint>
+	<display-name>SecurityConstraint</display-name>
+	<web-resource-collection>
+		<web-resource-name>STK</web-resource-name>
+		<url-pattern>/*</url-pattern>
+		<http-method>DELETE</http-method>
+		<http-method>GET</http-method>
+		<http-method>POST</http-method>
+		<http-method>PUT</http-method>
+	</web-resource-collection>
+	<auth-constraint>
+		<role-name>SYSADMIN</role-name>
+	</auth-constraint>
+</security-constraint>
+<security-role>
+	<description>SYSADMIN</description>
+	<role-name>SYSADMIN</role-name>
+</security-role>	
+<login-config>
+	<auth-method>FORM</auth-method>
+	<realm-name>LAMS</realm-name>
+	<form-login-config>
+		<form-login-page>/login.jsp</form-login-page>
+		<form-error-page>/login.jsp?failed=y</form-error-page>
+	</form-login-config>
+</login-config>
\ No newline at end of file
Index: lams_central/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r9bef1de27d0d527d75191115a535bc2c4311ade9 -r41e3420d7cd50147599cb873f5695203fc6e17e4
--- lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 9bef1de27d0d527d75191115a535bc2c4311ade9)
+++ lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -28,8 +28,3 @@
 				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
 	</param-value>
 </context-param>
-<listener>
-	<listener-class>
-		org.springframework.web.context.ContextLoaderListener
-	</listener-class>
-</listener>	
\ No newline at end of file
Index: lams_central/web/WEB-INF/jboss-web.xml
===================================================================
diff -u -r84af64052b65a5a8f91e42f58f03e8362c5eb3de -r41e3420d7cd50147599cb873f5695203fc6e17e4
--- lams_central/web/WEB-INF/jboss-web.xml	(.../jboss-web.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
+++ lams_central/web/WEB-INF/jboss-web.xml	(.../jboss-web.xml)	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -6,6 +6,6 @@
   <!-- This setting is only used when the war file is deployed directly -->
   <!-- within JBOSS. Usually it will be deployed as /lams, set in the ear's -->
   <!-- application.xml file. -->
-  <context-root>java:/jaas/LAMS</context-root>
+   <security-domain>java:/jaas/LAMS</security-domain>
 
 </jboss-web>
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r84af64052b65a5a8f91e42f58f03e8362c5eb3de -r41e3420d7cd50147599cb873f5695203fc6e17e4
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -33,11 +33,6 @@
 				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
 	</param-value>
 </context-param>
-<listener>
-	<listener-class>
-		org.springframework.web.context.ContextLoaderListener
-	</listener-class>
-</listener>	
 
     <!--
     To use non XDoclet filters, create a filters.xml file that
@@ -53,11 +48,14 @@
     project's merge dir.
     -->
 
-    <!--
-    To use non XDoclet listeners, create a listeners.xml file that
-    contains the additional listeners and place it in your
-    project's merge dir.
-    -->
+  <listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+	<listener-class>
+ 		org.lamsfoundation.lams.web.SessionListener
+ 	</listener-class>
+</listener>	
 
  <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
@@ -248,24 +246,31 @@
     <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 </taglib>
 
-   <!--
-   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
-   Organize web-security.xml following this DTD slice:
+  <security-constraint>
+	<display-name>SecurityConstraint</display-name>
+	<web-resource-collection>
+		<web-resource-name>STK</web-resource-name>
+		<url-pattern>/*</url-pattern>
+		<http-method>DELETE</http-method>
+		<http-method>GET</http-method>
+		<http-method>POST</http-method>
+		<http-method>PUT</http-method>
+	</web-resource-collection>
+	<auth-constraint>
+		<role-name>SYSADMIN</role-name>
+	</auth-constraint>
+</security-constraint>
+<security-role>
+	<description>SYSADMIN</description>
+	<role-name>SYSADMIN</role-name>
+</security-role>	
+<login-config>
+	<auth-method>FORM</auth-method>
+	<realm-name>LAMS</realm-name>
+	<form-login-config>
+		<form-login-page>/login.jsp</form-login-page>
+		<form-error-page>/login.jsp?failed=y</form-error-page>
+	</form-login-config>
+</login-config>
 
-   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
-   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
-   <!ELEMENT web-resource-name (#PCDATA)>
-   <!ELEMENT url-pattern (#PCDATA)>
-   <!ELEMENT http-method (#PCDATA)>
-   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-   <!ELEMENT transport-guarantee (#PCDATA)>
-
-   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-   <!ELEMENT auth-method (#PCDATA)>
-   <!ELEMENT realm-name (#PCDATA)>
-   <!ELEMENT form-login-config (form-login-page, form-error-page)>
-   <!ELEMENT form-login-page (#PCDATA)>
-   <!ELEMENT form-error-page (#PCDATA)>
-   -->
-
 </web-app>
Index: lams_central/web/adminHeader.jsp
===================================================================
diff -u
--- lams_central/web/adminHeader.jsp	(revision 0)
+++ lams_central/web/adminHeader.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,24 @@
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+	<tr> 
+		<td colspan="2">
+			<img height=10 src="images/spacer.gif" alt="spacer.gif"/> 
+		</td>
+	</tr>
+	<tr> 
+		<td width="136" height="7" >
+			<img height="53" src="images/learner_header_logo.jpg" width="160" alt="learner_header_logo.jpg"/>
+		</td>
+		<td width="92%" >
+			<img height="53" src="images/learner_header_right.gif" width="100%" alt="learner_header_right.gif"/>
+		</td>
+	</tr>
+	<tr bgcolor="#1C8AC6"> 
+		<!--
+		<td height="8">
+		</td>
+		-->
+		<td colspan="2" height="8" align="right" >
+			<img height=8 width=8 src="images/spacer.gif" alt="spacer.gif"/>
+		</td>
+	</tr>
+</table>
Index: lams_central/web/errorContent.jsp
===================================================================
diff -u
--- lams_central/web/errorContent.jsp	(revision 0)
+++ lams_central/web/errorContent.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,11 @@
+<table width="90%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
+	<tr> 
+		<td> 
+			<div align="center" class="heading">
+				<p>Sorry, there has been an error. </p>
+				<p class="body">There is a problem processing this request. Close the browser and try again. </p>
+				<p class="body">If the problem persists please contact technical support via the website <a href="http://www.uklams.net/" target="_blank">www.uklams.net</a></p>
+			</div>
+		</td>
+	</tr>
+</table>
Index: lams_central/web/footer.jsp
===================================================================
diff -u
--- lams_central/web/footer.jsp	(revision 0)
+++ lams_central/web/footer.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,5 @@
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr bgcolor="#282871"> 
+		<td width="100%" height="8"></td>
+	</tr>
+</table>
Index: lams_central/web/header.jsp
===================================================================
diff -u
--- lams_central/web/header.jsp	(revision 0)
+++ lams_central/web/header.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,17 @@
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+	<tr> 
+		<td colspan="2" height="10"></td>
+	</tr>
+	<tr bgcolor="#282871"> 
+		<td width="50%" height="15" align="left">
+			<img height=8 width=8 src="images/spacer.gif" alt="spacer.gif"/>
+			<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif"><c:out value="${pageHeader}" default="Welcome"/></font>
+		</td>
+		<td width="50%" height="15" align="right" > 
+			<a href="doc/LAMS_Learner_Guide_b60.pdf" target = 0>
+				<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">[HELP]</font>
+			</a>
+			<img height=8 width=8 src="images/spacer.gif" alt="spacer.gif"/>
+		</td>
+	</tr>
+</table>
Index: lams_central/web/images/.cvsignore
===================================================================
diff -u
--- lams_central/web/images/.cvsignore	(revision 0)
+++ lams_central/web/images/.cvsignore	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1 @@
+Thumbs.db
Index: lams_central/web/images/1pxGreen.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/1pxGrey.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/1pxRed.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/circle_empty.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/circle_filled.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/cross.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/customer_logo.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/flash_get.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/green_arrow_down_right.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/greyBullet.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/lams_welcome_header.jpg
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/launch_page_graphic.jpg
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/ld_logo.jpg
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/learner_footer.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/learner_header_logo.jpg
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/learner_header_right.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/log_on_blank.jpg
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/log_on_divider.jpg
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/log_on_logo.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/synch_active.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/synch_not_active.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/tick.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/includes/javascript/changeStyle.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/changeStyle.js	(revision 0)
+++ lams_central/web/includes/javascript/changeStyle.js	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,5 @@
+<!--
+	function changeStyle(obj, new_style) { 
+		obj.className=new_style;
+	}
+//-->
Index: lams_central/web/includes/javascript/getSysInfo.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/getSysInfo.js	(revision 0)
+++ lams_central/web/includes/javascript/getSysInfo.js	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,113 @@
+	<!--
+		var isWin = false;
+		var isMac = false;
+
+		function Its()
+		{
+			var n = navigator;
+			// string comparisons are much easier if we lowercase everything now.
+			// to make indexOf() tests more compact/readable, we prepend a space 
+			// to the userAgent string (to get around '-1' indexOf() comparison)
+			var ua = ' ' + n.userAgent.toLowerCase();
+			var pl = n.platform.toLowerCase(); // not supported in NS3.0
+			var an = n.appName.toLowerCase();
+	
+			// browser version
+			this.version = n.appVersion;
+			// debug
+			//	document.writeln("ua="+ua+"<br/>");
+			//	document.writeln("pl="+pl+"<br/>");
+			//	document.writeln("an="+an+"<br/>");
+	
+			this.nn = ua.indexOf('mozilla') > 0;
+	
+			// 'compatible' versions of mozilla aren't navigator
+			if(ua.indexOf('compatible') > 0)
+			{
+				this.nn = false;
+			}
+	
+			this.opera = ua.indexOf('opera') > 0;
+			this.webtv = ua.indexOf('webtv') > 0;
+			this.ie = ua.indexOf('msie') > 0;
+			this.aol = ua.indexOf('aol') > 0;
+			this.omniweb = ua.indexOf('omniweb') > 0;
+			this.galeon = ua.indexOf('galeon') > 0;
+	
+			this.major = parseInt( this.version );
+			this.minor = parseFloat( this.version );
+	
+			// workarounds
+			// - IE5 & 6 reports itself as version 4.0
+			if(this.ie)
+			{
+				if(ua.indexOf("msie 5") > 0)
+				{
+					this.major = 5;
+					var actual_index = ua.indexOf("msie 5");
+					//alert("indexOf msie 5:"+actual_index);
+					var actual_major = ua.substring(actual_index + 5, actual_index + 8);
+					//alert("actual_major:"+actual_major);
+					this.minor = parseFloat(actual_major);	
+				}
+				else if (ua.indexOf("msie 6") > 0)
+				{
+					this.major = 6;
+					var actual_index = ua.indexOf("msie 6");
+					//alert("indexOf msie 6:"+actual_index);
+					var actual_major = ua.substring(actual_index + 5, actual_index + 8);
+					//alert("actual_major:"+actual_major);
+					this.minor = parseFloat(actual_major);
+				}
+			}
+	
+			this.screenheight=screen.height;
+			this.screenwidth=screen.width;
+			
+			if (ua.indexOf("mac") != -1)
+			{
+				isMac = true;
+			}
+			
+			if (ua.indexOf("win") != -1)
+			{
+				isWin = true;
+			}
+		
+			this.platformDetected = "";
+			
+			if(ua.indexOf("16")  != -1  && isWin){
+				this.platformDetected = "win16";
+			}else if(ua.indexOf("95") != -1  && isWin){
+				this.platformDetected = "win95";
+			}else if(ua.indexOf("98")!= -1  && isWin){
+				this.platformDetected = "win98";
+			}else if(ua.indexOf("win 9x 4.90") != -1  && isWin){
+				this.platformDetected = "winme";
+			}else if(ua.indexOf("nt 5.1")!= -1  && isWin){
+				this.platformDetected = "winxp";
+			}else if(ua.indexOf("nt 5") != -1  && isWin){
+				this.platformDetected = "win2000";
+			}else if(ua.indexOf("nt") != -1  && isWin){
+				this.platformDetected = "winnt";
+			}else if((ua.indexOf("68k") != -1 || ua.indexOf("68000") != -1) && isMac){
+				this.platformDetected = "mac68000";
+			}else if((ua.indexOf("ppc") != -1 || ua.indexOf("powerpc") != -1) && isMac){
+				this.platformDetected = "macppc";
+			}else{
+				this.platformDetected = "unknown";
+			}
+		
+			//alert( "platform=" + this.platformDetected );
+			
+			  return this;
+			}
+	
+			var its = new Its();
+			/*for LAMS min spec is:
+			*		Platform:	WIndows 	98 / NT4 / NT5 (2K) / XP
+			*					Macintosh	PPC
+			*		Browser:	Internet Explorer 5 +
+			*		Flash:		6,0,47,0 (Version 6 Relase 47)
+			*/
+		//-->
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/openUrls.js	(revision 0)
+++ lams_central/web/includes/javascript/openUrls.js	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,104 @@
+	<!--
+		// resolution checking
+		var belowMinRes;
+		if(screen.width <= 800 && screen.height <= 600){
+			belowMinRes = true;
+		}else{
+			belowMinRes = false;
+		}
+		
+		var authorWin = null;
+		var learnWin = null;
+		var teachWin = null;
+		var adminWin = null;
+		
+		function openAuthor( )
+		{
+			var orgId = document.forms[0].orgIdForAuthor.value;
+			if(isMac)
+			{
+				authorWin = window.open('home.do?method=author&orgId='+orgId,'aWindow','width=796,height=570,resizable');
+			}
+			else
+			{
+				if(authorWin && authorWin.open && !authorWin.closed)
+				{
+					authorWin.focus();
+				}
+				else
+				{
+					authorWin = window.open('home.do?method=author&orgId='+orgId,'aWindow','width=796,height=570,resizable');
+					authorWin.focus();
+				}
+			}
+		}
+		
+		function openStaff( )
+		{
+			var orgId = document.forms[0].orgIdForStaff.value;
+			if(isMac)
+			{
+				if(belowMinRes)
+				{
+					teachWin = window.open('home.do?method=staff&orgId='+orgId,'tWindow','width=796,height=575,resizable,scrollbars');
+				}
+				else
+				{
+					teachWin = window.open('home.do?method=staff&orgId='+orgId,'tWindow','width=779,height=575');
+				}
+			}
+			else
+			{
+				if(teachWin && teachWin.open && !teachWin.closed)
+				{
+					teachWin.focus();
+				}
+				else
+				{
+					teachWin = window.open('home.do?method=staff&orgId='+orgId,'tWindow','width=779,height=575,resizable');
+				}
+			}
+		}
+		
+		function openLearner()
+		{
+			var orgId = document.forms[0].orgIdForStaff.value;
+			if(isMac)
+			{
+				learnWin = window.open('home.do?method=learner&orgId='+orgId,'lWindow','width=796,height=570,resizable,status=yes');
+			}
+			else
+			{
+				if(learnWin && learnWin.open && !learnWin.closed )
+				{
+					learnWin.focus();
+				}
+				else
+				{
+					learnWin = window.open('home.do?method=learner&orgId='+orgId,'lWindow','width=796,height=570,resizable,status=yes');
+				}
+			}
+		}
+		
+		function openAdmin()
+		{
+			var orgId = document.forms[0].orgIdForAdmin.value;
+			if(isMac)
+			{
+				adminWin = window.open('home.do?method=admin&orgId='+orgId,'adWindow','width=796,height=570,resizable,location,menubar,scrollbars,dependent,status,toolbar');
+			}
+			else
+			{
+				if(adminWin && adminWin.open && !adminWin.closed )
+				{
+					adminWin.focus();
+				}
+				else
+				{
+					adminWin = window.open('home.do?method=admin&orgId='+orgId,'adWindow','width=796,height=570,resizable,location,menubar,scrollbars,dependent,status,toolbar');
+					adminWin.focus();
+				}
+			}
+		}
+			
+	//-->
Fisheye: Tag 41e3420d7cd50147599cb873f5695203fc6e17e4 refers to a dead (removed) revision in file `lams_central/web/index.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/index.jsp
===================================================================
diff -u -r84af64052b65a5a8f91e42f58f03e8362c5eb3de -r41e3420d7cd50147599cb873f5695203fc6e17e4
--- lams_central/web/index.jsp	(.../index.jsp)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
+++ lams_central/web/index.jsp	(.../index.jsp)	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -1,10 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head><title>Learning Design Details (Authoring)</title></head>
-<body>
-	<%
-		String str = (String)request.getSession().getAttribute("details");
-		out.println(str);
-	%>
-</body>
-</html>
\ No newline at end of file
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy" %>
+<%@ page import="org.lamsfoundation.lams.web.HttpSessionManager" %>
+
+<%JspRedirectStrategy.welcomePageStatusUpdate(request,response);%>
+<%HttpSessionManager.getInstance().updateHttpSessionByLogin(request.getSession(),request.getRemoteUser()); %>
+
+<tiles:insert page="template.jsp" flush="true">
+	<tiles:put name="title" value="Welcome :: LAMS"/>
+	<tiles:put name="pageHeader" value="Welcome"/>
+	<tiles:put name="header" value="adminHeader.jsp"/>
+	<tiles:put name="content" value="indexContent.jsp" />	
+	<tiles:put name="footer" value="footer.jsp"/>	
+</tiles:insert>
Index: lams_central/web/indexContent.jsp
===================================================================
diff -u
--- lams_central/web/indexContent.jsp	(revision 0)
+++ lams_central/web/indexContent.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,148 @@
+<%@ page contentType="text/html; charset=iso-8859-1" language="java" %>
+<%@ page import="java.util.List" %>
+<%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %>
+<%@ page import="org.springframework.web.context.WebApplicationContext" %>
+<%@ page import="org.lamsfoundation.lams.usermanagement.service.UserManagementService" %>
+<%@ page import="org.lamsfoundation.lams.usermanagement.*" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<html>
+<head>
+	<script language="JavaScript" type="text/javascript" src="getSysInfo.js"></script>
+	<script language="JavaScript" type="text/javascript" src="openUrls.js"></script>
+</head>
+<form name="form" method="post">
+<table width="98%" height="100%" border="0" align="center" cellpadding="2" cellspacing="0">
+	<tr>
+		<td align="center" valign="middle"><img height="7" src="images/spacer.gif" width="10" alt="spacer.gif"/></td>
+	</tr>
+	<tr>
+		<td height="100%" valign="top">
+			<%String login = request.getRemoteUser();
+			WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); 
+			UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget");
+			User user = service.getUserByLogin(login);
+			if ( login==null ){%>
+				<P class="error">An error has occured. You have tried to log
+				in but we didn't get the username. Try closing your browser and starting
+				again.</p>
+			<%}%>
+			<table width="70%" height="100%" border="0" align="center" cellpadding="2" cellspacing="0">
+				<tr>
+					<td width="50%" align="left" valign="top" >
+						<p class="mainHeader">Welcome <%=user.getFirstName()%></p>
+						<p class="body">
+							You are logged into LAMS.Please choose a workspace from the buttons on the right or
+							<a href="home.do?method=passwordChange"> Change Password </a>here.			
+						</p>
+						<script language="JavaScript" type="text/javascript">
+						<!--
+							// if it's a mac i can't just focus as i don't know if the window is open or not,
+							// need to give this warning.
+							if(isMac)
+							{
+								document.writeln(
+								'<p class="note">Note: If your workspace is already open' +
+								' clicking the button will re-load the window and unsaved work' +
+								' may be lost.</p>' );
+							}
+						//-->
+						</script>
+					</td>
+					<td width="50%" align="right" valign="top">
+						<table border="0" cellpadding="0" cellspacing="3">
+							<%List list = service.getOrganisationsForUserByRole(user,Role.ADMIN);
+								if(list.size()>0){%>
+								<tr>
+									<td align="left">
+										<input name="admin" type="button" id="admin" onClick="openAdmin();" value="Adminstrator" style="width:100" />
+									</td>
+									<td align="left">
+										<select name="orgIdForAdmin">
+										<%for(int i=0;i<list.size();i++){
+											Organisation org = (Organisation)list.get(i);%>
+											<option value="<%=org.getOrganisationId()%>"><%=org.getName()%></option>
+										<%}%>
+										</select> 
+									</td>
+								</tr>
+							<%}%>
+							<%list = service.getOrganisationsForUserByRole(user,Role.STAFF);
+								if(list.size()>0){%>
+								<tr>
+									<td align="left">
+										<input name="staff" type="button" id="staff" onClick="openStaff();" value="Staff" style="width:100" />
+									</td>
+									<td align="left">
+										<select name="orgIdForStaff">
+										<%for(int i=0;i<list.size();i++){
+											Organisation org = (Organisation)list.get(i);%>
+											<option value="<%=org.getOrganisationId()%>"><%=org.getName()%></option>
+										<%}%>
+										</select> 
+									</td>
+								</tr>
+							<%}%>
+							<%list = service.getOrganisationsForUserByRole(user,Role.AUTHOR);
+								if(list.size()>0){%>
+								<tr>
+									<td align="left">
+										<input name="author" type="button" id="author" onClick="openAuthor();" value="Author" style="width:100" />
+									</td>
+									<td align="left">
+										<select name="orgIdForAuthor">
+										<%for(int i=0;i<list.size();i++){
+											Organisation org = (Organisation)list.get(i);%>
+											<option value="<%=org.getOrganisationId()%>"><%=org.getName()%></option>
+										<%}%>
+									</select> 
+									</td>
+								</tr>
+							<%}%>
+							<%list = service.getOrganisationsForUserByRole(user,Role.LEARNER);
+							if(list.size()>0){%>
+								<tr>
+									<td align="left">
+										<input name="learner" type="button" id="learner" onClick="openLearner();" value="Learner" style="width:100" />
+									</td>
+									<td align="left">
+										<select name="orgIdForLearner">
+										<%for(int i=0;i<list.size();i++){
+											Organisation org = (Organisation)list.get(i);%>
+											<option value="<%=org.getOrganisationId()%>"><%=org.getName()%></option>
+										<%}%>
+										</select> 
+									</td>
+								</tr>
+							<%}%>
+						</table>
+					</td>
+				</tr>
+				<tr align="center" valign="bottom">
+					<td colspan="2" ><img height="274" src="images/launch_page_graphic.jpg" width="587" alt="launch_page_graphic.jpg"></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr valign="bottom">
+		<td>	
+			<table width="100%" border="0" cellpadding="0" cellspacing="0" class="lightNote">
+				<tr valign="bottom">
+					<td height="12">
+						<a href="javascript:alert('LAMS&#8482; &copy; 2002-2005 LAMS Foundation. 
+							\nAll rights reserved.
+							\n\nLAMS is a trademark of LAMS Foundation.
+							\nDistribution of this software is prohibited.');" 
+							class="lightNoteLink">&copy; 2002-2004 LAMS Foundation.
+						</a>
+					</td>
+					<td align="center">
+						This copy of LAMS&#8482; is authorised for use by the registered users only.
+					</td>
+					<td align="right">Version 1.1</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</form>
+</html>
\ No newline at end of file
Index: lams_central/web/login.jsp
===================================================================
diff -u -r84af64052b65a5a8f91e42f58f03e8362c5eb3de -r41e3420d7cd50147599cb873f5695203fc6e17e4
--- lams_central/web/login.jsp	(.../login.jsp)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -1,50 +1,30 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy" %>
+<%	
+	if (JspRedirectStrategy.loginPageRedirected(request,response))
+	{
+		return;
+	}		
 
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+	String webAuthUser = (String) session.getAttribute("WEBAUTH_USER");
+	if (webAuthUser != null)
+	{
+		response.sendRedirect("j_security_check?j_username=" + webAuthUser + "&j_password=Dummy");	
+	}
 %>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>My JSP 'MyJsp.jsp' starting page</title>
-    
-    <meta http-equiv="pragma" content="no-cache">
-    <meta http-equiv="cache-control" content="no-cache">
-    <meta http-equiv="expires" content="0">
-    <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-    <meta http-equiv="description" content="This is my page">
-    
-    <!--
-    <link rel="stylesheet" type="text/css" href="styles.css">
-    -->
-  </head>
-  
-  <body>
-   <form action="<%= response.encodeURL("j_security_check") %>" method="post" name="form1" id="form1">
-        <table width="150" height="87" border="0" align="center" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="51" align="right" class="smallText">Username</td>
-            <td width="1">&nbsp;</td>
-            <td width="90" align="right"> <input name="j_username" type="text" class="textField" size="15" /></td>
-          </tr>
-          <tr>
-            <td align="right" class="smallText">Password</td>
-            <td>&nbsp;</td>
-            <td align="right"> <input name="j_password" type="password" class="textField" size="15" AUTOCOMPLETE="off"/></td>
-          </tr>
-          <tr>
-            <td height="23" align="right">&nbsp;</td>
-            <td>&nbsp;</td>
-            <td align="right"> <input type="submit" value="Login"/>
-            </td>
-          </tr>
-        </table>
-       
-      </form>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+flash is searching for this string, so leave it!:
+j_security_login_page
+-->
+<tiles:insert page="template.jsp" flush="true">
+	<tiles:put name="title" value="Login - LAMS :: Learning Activity Management System"/>
+	<tiles:put name="pageHeader" value="Welcome"/>
+	<tiles:put name="header" value="loginHeader.jsp"/>
+	<tiles:put name="content" value="loginContent.jsp" />	
+	<tiles:put name="footer" value="footer.jsp"/>	
+</tiles:insert>
 
-  </body>
 </html>
Index: lams_central/web/loginContent.jsp
===================================================================
diff -u
--- lams_central/web/loginContent.jsp	(revision 0)
+++ lams_central/web/loginContent.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,77 @@
+<%@ page contentType="text/html; charset=iso-8859-1" language="java" %>
+<table width="100%" height="100%" border="0" align="center" cellpadding="2" cellspacing="0">
+	<tr>
+		<td colspan="3" align="center" valign="middle">
+			<img width="10" height="7" src="images/spacer.gif" alt="spacer.gif"/>
+		</td>
+	</tr>
+	<tr>
+		<td align="center" valign="middle"> 
+			<p><img height="300" src="images/customer_logo.gif" width="300" alt="customer_logo.gif"/></p>
+		</td>
+		<td width="100%">
+			&nbsp;
+		</td>
+		<td width="200" style="{border-left: solid #CCCCCC 1px;}">
+			<form action="<%= response.encodeURL("j_security_check") %>" method="post" name="loginForm" id="loginForm">
+				<%String failed = request.getParameter("failed");
+				if ( failed != null ){%>
+					<span class="error">
+						Sorry, that username or password is not known. Please try again.
+					</span>
+				<%}%>
+				<table width="150" height="87" border="0" align="center" cellpadding="0" cellspacing="0">
+					<tr>
+						<td align="left" class="smallText">
+							Username
+						</td>
+						<td colspan="2" align="right">
+							<input name="j_username" type="text" class="textField" size="15" />
+						</td>
+					</tr>
+					<tr>
+						<td align="left" class="smallText">
+							Password
+						</td>
+						<td colspan="2" align="right">
+							<input name="j_password" type="password" class="textField" size="15" />
+						</td>
+					</tr>
+					<tr>
+						<td colspan="3" align="right">
+							<input type="submit" value="Login" class="button" onmouseover="changeStyle(this,'buttonover')" onmouseout="changeStyle(this,'button')" />
+						</td>
+					</tr>
+					<tr>
+						<td colspan="3" align="center">
+							<br><br><br>
+						</td>
+					</tr>
+					<!-- TODO: show "webauth login" only if webauth is enabled -->
+					<tr>
+						<td colspan="3" align="left" class="smallText">
+							<a href="https://array00.melcoe.mq.edu.au/lams/webauth">WebAuth Users: click here</a> 
+						</td>
+					</tr>
+							
+				</table>
+			</form>
+			<img height="1" src="images/spacer.gif" width="200" alt="spacer.gif"/>
+		</td>
+	</tr>
+	<tr valign="bottom" class="lightNote">
+		<td>
+			<a href="javascript:alert('LAMS&#8482; &copy; 2002-2005 LAMS Foundation. 
+				\nAll rights reserved.
+				\n\nLAMS is a trademark of LAMS Foundation.
+				\nDistribution of this software is prohibited.');" class="lightNoteLink">&copy; 2002-2005 LAMS Foundation.
+			</a>
+		</td>
+		<td align="center">
+			This copy of LAMS&#8482; is authorised for use by the registered users only.
+		</td>
+		<td align="right"> 
+			Version 1.1
+		</td>
+	</tr>
+</table>
Index: lams_central/web/loginHeader.jsp
===================================================================
diff -u
--- lams_central/web/loginHeader.jsp	(revision 0)
+++ lams_central/web/loginHeader.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,18 @@
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+	<tr> 
+		<td>
+			<img src="images/spacer.gif" alt="spacer.gif"/> 
+		</td>
+	</tr>
+	<tr> 
+		<td>
+			<img width="100%" height="53" src="images/learner_header_right.gif" alt="learner_header_right.gif"/>
+		</td>
+	</tr>
+	<tr bgcolor="#1C8AC6"> 
+		<td align="right" >
+			<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">Welcome</font>
+			<img width="10" src="images/spacer.gif" alt="spacer.gif"/>
+		</td>
+	</tr>
+</table>
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u
--- lams_central/web/passwordChangeContent.jsp	(revision 0)
+++ lams_central/web/passwordChangeContent.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,51 @@
+<%@page import="org.lamsfoundation.lams.web.PasswordChangeActionForm" %>
+<%@ taglib uri="tags-tiles" prefix="html" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+
+<html:form action="/passwordChanged" method="post">
+<table width="100%" height="177" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
+	<tr> 
+		<td valign="top">
+			<H2> Change Password </H2>
+			<p><html:errors/></p>
+			<table>
+				<tr>
+					<td class="body" align="right">
+						Username:
+					</td>
+					<td class="body" align="left">
+						<html:hidden name="<%=PasswordChangeActionForm.formName%>" property="login"/>
+						<bean:write name="<%=PasswordChangeActionForm.formName%>" property="login"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="body" align="right">
+						Old Password:
+					</td>
+					<td class="body" align="left">
+						<html:password name="<%=PasswordChangeActionForm.formName%>" property="oldPassword" size="50" maxlength="50"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="body" align="right">
+						Password:
+					</td>
+					<td class="body" align="left">
+						<html:password name="<%=PasswordChangeActionForm.formName%>" property="password" size="50" maxlength="50"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="body" align="right">
+						Confirm Password:
+					</td>
+					<td class="body" align="left">
+						<html:password name="<%=PasswordChangeActionForm.formName%>" property="passwordConfirm" size="50" maxlength="50"/>
+					</td>
+				</tr>
+			</table>
+			<p> <html:submit>Save</html:submit> &nbsp; 	<html:cancel>Cancel</html:cancel></p>
+		</td>
+	</tr>
+</table>
+</html:form>
+			
\ No newline at end of file
Index: lams_central/web/passwordChangeOkContent.jsp
===================================================================
diff -u
--- lams_central/web/passwordChangeOkContent.jsp	(revision 0)
+++ lams_central/web/passwordChangeOkContent.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,22 @@
+<html>
+	
+<head>
+	<link rel="stylesheet" type="text/css" href="style.css"/> 
+</head>
+
+<table width="100%" height="177" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
+	<tr> 
+		<td valign="top">
+			<p class=body>Your password has been changed.</p>
+			<p class=body>	
+				<input name="Ok" type="button" class="button" id="Ok" 
+					onClick="javascript:document.location='passwordChangeOk.do';" 		
+					onMouseOver="changeStyle(this,'buttonover')"
+					onMouseOut="changeStyle(this,'button')" 
+					value="Ok" />
+			</p>
+		</td>
+	</tr>
+</table>
+
+</html>
\ No newline at end of file
Index: lams_central/web/template.jsp
===================================================================
diff -u
--- lams_central/web/template.jsp	(revision 0)
+++ lams_central/web/template.jsp	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -0,0 +1,37 @@
+
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html:html locale = "true">
+<head>
+	<html:base/>
+	<title><tiles:getAsString name="title"/></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/style.css'/>" >
+	<script language="JavaScript" type="text/JavaScript" src="changeStyle.js"></script>
+</head>
+    
+<body bgcolor="#9DC5EC" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<table width="95%" height="95%" border="0" cellspacing="0" cellpadding="0" align="center">
+	<tr>
+		<td>
+	        <c:set var="pageHeader" scope="session"><tiles:getAsString name="pageHeader"/></c:set>
+			<tiles:insert attribute="header" />
+		</td>
+	</tr>
+	<tr>
+		<td width="100%" height="100%" align="center" valign="middle" bgcolor="#FFFFFF">	
+			<tiles:insert attribute="content" />
+		</td>
+	</tr>
+	<tr>
+		<td>		
+			<tiles:insert attribute="footer" />
+		</td>
+	</tr>		
+</table>
+</body>
+</html:html>