Index: lams_common/build.xml =================================================================== diff -u -r2120d8411665d27e6093d15f870f453cae43e437 -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 --- lams_common/build.xml (.../build.xml) (revision 2120d8411665d27e6093d15f870f453cae43e437) +++ lams_common/build.xml (.../build.xml) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -159,7 +159,7 @@ - @@ -180,9 +180,9 @@ - + - + + @@ -203,18 +204,11 @@ - - - - - - - + + @@ -245,18 +239,37 @@ + + + + + + - + - + + + + + + + + + + + + Index: lams_common/db/sql/insert_test_data.sql =================================================================== diff -u --- lams_common/db/sql/insert_test_data.sql (revision 0) +++ lams_common/db/sql/insert_test_data.sql (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -0,0 +1,33 @@ +SET FOREIGN_KEY_CHECKS=0; + +INSERT INTO lams_organisation VALUES (1, 'Root', 'Root Organisation',null,1,NOW(),null); +INSERT INTO lams_organisation VALUES (2, 'Maquarie Uni', 'Macquarie University',1,2,NOW(),null); +INSERT INTO lams_organisation VALUES (3, 'MELCOE', 'Macquarie E-learning Center',2,3,NOW(),null); +INSERT INTO lams_organisation VALUES (4, 'LAMS', 'Lams Project Team',3,3,NOW(),null); +INSERT INTO lams_organisation VALUES (5, 'MAMS', 'Mams Project Team',3,3,NOW(),null); + +INSERT INTO lams_user VALUES(1, 'sysadmin','sysadmin','Mr','Fei','Yang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'fyang@melcoe.mq.edu.au',0,NOW(),1,null,null); +INSERT INTO lams_user VALUES(2, 'lams','lams','Mr','Kevin','Han',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'fyang@melcoe.mq.edu.au',0,NOW(),1,null,null); + +INSERT INTO lams_user_organisation VALUES (1, 1, 1); +INSERT INTO lams_user_organisation VALUES (2, 2, 2); +INSERT INTO lams_user_organisation VALUES (3, 3, 2); +INSERT INTO lams_user_organisation VALUES (4, 4, 2); + +INSERT INTO lams_user_organisation_role VALUES (1, 1, 1); +INSERT INTO lams_user_organisation_role VALUES (2, 2, 2); +INSERT INTO lams_user_organisation_role VALUES (3, 2, 3); +INSERT INTO lams_user_organisation_role VALUES (4, 2, 4); +INSERT INTO lams_user_organisation_role VALUES (5, 3, 2); +INSERT INTO lams_user_organisation_role VALUES (6, 3, 3); +INSERT INTO lams_user_organisation_role VALUES (7, 3, 4); +INSERT INTO lams_user_organisation_role VALUES (8, 4, 2); +INSERT INTO lams_user_organisation_role VALUES (9, 4, 3); +INSERT INTO lams_user_organisation_role VALUES (10, 4, 4); +INSERT INTO lams_user_organisation_role VALUES (11, 4, 5); + +INSERT INTO lams_authentication_method VALUES (1, 'Lams', 1); +INSERT INTO lams_authentication_method VALUES (2, 'WebAuth', 2); +INSERT INTO lams_authentication_method VALUES (3, 'LDAP', 3); + +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_common/lib/aopalliance/aopalliance.jar =================================================================== diff -u Binary files differ Index: lams_common/lib/jakarta-taglibs/standard.jar =================================================================== diff -u Binary files differ Index: lams_common/properties.xml =================================================================== diff -u -r2120d8411665d27e6093d15f870f453cae43e437 -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 --- lams_common/properties.xml (.../properties.xml) (revision 2120d8411665d27e6093d15f870f453cae43e437) +++ lams_common/properties.xml (.../properties.xml) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -23,8 +23,9 @@ - - + + + Index: lams_common/web/WEB-INF/applicationContext.xml =================================================================== diff -u -r497aa2d49e1e31815b0a49fcef90b915a0d1eabc -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 --- lams_common/web/WEB-INF/applicationContext.xml (.../applicationContext.xml) (revision 497aa2d49e1e31815b0a49fcef90b915a0d1eabc) +++ lams_common/web/WEB-INF/applicationContext.xml (.../applicationContext.xml) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -37,7 +37,8 @@ - + + com/lamsinternational/lams/usermanagement/AuthenticationMethod.hbm.xml com/lamsinternational/lams/usermanagement/AuthenticationMethodType.hbm.xml com/lamsinternational/lams/usermanagement/Organisation.hbm.xml @@ -48,6 +49,34 @@ com/lamsinternational/lams/usermanagement/UserOrganisationRole.hbm.xml com/lamsinternational/lams/usermanagement/Workspace.hbm.xml com/lamsinternational/lams/usermanagement/WorkspaceFolder.hbm.xml + + + com/lamsinternational/lams/learningdesign/Activity.hbm.xml + com/lamsinternational/lams/learningdesign/ActivityType.hbm.xml + com/lamsinternational/lams/learningdesign/Group.hbm.xml + com/lamsinternational/lams/learningdesign/Grouping.hbm.xml + com/lamsinternational/lams/learningdesign/GroupingType.hbm.xml + com/lamsinternational/lams/learningdesign/GateActivityLevel.hbm.xml + com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml + com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml + com/lamsinternational/lams/learningdesign/Transition.hbm.xml + + + + com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml + com/lamsinternational/lams/lesson/Lesson.hbm.xml + com/lamsinternational/lams/lesson/LessonLearner.hbm.xml + com/lamsinternational/lams/lesson/LessonState.hbm.xml + com/lamsinternational/lams/lesson/ProgressCompleted.hbm.xml + com/lamsinternational/lams/lesson/ProgressCurrent.hbm.xml + com/lamsinternational/lams/lesson/UserGroup.hbm.xml + com/lamsinternational/lams/lesson/UserToolSession.hbm.xml + com/lamsinternational/lams/lesson/UserToolSessionState.hbm.xml + + + com/lamsinternational/lams/tool/Tool.hbm.xml + com/lamsinternational/lams/tool/ToolSession.hbm.xml + com/lamsinternational/lams/tool/ToolSessionState.hbm.xml @@ -72,17 +101,15 @@ - - @@ -107,6 +133,10 @@ + + + + Index: lams_common/web/WEB-INF/dbConnection.properties =================================================================== diff -u -r2120d8411665d27e6093d15f870f453cae43e437 -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 --- lams_common/web/WEB-INF/dbConnection.properties (.../dbConnection.properties) (revision 2120d8411665d27e6093d15f870f453cae43e437) +++ lams_common/web/WEB-INF/dbConnection.properties (.../dbConnection.properties) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -4,7 +4,7 @@ #jdbc configuration jdbc.driverClassName=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost/lams1 +jdbc.url=jdbc:mysql://localhost/lams jdbc.username=root jdbc.password= Index: lams_common/web/WEB-INF/web.xml =================================================================== diff -u -r2120d8411665d27e6093d15f870f453cae43e437 -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 --- lams_common/web/WEB-INF/web.xml (.../web.xml) (revision 2120d8411665d27e6093d15f870f453cae43e437) +++ lams_common/web/WEB-INF/web.xml (.../web.xml) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -18,7 +18,7 @@ + --> log4jConfigLocation /WEB-INF/log4j.xml @@ -93,10 +93,6 @@ *.do - - index.jsp - - 3600 @@ -160,7 +156,7 @@ /WEB-INF/jstl/x-rt.tld - + Secure Content @@ -173,9 +169,10 @@ --> - + FORM + lams /login.jsp /login.jsp?failed=y Index: lams_common/web/adminHeader.jsp =================================================================== diff -u --- lams_common/web/adminHeader.jsp (revision 0) +++ lams_common/web/adminHeader.jsp (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -0,0 +1,22 @@ + + + + + + + + + + + + +
+ +
+ + + +
+ + +
Index: lams_common/web/header.jsp =================================================================== diff -u -r7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 --- lams_common/web/header.jsp (.../header.jsp) (revision 7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc) +++ lams_common/web/header.jsp (.../header.jsp) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -1,32 +1,18 @@ -<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> -<% -String title = request.getParameter("title"); -/**/ -String protocol = request.getProtocol(); -if(protocol.startsWith("HTTPS")){ - protocol = "https://"; -}else{ - protocol = "http://"; -} -String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; -//out.println("
pathToRoot="+pathToRoot+"
"); - -%>
- - <%=title%> + + - + [HELP] - +
Index: lams_common/web/index.jsp =================================================================== diff -u -r7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 --- lams_common/web/index.jsp (.../index.jsp) (revision 7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc) +++ lams_common/web/index.jsp (.../index.jsp) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -1,13 +1,414 @@ <%@ page contentType="text/html; charset=iso-8859-1" language="java" %> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> -<%@ taglib uri="/WEB-INF/jstl/c_rt.tld" prefix="c_rt" %> +<%@ 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" %> + -Welcome :: LAMS - - - -

Hellooo...

+ Welcome :: LAMS + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + +
+ <%JspRedirectStrategy.welcomePageStatusUpdate(request,response);%> + <%String login = request.getRemoteUser(); + WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); + UserManagementService service = (UserManagementService)ctx.getBean("userManagementService"); + 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/login.jsp =================================================================== diff -u -r7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 --- lams_common/web/login.jsp (.../login.jsp) (revision 7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc) +++ lams_common/web/login.jsp (.../login.jsp) (revision fe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06) @@ -1,159 +1,141 @@ - <%@ page contentType="text/html; charset=iso-8859-1" language="java" %> <%@ page import="com.lamsinternational.lams.util.JspRedirectStrategy" %> -<% +<% String failed = request.getParameter("failed"); - if (failed == null) //Login page - { + if (failed == null) + { if (JspRedirectStrategy.loginPageRedirected(request,response)) - return; - } - else //Error page - { + return; + } + else + { if (JspRedirectStrategy.errorPageRedirected(request,response)) - return; - } + return; + } %> + -Login - LAMS :: Learning Activity Management System - - - - + Login - LAMS :: Learning Activity Management System + + + + - - - - - - +
- - - - - - - - - - - - -
- -
Welcome
- - -
- - - - - - - - - - - - - - - - - -

- 		  -

-
" method="post" name="form1" id="form1"> - <% - //String failed = request.getParameter("failed"); - if ( failed != null ){ - %> - - Sorry, that username or password is not known. Please - try again. - - <% - } - %> - - - - - - - - - - - - - - - - -
Username 
Password 
   -
- -
-
- - - - - - -
© 2002-2005 - LAMS Foundation.This copy of LAMS™ is authorised for use by - the registered users only. Version 1.1
-
- - -
+ + + - - -
+ + + + + + + + + + +
+ +
+ +
+ Welcome + +
+
- - - - - - - - + + + + +
+ + + + + + + + + + + + + + +
+ +
+

+ 		+   + +
" method="post" name="loginForm" id="loginForm"> + <%if ( failed != null ){%> + + Sorry, that username or password is not known. Please try again. + + <%}%> + + + + + + + + + + + + +
+ Username + + +
+ Password + + +
+ +
+
+ +
+ © 2002-2005 LAMS Foundation. + + + This copy of LAMS™ is authorised for use by the registered users only. + + Version 1.1 +
+
+ + + + +
+
- - -
+