Index: lams_common/build.xml =================================================================== diff -u -re86f6cd33e3632441e349cf9ec064ce0e4047c77 -r4290878496251ea618c56389b67adda2fe4f2e28 --- lams_common/build.xml (.../build.xml) (revision e86f6cd33e3632441e349cf9ec064ce0e4047c77) +++ lams_common/build.xml (.../build.xml) (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -33,12 +33,12 @@ - + - + @@ -148,6 +148,13 @@ + + + + + + + @@ -211,11 +218,11 @@ - - - - - + + + + + @@ -253,30 +260,40 @@ - - + + - - + + + + + + + + + + + + - + - + - - + + + todir="${jboss.deploy.windows}"/> + todir="${jboss.deploy.windows}"/> Index: lams_common/conf/unix/lams/lams.dtd =================================================================== diff -u --- lams_common/conf/unix/lams/lams.dtd (revision 0) +++ lams_common/conf/unix/lams/lams.dtd (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + Index: lams_common/properties.xml =================================================================== diff -u -r12c5b460684de2cd3243a088f6a942574d9e7f2c -r4290878496251ea618c56389b67adda2fe4f2e28 --- lams_common/properties.xml (.../properties.xml) (revision 12c5b460684de2cd3243a088f6a942574d9e7f2c) +++ lams_common/properties.xml (.../properties.xml) (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -18,14 +18,26 @@ - + + + + + + + + + + + - - + + + + Index: lams_common/web/adminHeader.jsp =================================================================== diff -u -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 -r4290878496251ea618c56389b67adda2fe4f2e28 --- lams_common/web/adminHeader.jsp (.../adminHeader.jsp) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) +++ lams_common/web/adminHeader.jsp (.../adminHeader.jsp) (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -13,9 +13,11 @@ + + Index: lams_common/web/changeStyle.js =================================================================== diff -u --- lams_common/web/changeStyle.js (revision 0) +++ lams_common/web/changeStyle.js (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -0,0 +1,5 @@ + Index: lams_common/web/error.jsp =================================================================== diff -u --- lams_common/web/error.jsp (revision 0) +++ lams_common/web/error.jsp (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -0,0 +1,11 @@ +<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %> + + + + + + + + + + \ No newline at end of file Index: lams_common/web/errorContent.jsp =================================================================== diff -u --- lams_common/web/errorContent.jsp (revision 0) +++ lams_common/web/errorContent.jsp (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -0,0 +1,11 @@ + + + + +
+
+

Sorry, there has been an error.

+

There is a problem processing this request. Close the browser and try again.

+

If the problem persists please contact technical support via the website www.uklams.net

+
+
Index: lams_common/web/footer.jsp =================================================================== diff -u -r7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc -r4290878496251ea618c56389b67adda2fe4f2e28 --- lams_common/web/footer.jsp (.../footer.jsp) (revision 7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc) +++ lams_common/web/footer.jsp (.../footer.jsp) (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -1,7 +1,5 @@ - - - - - -
- \ No newline at end of file + + + + +
Index: lams_common/web/getSysInfo.js =================================================================== diff -u --- lams_common/web/getSysInfo.js (revision 0) +++ lams_common/web/getSysInfo.js (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -0,0 +1,113 @@ + Index: lams_common/web/header.jsp =================================================================== diff -u -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 -r4290878496251ea618c56389b67adda2fe4f2e28 --- lams_common/web/header.jsp (.../header.jsp) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) +++ lams_common/web/header.jsp (.../header.jsp) (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -1,18 +1,17 @@ - - - - - - - - + + + + + + +
- - - - - [HELP] - - -
+ + + + + [HELP] + + +
Index: lams_common/web/index.jsp =================================================================== diff -u -rb7d1bf89d6915dc9ecee7c57b39a1f2430614086 -r4290878496251ea618c56389b67adda2fe4f2e28 --- lams_common/web/index.jsp (.../index.jsp) (revision b7d1bf89d6915dc9ecee7c57b39a1f2430614086) +++ lams_common/web/index.jsp (.../index.jsp) (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -1,415 +1,21 @@ -<%@ 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="com.lamsinternational.lams.util.JspRedirectStrategy" %> -<%@ page import="com.lamsinternational.lams.usermanagement.service.UserManagementService" %> -<%@ page import="com.lamsinternational.lams.usermanagement.*" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt" %> -<%@ page session="true" %> +<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %> +<%@ page import="com.lamsinternational.lams.security.JspRedirectStrategy" %> +<%@ page import="com.lamsinternational.lams.web.HttpSessionManager" %> - +<%JspRedirectStrategy.welcomePageStatusUpdate(request,response);%> +<%HttpSessionManager.getInstance().updateHttpSessionByLogin(request.getSession(),request.getRemoteUser()); %> + - Welcome :: LAMS - - - - - - + + - - - - - - - - - - - -
- - - -
- - - - - - - - - - -
- <%JspRedirectStrategy.welcomePageStatusUpdate(request,response);%> - <%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 ){%> -

An error has occured. You have tried to log - in but we didn't get the username. Try closing your browser and starting - again.

- <%}%> - - - - - - - - -
-

Welcome <%=user.getFirstName()%>

-

You are logged into LAMS.Please choose a workspace from the buttons on the right.

- - 		- - <%List list = service.getOrganisationsForUserByRole(user,Role.SYSADMIN); - if(list.size()>0){%> - - - - - <%}%> - <%list = service.getOrganisationsForUserByRole(user,Role.ADMIN); - if(list.size()>0){%> - - - - - <%}%> - <%list = service.getOrganisationsForUserByRole(user,Role.STAFF); - if(list.size()>0){%> - - - - - <%}%> - <%list = service.getOrganisationsForUserByRole(user,Role.AUTHOR); - if(list.size()>0){%> - - - - - <%}%> - <%list = service.getOrganisationsForUserByRole(user,Role.LEARNER); - if(list.size()>0){%> - - - - - <%}%> -
- - - -
- - - -
- - - -
- - - -
- - - -
-
-
- - - - - - -
- © 2002-2004 LAMS Foundation. - - - This copy of LAMS™ is authorised for use by the registered users only. - Version 1.1
-
-
- -
- - + + + + + + + \ No newline at end of file Index: lams_common/web/indexContent.jsp =================================================================== diff -u --- lams_common/web/indexContent.jsp (revision 0) +++ lams_common/web/indexContent.jsp (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -0,0 +1,163 @@ +<%@ 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="com.lamsinternational.lams.usermanagement.service.UserManagementService" %> +<%@ page import="com.lamsinternational.lams.usermanagement.*" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> + + + + + + + + + + + +
+ <%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 ){%> +

An error has occured. You have tried to log + in but we didn't get the username. Try closing your browser and starting + again.

+ <%}%> + + + + + + + + +
+

Welcome <%=user.getFirstName()%>

+

You are logged into LAMS.Please choose a workspace from the buttons on the right.

+ + 		+ + <%List list = service.getOrganisationsForUserByRole(user,Role.SYSADMIN); + if(list.size()>0){%> + + + + + <%}%> + <%list = service.getOrganisationsForUserByRole(user,Role.ADMIN); + if(list.size()>0){%> + + + + + <%}%> + <%list = service.getOrganisationsForUserByRole(user,Role.STAFF); + if(list.size()>0){%> + + + + + <%}%> + <%list = service.getOrganisationsForUserByRole(user,Role.AUTHOR); + if(list.size()>0){%> + + + + + <%}%> + <%list = service.getOrganisationsForUserByRole(user,Role.LEARNER); + if(list.size()>0){%> + + + + + <%}%> + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ +
+
+
+ + + + + + +
+ © 2002-2004 LAMS Foundation. + + + This copy of LAMS™ is authorised for use by the registered users only. + Version 1.1
+
Index: lams_common/web/login.jsp =================================================================== diff -u -rae1790ef7e6ea6c158c56bca3b09ef33a5c311ee -r4290878496251ea618c56389b67adda2fe4f2e28 --- lams_common/web/login.jsp (.../login.jsp) (revision ae1790ef7e6ea6c158c56bca3b09ef33a5c311ee) +++ lams_common/web/login.jsp (.../login.jsp) (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -1,171 +1,30 @@ - -<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> -<%@ page session="true" %> -<%@ page import="com.lamsinternational.lams.util.JspRedirectStrategy" %> -<%@ page import="com.lamsinternational.lams.security.Global" %> +<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %> +<%@ page import="com.lamsinternational.lams.security.JspRedirectStrategy" %> <% - - //FIXME: temporary solution - if (Global.getServletContext() == null) - Global.setServletContext( request.getSession().getServletContext() ); - - String failed = request.getParameter("failed"); - if (failed == null) + if (JspRedirectStrategy.loginPageRedirected(request,response)) { - if (JspRedirectStrategy.loginPageRedirected(request,response)) - return; - } - else - { - if (JspRedirectStrategy.errorPageRedirected(request,response)) - return; - } - + return; + } + String webAuthUser = (String) session.getAttribute("WEBAUTH_USER"); if (webAuthUser != null) - { + { response.sendRedirect("j_security_check?j_username=" + webAuthUser + "&j_password=Dummy"); - } - + } %> - - Login - LAMS :: Learning Activity Management System - - - - + + + + + + + - - - - - - - - - - - - -
- - - - - - - - - - -
- -
- -
- Welcome - -
-
- - - - - - - - - - - - - - - - -
- -
-

- 		-   - -
" method="post" name="loginForm" id="loginForm"> - <%if ( failed != null ){%> - - Sorry, that username or password is not known. Please try again. - - <%}%> - - - - - - - - - - - - - - - - - - - - - - -
- Username - - -
- Password - - -
- -
-


-
- WebAuth Users: click here -
-
- -
- © 2002-2005 LAMS Foundation. - - - This copy of LAMS™ is authorised for use by the registered users only. - - Version 1.1 -
-
- - - - -
-
- - Index: lams_common/web/loginContent.jsp =================================================================== diff -u --- lams_common/web/loginContent.jsp (revision 0) +++ lams_common/web/loginContent.jsp (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -0,0 +1,77 @@ +<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> + + + + + + + + + + + + + + +
+ +
+

+ 		+   + +
" method="post" name="loginForm" id="loginForm"> + <%String failed = request.getParameter("failed"); + if ( failed != null ){%> + + Sorry, that username or password is not known. Please try again. + + <%}%> + + + + + + + + + + + + + + + + + + + + +
+ Username + + +
+ Password + + +
+ +
+


+
+ WebAuth Users: click here +
+
+ +
+ © 2002-2005 LAMS Foundation. + + + This copy of LAMS™ is authorised for use by the registered users only. + + Version 1.1 +
Index: lams_common/web/loginHeader.jsp =================================================================== diff -u --- lams_common/web/loginHeader.jsp (revision 0) +++ lams_common/web/loginHeader.jsp (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -0,0 +1,18 @@ + + + + + + + + + + +
+ +
+ +
+ Welcome + +
Index: lams_common/web/openUrls.js =================================================================== diff -u --- lams_common/web/openUrls.js (revision 0) +++ lams_common/web/openUrls.js (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -0,0 +1,104 @@ + Index: lams_common/web/template.jsp =================================================================== diff -u -r7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc -r4290878496251ea618c56389b67adda2fe4f2e28 --- lams_common/web/template.jsp (.../template.jsp) (revision 7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc) +++ lams_common/web/template.jsp (.../template.jsp) (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -4,28 +4,36 @@ <%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> - + - - - <tiles:getAsString name="title"/> - - - - + + + <tiles:getAsString name="title"/> + + + + + + - - - - - - - - - - - - -
- + + + + + + + + + + + +
+ + +
+ +
+ +
+