Index: lams_admin/conf/xdoclet/web-security.xml =================================================================== diff -u -r34d347c43480cf5158c4c5b586bcf3debc2077d5 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_admin/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 34d347c43480cf5158c4c5b586bcf3debc2077d5) +++ lams_admin/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -22,17 +22,38 @@ - - - AUTHOR ADMIN + + + Student + LEARNER - + + + Authors Learning Designs + AUTHOR + + + + Member of Staff + MONITOR + + + + Group Manager GROUP MANAGER - + + + Group Administrator GROUP ADMIN + - SYSADMIN + Author Administrator + AUTHOR ADMIN - \ No newline at end of file + + + LAMS System Adminstrator + SYSADMIN + \ No newline at end of file Index: lams_build/conf/j2ee/lams.application.xml =================================================================== diff -u -r87eb102709d60a8b05528a9119d1678a8f899ce4 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_build/conf/j2ee/lams.application.xml (.../lams.application.xml) (revision 87eb102709d60a8b05528a9119d1678a8f899ce4) +++ lams_build/conf/j2ee/lams.application.xml (.../lams.application.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -64,28 +64,34 @@ Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions + Group Administrator + GROUP ADMIN + + + + Author Administrator + AUTHOR ADMIN + + + + LAMS System Adminstrator SYSADMIN Index: lams_central/conf/xdoclet/web-security.xml =================================================================== diff -u -r2b88dada3266a4b0f83f4b5c4cf617553496ca59 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_central/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 2b88dada3266a4b0f83f4b5c4cf617553496ca59) +++ lams_central/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,108 +1,88 @@ + - Secure Content - /addLesson.jsp - /admin.jsp - /author.jsp - /authoringConfirm.jsp - /community.jsp - /editprofile.jsp - /findUserLessons.jsp - /findUserLessonsAutocomplete.jsp - /footer.jsp - /group.jsp - /groupContents.jsp - /groupHeader.jsp - /header.jsp - /index.jsp - /lams_shared_library.jsp - /launchlearner.jsp - /learner.jsp - /lessons.jsp - /main.jsp - /monitorLesson.jsp - /msgContent.jsp - /passwordChangeContent.jsp - /passwordChangeOkContent.jsp - /portrait.jsp - /profile.jsp - /sysadmin.jsp - /template.jsp - - - /tutorialVideo.jsp - /portrait.jsp - /loadVars.jsp - - - *.html - *.do - /servlet/* - /ckeditor/* - /toolcontent/* - /development/* - /pedagogical_planner/* - /lamscommunity/* - /JHB/* + General secure content + /* LEARNER MONITOR AUTHOR GROUP MANAGER GROUP ADMIN - SYSADMIN AUTHOR ADMIN + SYSADMIN - + - Authoring Update - /authoring.do + Public content + /css/* + /errorpages/* + /images/* + /includes/javascript/* + /signup/* + *.ico + + + + + Author content + /authoring/* + /addLesson.jsp + /author.jsp + /authoringConfirm.jsp + /lams_authoring_library.swf + /lams_authoring.swf + /lams_preloader.swf + AUTHOR - AUTHOR ADMIN + SYSADMIN + - Staff Content - /monitoring.do - + Organisation grouping + /orgGroup.jsp + /orgGrouping.jsp + + AUTHOR MONITOR GROUP MANAGER + GROUP ADMIN + SYSADMIN - - + - Download Files - /download/ + Add lesson + /addLesson.jsp - LEARNER - AUTHOR MONITOR - GROUP MANAGER - GROUP ADMIN + GROUP MANAGER SYSADMIN - AUTHOR ADMIN - - - - Open access content - /signup/* - - + + + Sysadmin content + /admin.jsp + /sysadmin.jsp + + + SYSADMIN + + @@ -113,36 +93,39 @@ /login.jsp?failed=y - + - Student LEARNER - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - + + Group Manager GROUP MANAGER - + + + Group Administrator GROUP ADMIN - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN - - - + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + \ No newline at end of file Index: lams_central/web/includes/javascript/progressBar.js =================================================================== diff -u -rf69c22db18ae4be82e40f9e66a6b5c6efe8890da -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_central/web/includes/javascript/progressBar.js (.../progressBar.js) (revision f69c22db18ae4be82e40f9e66a6b5c6efe8890da) +++ lams_central/web/includes/javascript/progressBar.js (.../progressBar.js) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1021,7 +1021,7 @@ } $.ajax({ - url : LAMS_URL + 'monitoring/monitoring.do', + url : LAMS_URL + 'learning/learner.do', data : { 'method' : 'getLearnerProgress', 'lessonID' : lessonId, Index: lams_gradebook/conf/xdoclet/web-security.xml =================================================================== diff -u -rcd5cef591859ae82025af74f79cf6bf6f9151568 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_gradebook/conf/xdoclet/web-security.xml (.../web-security.xml) (revision cd5cef591859ae82025af74f79cf6bf6f9151568) +++ lams_gradebook/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -5,14 +5,24 @@ /* - AUTHOR ADMIN GROUP MANAGER GROUP ADMIN SYSADMIN LEARNER MONITOR + + + + Monitor content + /gradebookMonitoring.do + + + SYSADMIN + MONITOR + + @@ -24,23 +34,39 @@ - - - AUTHOR ADMIN + + + + Student + LEARNER - - GROUP MANAGER + + + Authors Learning Designs + AUTHOR - - GROUP ADMIN + + + Member of Staff + MONITOR + - SYSADMIN + Group Manager + GROUP MANAGER + - LEARNER + Group Administrator + GROUP ADMIN + - MONITOR + Author Administrator + AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + \ No newline at end of file Index: lams_learning/conf/xdoclet/web-security.xml =================================================================== diff -u -r7c1c0c0a6748b947c73cc3af1c833db5e66c722c -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_learning/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 7c1c0c0a6748b947c73cc3af1c833db5e66c722c) +++ lams_learning/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -3,14 +3,11 @@ Secure Content /* - /portfolioExport LEARNER MONITOR - AUTHOR SYSADMIN - AUTHOR ADMIN @@ -23,36 +20,39 @@ /login.jsp - + - Student LEARNER - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - + + Group Manager GROUP MANAGER - + + + Group Administrator GROUP ADMIN - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Author Administrator + AUTHOR ADMIN - + - AUTHOR ADMIN + LAMS System Adminstrator + SYSADMIN \ No newline at end of file Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== diff -u -r30e22ff69a8712e6cc583c334c3ea9133c1115f8 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 30e22ff69a8712e6cc583c334c3ea9133c1115f8) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -26,17 +26,22 @@ import java.io.IOException; import java.io.PrintWriter; +import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.apache.tomcat.util.json.JSONException; +import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.learning.service.LearnerServiceProxy; +import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learning.web.util.ActivityMapping; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.learningdesign.Activity; @@ -45,11 +50,15 @@ import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.dto.LessonDTO; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.wddx.FlashMessage; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; import org.lamsfoundation.lams.web.action.LamsDispatchAction; +import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -430,6 +439,51 @@ } /** + * Produces necessary data for learner progress bar. + */ + @SuppressWarnings("unchecked") + public ActionForward getLearnerProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws JSONException, IOException { + Integer learnerId = WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, true); + Integer monitorId = null; + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Integer userId = user != null ? user.getUserID() : null; + if (learnerId == null) { + // get progress for current user + learnerId = userId; + } else { + // monitor mode; get progress for user given in the parameter + monitorId = userId; + } + + Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); + ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext()); + Object[] ret = learnerService.getStructuredActivityURLs(learnerId, lessonId); + + JSONObject responseJSON = new JSONObject(); + responseJSON.put("currentActivityId", ret[1]); + responseJSON.put("isPreview", ret[2]); + for (ActivityURL activity : (List) ret[0]) { + if (activity.getFloating()) { + // these are support activities + for (ActivityURL childActivity : activity.getChildActivities()) { + responseJSON.append("support", + activityProgressToJSON(childActivity, null, lessonId, learnerId, monitorId)); + } + } else { + responseJSON.append("activities", + activityProgressToJSON(activity, (Long) ret[1], lessonId, learnerId, monitorId)); + } + } + + response.setContentType("application/json;charset=utf-8"); + response.getWriter().print(responseJSON.toString()); + + return null; + } + + /** * Gets the same url as getLearnerActivityURL() but forwards directly to the url, rather than returning the url in a * Flash packet. * @@ -642,4 +696,55 @@ return redirectToURL(mapping, response, url); } -} + /** + * Converts an activity in learner progress to a JSON object. + */ + private JSONObject activityProgressToJSON(ActivityURL activity, Long currentActivityId, Long lessonId, + Integer learnerId, Integer monitorId) throws JSONException, IOException { + JSONObject activityJSON = new JSONObject(); + activityJSON.put("id", activity.getActivityId()); + activityJSON.put("name", activity.getTitle()); + activityJSON.put("status", activity.getActivityId().equals(currentActivityId) ? 0 : activity.getStatus()); + + // URL in learner mode + String url = activity.getUrl(); + if ((url != null) && (monitorId != null)) { + // URL in monitor mode + url = Configuration.get(ConfigurationKeys.SERVER_URL) + + "monitoring/monitoring.do?method=getLearnerActivityURL&lessonID=" + lessonId + "&activityID=" + + activity.getActivityId() + "&userID=" + learnerId; + } + + if (url != null) { + if (url.startsWith("learner.do")) { + url = "learning/" + url; + } + String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); + if (!url.startsWith(serverUrl)) { + // monitor mode URLs should be prepended with server URL + url = serverUrl + url; + } + activityJSON.put("url", url); + } + + String actType = activity.getType().toLowerCase(); + String type = "a"; + if (actType.contains("gate")) { + type = "g"; + } else if (actType.contains("options")) { + type = "o"; + } else if (actType.contains("branching")) { + type = "b"; + } + activityJSON.put("type", type); + + if (activity.getChildActivities() != null) { + for (ActivityURL childActivity : activity.getChildActivities()) { + activityJSON.append("childActivities", + activityProgressToJSON(childActivity, currentActivityId, lessonId, learnerId, monitorId)); + } + } + + return activityJSON; + } +} \ No newline at end of file Index: lams_monitoring/conf/xdoclet/web-security.xml =================================================================== diff -u -r88a85482878c9d620565f1b52c5c4563f7347a4f -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_monitoring/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 88a85482878c9d620565f1b52c5c4563f7347a4f) +++ lams_monitoring/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,19 +1,18 @@ - + + Secure Content /* - LEARNER MONITOR - AUTHOR SYSADMIN - AUTHOR ADMIN + FORM LAMS @@ -22,36 +21,40 @@ /login.jsp - + - + Student LEARNER - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - + + Group Manager GROUP MANAGER - + + + Group Administrator GROUP ADMIN - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Author Administrator + AUTHOR ADMIN - + - AUTHOR ADMIN + LAMS System Adminstrator + SYSADMIN \ No newline at end of file Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -r6306eed9c0e9006f557fc25ef4744796abced95f -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 6306eed9c0e9006f557fc25ef4744796abced95f) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -55,8 +55,6 @@ import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.authoring.service.IAuthoringService; -import org.lamsfoundation.lams.learning.service.ICoreLearnerService; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.BranchingActivity; import org.lamsfoundation.lams.learningdesign.ChosenBranchingActivity; @@ -86,8 +84,6 @@ import org.lamsfoundation.lams.usermanagement.exception.UserException; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.CentralConstants; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; @@ -563,10 +559,10 @@ */ public ActionForward forceComplete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - getAuditService(); + getAuditService(); IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet() .getServletContext()); - + // get parameters Long activityId = null; String actId = request.getParameter(AttributeNames.PARAM_ACTIVITY_ID); @@ -591,12 +587,12 @@ LamsDispatchAction.log.debug("Force complete for learner " + learnerId + " lesson " + lessonId + ". " + message); } - - //audit log force completion attempt + + // audit log force completion attempt String messageKey = (activityId == null) ? "audit.force.complete.end.lesson" : "audit.force.complete"; - Object[] args = new Object[] {learnerId, activityId, lessonId}; + Object[] args = new Object[] { learnerId, activityId, lessonId }; String auditMessage = monitoringService.getMessageService().getMessage(messageKey, args); - auditService.log(MonitoringConstants.MONITORING_MODULE_NAME, auditMessage + " " + message); + MonitoringAction.auditService.log(MonitoringConstants.MONITORING_MODULE_NAME, auditMessage + " " + message); PrintWriter writer = response.getWriter(); writer.println(message); @@ -936,48 +932,6 @@ } /** - * Produces necessary data for learner progress bar. - */ - @SuppressWarnings("unchecked") - public ActionForward getLearnerProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws JSONException, IOException { - Integer learnerId = WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, true); - Integer monitorId = null; - if (learnerId == null) { - // get progress for current user - learnerId = getUserId(); - } else { - // monitor mode; get progress for user given in the parameter - monitorId = getUserId(); - } - - Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); - ICoreLearnerService learnerService = MonitoringServiceProxy.getLearnerService(getServlet().getServletContext()); - Object[] ret = learnerService.getStructuredActivityURLs(learnerId, lessonId); - - JSONObject responseJSON = new JSONObject(); - responseJSON.put("currentActivityId", ret[1]); - responseJSON.put("isPreview", ret[2]); - for (ActivityURL activity : (List) ret[0]) { - if (activity.getFloating()) { - // these are support activities - for (ActivityURL childActivity : activity.getChildActivities()) { - responseJSON.append("support", - activityProgressToJSON(childActivity, null, lessonId, learnerId, monitorId)); - } - } else { - responseJSON.append("activities", - activityProgressToJSON(activity, (Long) ret[1], lessonId, learnerId, monitorId)); - } - } - - response.setContentType("application/json;charset=utf-8"); - response.getWriter().print(responseJSON.toString()); - - return null; - } - - /** * Produces data to update Lesson tab in Monitor. */ public ActionForward getLessonDetails(ActionMapping mapping, ActionForm form, HttpServletRequest request, @@ -1059,8 +1013,8 @@ activityJSON.put("x", ((OptionsWithSequencesActivity) activity).getStartXcoord()); activityJSON.put("y", ((OptionsWithSequencesActivity) activity).getStartYcoord()); } else if ((parentActivity != null) - && (Activity.OPTIONS_ACTIVITY_TYPE == parentActivity.getActivityTypeId() || Activity.PARALLEL_ACTIVITY_TYPE == parentActivity - .getActivityTypeId())) { + && ((Activity.OPTIONS_ACTIVITY_TYPE == parentActivity.getActivityTypeId()) || (Activity.PARALLEL_ACTIVITY_TYPE == parentActivity + .getActivityTypeId()))) { // Optional Activity children had coordinates relative to parent activityJSON.put("x", parentActivity.getXcoord() + activity.getXcoord()); activityJSON.put("y", parentActivity.getYcoord() + activity.getYcoord()); @@ -1185,8 +1139,6 @@ flashMessage = new FlashMessage("startPreviewSession", new Long(lessonID)); - } else { - flashMessage = handleCriticalError("startPreviewSession", "error.system.error", monitoringService); } } catch (Exception e) { @@ -1332,60 +1284,6 @@ } /** - * Converts an activity in learner progress to a JSON object. - */ - private JSONObject activityProgressToJSON(ActivityURL activity, Long currentActivityId, Long lessonId, - Integer learnerId, Integer monitorId) throws JSONException, IOException { - JSONObject activityJSON = new JSONObject(); - activityJSON.put("id", activity.getActivityId()); - activityJSON.put("name", activity.getTitle()); - activityJSON.put("status", activity.getActivityId().equals(currentActivityId) ? 0 : activity.getStatus()); - - // URL in learner mode - String url = activity.getUrl(); - if ((url != null) && (monitorId != null)) { - IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet() - .getServletContext()); - // URL in monitor mode - url = Configuration.get(ConfigurationKeys.SERVER_URL) - + "monitoring/monitoring.do?method=getLearnerActivityURL&lessonID=" + lessonId + "&activityID=" - + activity.getActivityId() + "&userID=" + learnerId; - } - - if (url != null) { - if (url.startsWith("learner.do")) { - url = "learning/" + url; - } - String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); - if (!url.startsWith(serverUrl)) { - // monitor mode URLs should be prepended with server URL - url = serverUrl + url; - } - activityJSON.put("url", url); - } - - String actType = activity.getType().toLowerCase(); - String type = "a"; - if (actType.contains("gate")) { - type = "g"; - } else if (actType.contains("options")) { - type = "o"; - } else if (actType.contains("branching")) { - type = "b"; - } - activityJSON.put("type", type); - - if (activity.getChildActivities() != null) { - for (ActivityURL childActivity : activity.getChildActivities()) { - activityJSON.append("childActivities", - activityProgressToJSON(childActivity, currentActivityId, lessonId, learnerId, monitorId)); - } - } - - return activityJSON; - } - - /** * Creates a list of users out of string with comma-delimited user IDs. */ private List parseUserList(HttpServletRequest request, String paramName, Collection users) { @@ -1394,7 +1292,7 @@ String userIdList = request.getParameter(paramName); String[] userIdArray = userIdList.split(","); List result = new ArrayList(userIdArray.length); - + for (User user : users) { Integer userId = user.getUserId(); for (String includeId : userIdArray) { @@ -1404,7 +1302,7 @@ } } } - + return result; } Index: lams_tool_assessment/web/WEB-INF/web.xml =================================================================== diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c) +++ lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -246,124 +246,77 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /definelater.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_bbb/conf/xdoclet/web-security.xml =================================================================== diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_bbb/conf/xdoclet/web-security.xml (.../web-security.xml) (revision df5534fd49894e3369fc98f8273d9e2fefbb4817) +++ lams_tool_bbb/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -2,57 +2,49 @@ Secure Content - *.jsp - *.html - *.do + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /pages/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /pages/monitoring/* /monitoring.do MONITOR - TEACHER + SYSADMIN - - Download Files - /download/ + Admin content + /admin/* + /pages/admin/* - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN @@ -65,39 +57,39 @@ /login.jsp?failed=y - + - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + \ No newline at end of file Index: lams_tool_chat/conf/xdoclet/web-security.xml =================================================================== diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_chat/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0) +++ lams_tool_chat/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,103 +1,84 @@ - + - - Secure Content - *.jsp - *.html - *.do - - - LEARNER - TEACHER - MONITOR - AUTHOR - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - - - Authoring Update - /authoring.do - - - AUTHOR - AUTHOR ADMIN - SYSADMIN - - - - - - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - - + + Secure content + /* + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + + + + + Authoring content + /authoring/* + /pages/authoring/* + /authoring.do + /pedagogicalPlanner.do + + + AUTHOR + SYSADMIN + + + + + Staff content + /pages/monitoring/* + /monitoring.do + + + MONITOR + SYSADMIN + + + + Student LEARNER + - Student - TEACHER - - - - Can create/modify a learning design + Authors Learning Designs AUTHOR - + - Can running and monitoring a learning session + Member of Staff MONITOR - + - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + Index: lams_tool_daco/web/WEB-INF/web.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_daco/web/WEB-INF/web.xml (.../web.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_daco/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -228,124 +228,78 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /definelater.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - + - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_eadventure/web/WEB-INF/web.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_eadventure/web/WEB-INF/web.xml (.../web.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_eadventure/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -251,124 +251,78 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - + - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /definelater.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - - + Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_forum/conf/xdoclet/web-security.xml =================================================================== diff -u -ra5b82adb10c691247b223e474992aa71bca9fcad -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_forum/conf/xdoclet/web-security.xml (.../web-security.xml) (revision a5b82adb10c691247b223e474992aa71bca9fcad) +++ lams_tool_forum/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,125 +1,80 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /jsps/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content + Staff content + /monitoring/* + /jsps/monitoring/* /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content /definelater.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - AUTHOR ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - AUTHOR ADMIN - SYSADMIN - - - - + - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM @@ -129,3 +84,4 @@ /login.jsp?failed=y + \ No newline at end of file Index: lams_tool_gmap/conf/xdoclet/web-security.xml =================================================================== diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_gmap/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 3299d560146318cb6f26ec2b234e3af70ec21eba) +++ lams_tool_gmap/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -2,57 +2,48 @@ Secure Content - *.jsp - *.html - *.do + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /pages/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /pages/monitoring/* /monitoring.do MONITOR - TEACHER + SYSADMIN - - Download Files - /download/ + Admin content + /pages/admin/* + /lagmap10admin.do - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN @@ -65,39 +56,39 @@ /login.jsp?failed=y - - - + + Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + Index: lams_tool_images/web/WEB-INF/web.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_images/web/WEB-INF/web.xml (.../web.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_images/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -230,123 +230,88 @@ Secure Content - /* + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /definelater.do MONITOR - TEACHER + SYSADMIN - Adminstrator Content - /admin.do + Admin content + /pages/admin/* + /laimag10admin/* - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - - + Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_imscc/web/WEB-INF/web.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_imscc/web/WEB-INF/web.xml (.../web.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_imscc/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -240,123 +240,88 @@ Secure Content - /* + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /definelater.do MONITOR - TEACHER + SYSADMIN - Adminstrator Content - /admin.do + Admin content + /pages/admin/* + /laimsc11admin/* - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - - + Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_kaltura/conf/xdoclet/web-security.xml =================================================================== diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_kaltura/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b) +++ lams_tool_kaltura/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,103 +1,76 @@ - Secure Content - *.jsp - *.html - *.do + Secure content + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /pages/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /monitoring.do MONITOR - TEACHER - - - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN - - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - + - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + + \ No newline at end of file Index: lams_tool_lamc/web/WEB-INF/struts-config.xml =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -364,11 +364,7 @@ - - - - + Index: lams_tool_lamc/web/WEB-INF/web.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -277,118 +277,83 @@ - - + - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /authoring.do /authoringStarter.do + /pedagogicalPlanner.do AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content + Staff content + /monitoring/* /monitoring.do + /monitoringStarter.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - AUTHOR ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_laqa/web/WEB-INF/web.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -282,113 +282,80 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - Authoring Update + Authoring content + /authoring/* + /authoring.do /authoringStarter.do + /pedagogicalPlanner.do AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content + Staff content + /monitoring/* /monitoring.do + /monitoringStarter.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - AUTHOR ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_larsrc/web/WEB-INF/web.xml =================================================================== diff -u -r3a9ee15ed806fb8092cef103341aa784424f404a -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_larsrc/web/WEB-INF/web.xml (.../web.xml) (revision 3a9ee15ed806fb8092cef103341aa784424f404a) +++ lams_tool_larsrc/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -249,124 +249,78 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /definelater.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_leader/conf/xdoclet/web-security.xml =================================================================== diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_leader/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 17ddd3aac11d9fecc83159a9c829e989754accfb) +++ lams_tool_leader/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,103 +1,84 @@ - Secure Content - *.jsp - *.html - *.do + Secure content + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /pages/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /pages/monitoring/* /monitoring.do MONITOR - TEACHER - - - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + + \ No newline at end of file Index: lams_tool_mindmap/conf/xdoclet/web-security.xml =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_mindmap/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,106 +1,85 @@ - - - Secure Content - *.jsp - *.html - *.do - - + + + Secure content + /* + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + + + + + Authoring content + /authoring/* + /pages/authoring/* + /authoring.do + /pedagogicalPlanner.do + + + AUTHOR + SYSADMIN + + + + + + Staff content + /pages/monitoring/* + /monitoring.do + + + MONITOR + SYSADMIN + + + + + + Student LEARNER - TEACHER - MONITOR - AUTHOR - ADMIN - SYSADMIN - AUTHOR ADMIN - - + - - - Authoring Update - /authoring.do - - + + Authors Learning Designs AUTHOR - AUTHOR ADMIN - SYSADMIN - - + - - - Staff Content - /monitoring.do - - + + Member of Staff MONITOR - TEACHER - - + - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN + + Group Manager + GROUP MANAGER + + + + Group Administrator + GROUP ADMIN + + + + Author Administrator AUTHOR ADMIN - - + + + + LAMS System Adminstrator + SYSADMIN + - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - - - - Student - LEARNER - - - Student - TEACHER - - - - Can create/modify a learning design - AUTHOR - - - - Can running and monitoring a learning session - MONITOR - - - - Can add/remove users to the system, set up classes of - users for sessions - ADMIN - - - - Can add/remove users to the system, set up classes of - users for sessions - SYSADMIN - - - - Can create/modify a learning design and edit default - tool content - AUTHOR ADMIN - + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + \ No newline at end of file Index: lams_tool_nb/conf/xdoclet/web-security.xml =================================================================== diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_nb/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0) +++ lams_tool_nb/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,107 +1,84 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update - /authoringv2.do - /starter/authoring.do + Authoring content + /authoring/* /authoring.do - + /pedagogicalPlanner.do + AUTHOR - AUTHOR ADMIN SYSADMIN - - Staff Content - /starter/monitor.do - /monitoring.do + Staff content + /monitoring/* + /monitoring.do MONITOR - TEACHER - - - - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN - \ No newline at end of file + + + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + Index: lams_tool_notebook/conf/xdoclet/web-security.xml =================================================================== diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_notebook/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0) +++ lams_tool_notebook/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,103 +1,84 @@ - Secure Content - *.jsp - *.html - *.do + Secure content + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /pages/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /pages/monitoring/* /monitoring.do MONITOR - TEACHER - - - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + \ No newline at end of file Index: lams_tool_pixlr/conf/xdoclet/web-security.xml =================================================================== diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_pixlr/conf/xdoclet/web-security.xml (.../web-security.xml) (revision b703d43cf69269e0afcc716321fd5ef42c249a43) +++ lams_tool_pixlr/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,103 +1,84 @@ - Secure Content - *.jsp - *.html - *.do + Secure content + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /pages/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /pages/monitoring/* /monitoring.do MONITOR - TEACHER - - - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + \ No newline at end of file Index: lams_tool_sbmt/conf/xdoclet/web-security.xml =================================================================== diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_sbmt/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0) +++ lams_tool_sbmt/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,117 +1,79 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* /authoring.do + /pedagogicalPlanner.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /monitoring/* /monitoring.do + /definelater.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - - - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM @@ -120,4 +82,4 @@ /login.jsp /login.jsp?failed=y - + \ No newline at end of file Index: lams_tool_scratchie/web/WEB-INF/web.xml =================================================================== diff -u -raab18261022d7746e10b3651bd3c864356c58a8b -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_scratchie/web/WEB-INF/web.xml (.../web.xml) (revision aab18261022d7746e10b3651bd3c864356c58a8b) +++ lams_tool_scratchie/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -229,136 +229,101 @@ - + Secure Content - /* + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content + Staff content + /pages/monitoring/* /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content /definelater.do MONITOR - TEACHER + SYSADMIN - Adminstrator Content - /admin.do + Admin content + /admin/* + /pages/admin/* - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + + - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - + + LAMS System Adminstrator + SYSADMIN + 500 Index: lams_tool_scribe/conf/xdoclet/web-security.xml =================================================================== diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_scribe/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0) +++ lams_tool_scribe/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,103 +1,84 @@ - Secure Content - *.jsp - *.html - *.do + Secure content + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /pages/authoring/* /authoring.do + /pedagogicalPlanner.do AUTHOR SYSADMIN - AUTHOR ADMIN - Staff Content + Staff content + /pages/monitoring/* /monitoring.do MONITOR - TEACHER - - - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - + - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN - \ No newline at end of file + + + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + \ No newline at end of file Index: lams_tool_spreadsheet/web/WEB-INF/web.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_spreadsheet/web/WEB-INF/web.xml (.../web.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_spreadsheet/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -222,124 +222,78 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /definelater.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_survey/web/WEB-INF/web.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -227,123 +227,78 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /definelater.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_task/web/WEB-INF/web.xml =================================================================== diff -u -r9d26aaf34391eb58df037978365deda31de85c1b -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_task/web/WEB-INF/web.xml (.../web.xml) (revision 9d26aaf34391eb58df037978365deda31de85c1b) +++ lams_tool_task/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -227,124 +227,78 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content - /monitoring.do - - - MONITOR - TEACHER - - - - - Staff Content + Staff content + /monitoring/* + /pages/monitoring/* /definelater.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - LEARNER - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + FORM Index: lams_tool_videorecorder/conf/xdoclet/web-security.xml =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_videorecorder/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 3d081de4a45da632ee6029251318fac795d41813) +++ lams_tool_videorecorder/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,103 +1,84 @@ - Secure Content - *.jsp - *.html - *.do + Secure content + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /pages/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /pages/monitoring/* /monitoring.do MONITOR - TEACHER - - - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + \ No newline at end of file Index: lams_tool_vote/web/WEB-INF/web.xml =================================================================== diff -u -rded6335c9a04246994586bba62b43b577d2e6fb2 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision ded6335c9a04246994586bba62b43b577d2e6fb2) +++ lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -299,111 +299,88 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /authoring.do /authoringStarter.do + /pedagogicalPlanner.do AUTHOR - AUTHOR ADMIN SYSADMIN + - Staff Content + Staff content + /monitoring/* /monitoring.do + /monitoringStarter.do MONITOR - TEACHER - - - - - - Adminstrator Content - /admin.do - - - ADMIN - - - - - LAMS System Adminstrator Content - /sysadmin.do - - SYSADMIN - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN - SYSADMIN - AUTHOR ADMIN - - - - + - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + + Index: lams_tool_wiki/conf/xdoclet/web-security.xml =================================================================== diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_wiki/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 1082bdcc357c105126a5641cecc68acfa645b66b) +++ lams_tool_wiki/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -1,103 +1,84 @@ - Secure Content - *.jsp - *.html - *.do + Secure content + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /pages/authoring/* /authoring.do + /pedagogicalPlanner.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /pages/monitoring/* /monitoring.do MONITOR - TEACHER - - - - - - - Download Files - /download/ - - - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + \ No newline at end of file Index: lams_tool_wookie/conf/xdoclet/web-security.xml =================================================================== diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_tool_wookie/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 7c52d117dbe910bd67630b5506346429e25b99a9) +++ lams_tool_wookie/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -2,57 +2,49 @@ Secure Content - *.jsp - *.html - *.do + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /pages/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN SYSADMIN - Staff Content + Staff content + /pages/monitoring/* /monitoring.do MONITOR - TEACHER + SYSADMIN - - Download Files - /download/ + Admin content + /admin/* + /pages/admin/* - AUTHOR - MONITOR - TEACHER - ADMIN SYSADMIN - AUTHOR ADMIN @@ -65,39 +57,39 @@ /login.jsp?failed=y - + - Student LEARNER - - Student - TEACHER - - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - Can add/remove users to the system, set up classes of users for sessions - ADMIN + Group Manager + GROUP MANAGER - + - Can add/remove users to the system, set up classes of users for sessions - SYSADMIN + Group Administrator + GROUP ADMIN - Can create/modify a learning design and edit default tool content + Author Administrator AUTHOR ADMIN + + + LAMS System Adminstrator + SYSADMIN + \ No newline at end of file Index: lams_www/web/WEB-INF/web.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r74a09b6237dfef4cb2aab41ce8918c45a5cab34f --- lams_www/web/WEB-INF/web.xml (.../web.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_www/web/WEB-INF/web.xml (.../web.xml) (revision 74a09b6237dfef4cb2aab41ce8918c45a5cab34f) @@ -157,6 +157,7 @@ AUTHOR GROUP MANAGER GROUP ADMIN + AUTHOR ADMIN SYSADMIN @@ -170,33 +171,40 @@ /login.jsp?failed=y - - - + + Student LEARNER - Can create/modify a learning design + Authors Learning Designs AUTHOR - Can running and monitoring a learning session + Member of Staff MONITOR - + + Group Manager GROUP MANAGER - + + + Group Administrator GROUP ADMIN - + - Can add/remove users to the system, set up classes of users for sessions + Author Administrator + AUTHOR ADMIN + + + + LAMS System Adminstrator SYSADMIN