Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v diff -u -r1.100.2.1 -r1.100.2.2 --- lams_admin/conf/language/lams/ApplicationResources.properties 17 Aug 2014 11:40:49 -0000 1.100.2.1 +++ lams_admin/conf/language/lams/ApplicationResources.properties 30 Sep 2014 13:11:18 -0000 1.100.2.2 @@ -104,7 +104,6 @@ label.spreadsheet =spreadsheet label.download.template =Download the template role.AUTHOR =Author -role.AUTHOR.ADMIN =Author Admin role.GROUP.ADMIN =Course Admin role.GROUP.MANAGER =Course Manager role.LEARNER =Learner Index: lams_admin/conf/language/lams/ApplicationResources_cy_GB.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_cy_GB.properties,v diff -u -r1.1 -r1.1.18.1 --- lams_admin/conf/language/lams/ApplicationResources_cy_GB.properties 17 Feb 2007 12:02:18 -0000 1.1 +++ lams_admin/conf/language/lams/ApplicationResources_cy_GB.properties 30 Sep 2014 13:11:18 -0000 1.1.18.1 @@ -106,7 +106,6 @@ label.spreadsheet =taenlen label.download.template =Llwytho i lawr y templed role.AUTHOR =Awdur -role.AUTHOR.ADMIN =Gweinyddwr Awdur role.GROUP.ADMIN =Gweinyddwr Gr\u0175p role.GROUP.MANAGER =Rheolwr Gr\u0175p role.LEARNER =Dysgwr Index: lams_admin/conf/language/lams/ApplicationResources_da_DK.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_da_DK.properties,v diff -u -r1.4 -r1.4.12.1 --- lams_admin/conf/language/lams/ApplicationResources_da_DK.properties 28 Sep 2007 05:32:30 -0000 1.4 +++ lams_admin/conf/language/lams/ApplicationResources_da_DK.properties 30 Sep 2014 13:11:18 -0000 1.4.12.1 @@ -93,7 +93,6 @@ label.spreadsheet =regneark label.download.template =Download skabelon role.AUTHOR =Forfatter -role.AUTHOR.ADMIN =Forfatter admin role.GROUP.ADMIN =Gruppe admin role.GROUP.MANAGER =Gruppe manager role.LEARNER =Bruger Index: lams_admin/conf/language/lams/ApplicationResources_de_DE.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_de_DE.properties,v diff -u -r1.4 -r1.4.2.1 --- lams_admin/conf/language/lams/ApplicationResources_de_DE.properties 13 Apr 2012 15:22:30 -0000 1.4 +++ lams_admin/conf/language/lams/ApplicationResources_de_DE.properties 30 Sep 2014 13:11:18 -0000 1.4.2.1 @@ -104,7 +104,6 @@ label.spreadsheet =Tabelle label.download.template =Vorlage herunterladen role.AUTHOR =Autor/in -role.AUTHOR.ADMIN =Administration role.GROUP.ADMIN =Gruppenadministration role.GROUP.MANAGER =Gruppenmanager role.LEARNER =Teilnehmer/in Index: lams_admin/conf/language/lams/ApplicationResources_el_GR.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_el_GR.properties,v diff -u -r1.40 -r1.40.2.1 --- lams_admin/conf/language/lams/ApplicationResources_el_GR.properties 3 Jul 2014 19:37:11 -0000 1.40 +++ lams_admin/conf/language/lams/ApplicationResources_el_GR.properties 30 Sep 2014 13:11:18 -0000 1.40.2.1 @@ -104,7 +104,6 @@ label.spreadsheet =\u03c5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03c4\u03b9\u03ba\u03cc \u03c6\u03cd\u03bb\u03bb\u03bf label.download.template =\u039b\u03ae\u03c8\u03b7 \u03c0\u03c1\u03bf\u03c4\u03cd\u03c0\u03bf\u03c5 role.AUTHOR =\u03a3\u03c5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ad\u03b1\u03c2 -role.AUTHOR.ADMIN =\u0394\u03b9\u03b1\u03c7\u03b5\u03b9\u03c1\u03b9\u03c3\u03c4\u03ae\u03c2 \u03a3\u03c5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ad\u03c9\u03bd role.GROUP.ADMIN =\u0392\u03bf\u03b7\u03b8\u03cc\u03c2 \u0394\u03b9\u03b1\u03c7. \u039f\u03bc\u03ac\u03b4\u03b1\u03c2 role.GROUP.MANAGER =\u0394\u03b9\u03b1\u03c7\u03b5\u03b9\u03c1\u03b9\u03c3\u03c4\u03ae\u03c2 \u039f\u03bc\u03ac\u03b4\u03b1\u03c2 role.LEARNER =\u0395\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03c2 Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.92 -r1.92.2.1 --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 3 Jul 2014 19:39:51 -0000 1.92 +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 30 Sep 2014 13:11:18 -0000 1.92.2.1 @@ -104,7 +104,6 @@ label.spreadsheet =spreadsheet label.download.template =Download the template role.AUTHOR =Author -role.AUTHOR.ADMIN =Author Admin role.GROUP.ADMIN =Course Admin role.GROUP.MANAGER =Course Manager role.LEARNER =Learner Index: lams_admin/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_es_ES.properties,v diff -u -r1.35 -r1.35.2.1 --- lams_admin/conf/language/lams/ApplicationResources_es_ES.properties 3 Jul 2014 19:39:51 -0000 1.35 +++ lams_admin/conf/language/lams/ApplicationResources_es_ES.properties 30 Sep 2014 13:11:18 -0000 1.35.2.1 @@ -104,7 +104,6 @@ label.spreadsheet =Hoja de C\u00e1lculo label.download.template =Descargar Plantilla role.AUTHOR =Autor -role.AUTHOR.ADMIN =Administrador Autor role.GROUP.ADMIN =Administrador de la Clase role.GROUP.MANAGER =Manager de la Clase role.LEARNER =Estudiante Index: lams_admin/conf/language/lams/ApplicationResources_es_MX.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_es_MX.properties,v diff -u -r1.4 -r1.4.2.1 --- lams_admin/conf/language/lams/ApplicationResources_es_MX.properties 13 Apr 2012 15:22:30 -0000 1.4 +++ lams_admin/conf/language/lams/ApplicationResources_es_MX.properties 30 Sep 2014 13:11:18 -0000 1.4.2.1 @@ -104,7 +104,6 @@ label.spreadsheet =Hoja de C\u00e1lculo label.download.template =Descargar Plantilla role.AUTHOR =Autor -role.AUTHOR.ADMIN =Administrador Autor role.GROUP.ADMIN =Administrador de la Clase role.GROUP.MANAGER =Administrador de grupo role.LEARNER =Estudiante Index: lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties,v diff -u -r1.16 -r1.16.2.1 --- lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties 6 Apr 2014 16:35:06 -0000 1.16 +++ lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties 30 Sep 2014 13:11:18 -0000 1.16.2.1 @@ -104,7 +104,6 @@ label.spreadsheet =tableur label.download.template =T\u00e9l\u00e9charger le mod\u00e8le role.AUTHOR =Auteur -role.AUTHOR.ADMIN =Admin auteur role.GROUP.ADMIN =Admin du groupe role.GROUP.MANAGER =Gestionnaire du groupe role.LEARNER =Apprenant Index: lams_admin/conf/language/lams/ApplicationResources_it_IT.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_it_IT.properties,v diff -u -r1.6 -r1.6.12.1 --- lams_admin/conf/language/lams/ApplicationResources_it_IT.properties 1 Dec 2008 05:21:54 -0000 1.6 +++ lams_admin/conf/language/lams/ApplicationResources_it_IT.properties 30 Sep 2014 13:11:18 -0000 1.6.12.1 @@ -116,7 +116,6 @@ error.roles.invalid =Uno o pi\u00f9 ruoli non validi. {0} label.download.template =Scarica il modello admin.user.evening_phone =Telefono per comunicazioni pomeridiane -role.AUTHOR.ADMIN =Autore Admin admin.can.browse.user =Il gruppo degli Amministratori possono vedere tutti gli utenti nel sistema sysadmin.organisation.create =Creare una nuova cache.explanation2 =La rimozione dei nodi ridurr\u00e0 le prestazioni del server di LAMS. Dopo un istante, la cache si rienpir\u00e0 ancora ed i LAMS funzioneranno come di consueto Index: lams_admin/conf/language/lams/ApplicationResources_ja_JP.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_ja_JP.properties,v diff -u -r1.10 -r1.10.2.1 --- lams_admin/conf/language/lams/ApplicationResources_ja_JP.properties 11 Aug 2009 05:07:23 -0000 1.10 +++ lams_admin/conf/language/lams/ApplicationResources_ja_JP.properties 30 Sep 2014 13:11:18 -0000 1.10.2.1 @@ -209,7 +209,6 @@ admin.list.disabled.users =\u7121\u52b9\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u30ea\u30b9\u30c8 label.spreadsheet =\u30b9\u30d7\u30ec\u30c3\u30c9\u30b7\u30fc\u30c8 label.download.template =\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9 -role.AUTHOR.ADMIN =\u6559\u6750\u7ba1\u7406\u8005 role.GROUP.ADMIN =\u30b0\u30eb\u30fc\u30d7\u7ba1\u7406\u8005 role.GROUP.MANAGER =\u30b0\u30eb\u30fc\u30d7\u30de\u30cd\u30fc\u30b8\u30e3 role.LEARNER =\u5b66\u7fd2\u8005 Index: lams_admin/conf/language/lams/ApplicationResources_ko_KR.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_ko_KR.properties,v diff -u -r1.5 -r1.5.12.1 --- lams_admin/conf/language/lams/ApplicationResources_ko_KR.properties 28 Sep 2008 23:56:00 -0000 1.5 +++ lams_admin/conf/language/lams/ApplicationResources_ko_KR.properties 30 Sep 2014 13:11:18 -0000 1.5.12.1 @@ -88,7 +88,6 @@ label.spreadsheet =\uc2a4\ud504\ub808\ub4dc\uc2dc\ud2b8 label.download.template =\ud15c\ud50c\ub9bf \ub2e4\uc6b4\ub85c\ub4dc role.AUTHOR =\uc791\uc131\uc790 -role.AUTHOR.ADMIN =\uc791\uc131\uc790 \uad00\ub9ac role.GROUP.ADMIN =\uadf8\ub8f9 \ucd1d\uad00\ub9ac\uc790 role.GROUP.MANAGER =\uadf8\ub8f9 \uad00\ub9ac\uc790 role.LEARNER =\ud559\uc2b5\uc790 Index: lams_admin/conf/language/lams/ApplicationResources_mi_NZ.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_mi_NZ.properties,v diff -u -r1.3 -r1.3.12.1 --- lams_admin/conf/language/lams/ApplicationResources_mi_NZ.properties 1 Nov 2007 07:37:30 -0000 1.3 +++ lams_admin/conf/language/lams/ApplicationResources_mi_NZ.properties 30 Sep 2014 13:11:18 -0000 1.3.12.1 @@ -8,7 +8,6 @@ sysadmin.disabled =Kua Monokia label.spreadsheet =ripanga -role.AUTHOR.ADMIN =Kaiwhakahaere Kaituhi role.GROUP.ADMIN =Kaiwhakahaere R\u014dp\u016b role.LEARNER =\u0100konga role.MONITOR =Aroturuki Index: lams_admin/conf/language/lams/ApplicationResources_nl_BE.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_nl_BE.properties,v diff -u -r1.1 -r1.1.12.1 --- lams_admin/conf/language/lams/ApplicationResources_nl_BE.properties 11 Dec 2007 20:25:52 -0000 1.1 +++ lams_admin/conf/language/lams/ApplicationResources_nl_BE.properties 30 Sep 2014 13:11:18 -0000 1.1.12.1 @@ -141,7 +141,6 @@ label.spreadsheet =Spreadsheet label.download.template =Template downloaden role.AUTHOR =Auteur -role.AUTHOR.ADMIN =Auteur systeembeheerder role.GROUP.ADMIN =Groep systeembeheerder role.GROUP.MANAGER =Groepmanager role.LEARNER =Student Index: lams_admin/conf/language/lams/ApplicationResources_no_NO.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_no_NO.properties,v diff -u -r1.43 -r1.43.2.1 --- lams_admin/conf/language/lams/ApplicationResources_no_NO.properties 3 Jul 2014 19:37:11 -0000 1.43 +++ lams_admin/conf/language/lams/ApplicationResources_no_NO.properties 30 Sep 2014 13:11:18 -0000 1.43.2.1 @@ -104,7 +104,6 @@ label.spreadsheet =regneark label.download.template =Last ned mal role.AUTHOR =Forfatter -role.AUTHOR.ADMIN =Forfatter administarsjon role.GROUP.ADMIN =Gruppe administrasjon role.GROUP.MANAGER =Gruppe leder role.LEARNER =Student Index: lams_admin/conf/language/lams/ApplicationResources_pl_PL.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_pl_PL.properties,v diff -u -r1.8 -r1.8.12.1 --- lams_admin/conf/language/lams/ApplicationResources_pl_PL.properties 11 Apr 2008 01:10:04 -0000 1.8 +++ lams_admin/conf/language/lams/ApplicationResources_pl_PL.properties 30 Sep 2014 13:11:18 -0000 1.8.12.1 @@ -34,7 +34,6 @@ msg.import.2 =If you specify an organisation id to import a user into, you must specify at least one role to apply to that group or subgroup msg.import.conclusion =Aby uzyska\u0107 wi\u0119cej informacji kliknij ikon\u0119 pomocy role.AUTHOR =Autor -role.AUTHOR.ADMIN =Administrator autor\u00f3w role.GROUP.ADMIN =Administrator grup role.GROUP.MANAGER =Kierownik grupy role.LEARNER =Student Index: lams_admin/conf/language/lams/ApplicationResources_pt_BR.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_pt_BR.properties,v diff -u -r1.4 -r1.4.2.1 --- lams_admin/conf/language/lams/ApplicationResources_pt_BR.properties 16 Apr 2014 17:56:53 -0000 1.4 +++ lams_admin/conf/language/lams/ApplicationResources_pt_BR.properties 30 Sep 2014 13:11:18 -0000 1.4.2.1 @@ -104,7 +104,6 @@ label.spreadsheet =planilha label.download.template =Baixar modelo role.AUTHOR =Autor -role.AUTHOR.ADMIN =Administrador de autoria role.GROUP.ADMIN =Administrar Grupo role.GROUP.MANAGER =Gerenciar Grupo role.LEARNER =Estudante Index: lams_admin/conf/language/lams/ApplicationResources_sv_SE.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_sv_SE.properties,v diff -u -r1.1 -r1.1.18.1 --- lams_admin/conf/language/lams/ApplicationResources_sv_SE.properties 17 Feb 2007 12:02:18 -0000 1.1 +++ lams_admin/conf/language/lams/ApplicationResources_sv_SE.properties 30 Sep 2014 13:11:18 -0000 1.1.18.1 @@ -106,7 +106,6 @@ label.spreadsheet =kalkylblad label.download.template =Ladda ner mallen role.AUTHOR =F\u00f6rfattare -role.AUTHOR.ADMIN =Admin f\u00f6rfattare role.GROUP.ADMIN =Admin grupp role.GROUP.MANAGER =Administrat\u00f6r av grupp role.LEARNER =L\u00e4rande Index: lams_admin/conf/language/lams/ApplicationResources_tr_TR.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_tr_TR.properties,v diff -u -r1.3 -r1.3.10.1 --- lams_admin/conf/language/lams/ApplicationResources_tr_TR.properties 26 Jan 2009 22:42:39 -0000 1.3 +++ lams_admin/conf/language/lams/ApplicationResources_tr_TR.properties 30 Sep 2014 13:11:18 -0000 1.3.10.1 @@ -362,7 +362,6 @@ msg.ldap.synchronise.warning =Bu s\u00fcre\u00e7 LDAP a\u011fac\u0131n\u0131zdaki kullan\u0131c\u0131 say\u0131s\u0131na g\u00f6re zaman al\u0131r. Bu i\u015flemi LAMS sunucunuz y\u00fckleme alt\u0131nda de\u011filke yapman\u0131z daha uygun olur. config.authoring.activities.colour =Yazarl\u0131k Etkinlikleri Rengi role.AUTHOR =Tasar\u0131mc\u0131 -role.AUTHOR.ADMIN =Tasar\u0131m y\u00f6neticisi error.authorisation =Bunu yapmaya yetkiniz yok msg.edit.tool.content.2 =Bu ekran kullan\u0131larak de\u011fi\u015ftirilen ara\u00e7 i\u00e7eri\u011fi varsay\u0131lan de\u011ferleri de de\u011fi\u015ftirece\u011finden t\u00fcm tasar\u0131mc\u0131lar\u0131 etkileycektir. config.authoring.screen.size =Tasar\u0131m ekran b\u00fcy\u00fckl\u00fc\u011f\u00fc Index: lams_admin/conf/language/lams/ApplicationResources_vi_VN.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_vi_VN.properties,v diff -u -r1.1 -r1.1.18.1 --- lams_admin/conf/language/lams/ApplicationResources_vi_VN.properties 17 Feb 2007 12:02:18 -0000 1.1 +++ lams_admin/conf/language/lams/ApplicationResources_vi_VN.properties 30 Sep 2014 13:11:18 -0000 1.1.18.1 @@ -106,7 +106,6 @@ label.spreadsheet =B\u1ea3ng c\u00f4ng vi\u1ec7c label.download.template =T\u1ea3i xu\u1ed1ng khu\u00f4n m\u1eabu role.AUTHOR =Gi\u1ea3ng vi\u00ean -role.AUTHOR.ADMIN =Qu\u1ea3n tr\u1ecb b\u00e0i gi\u1ea3ng \u0111i\u1ec7n t\u1eed role.GROUP.ADMIN =Qu\u1ea3n tr\u1ecb nh\u00f3m role.GROUP.MANAGER =Qu\u1ea3n l\u00fd nh\u00f3m role.LEARNER =H\u1ecdc vi\u00ean Index: lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties,v diff -u -r1.3 -r1.3.12.1 --- lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties 8 Feb 2008 03:27:30 -0000 1.3 +++ lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties 30 Sep 2014 13:11:18 -0000 1.3.12.1 @@ -104,7 +104,6 @@ label.spreadsheet =\u7535\u5b50\u8868\u683c label.download.template =\u4e0b\u8f7d\u7535\u5b50\u8868\u683c role.AUTHOR =\u8bfe\u7a0b\u521b\u5efa\u8005 -role.AUTHOR.ADMIN =\u8bfe\u7a0b\u8bbe\u8ba1\u7ba1\u7406\u5458 role.GROUP.ADMIN =\u7ec4\u7ba1\u7406\u5458 role.GROUP.MANAGER =\u7ec4\u7ba1\u7406\u8005 role.LEARNER =\u5b66\u4e60\u8005 Index: lams_admin/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/web-security.xml,v diff -u -r1.7 -r1.7.18.1 --- lams_admin/conf/xdoclet/web-security.xml 29 Nov 2006 05:46:16 -0000 1.7 +++ lams_admin/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:18 -0000 1.7.18.1 @@ -5,7 +5,6 @@ /* - AUTHOR ADMIN GROUP MANAGER GROUP ADMIN SYSADMIN @@ -22,17 +21,33 @@ - - - AUTHOR ADMIN + + + Student + LEARNER - + + + Authors Learning Designs + AUTHOR + + + + Member of Staff + MONITOR + + + + Group Manager GROUP MANAGER - + + + Group Administrator GROUP ADMIN + + LAMS System Adminstrator SYSADMIN - - \ No newline at end of file + \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java,v diff -u -r1.11 -r1.11.2.1 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java 24 Nov 2012 23:48:36 -0000 1.11 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java 30 Sep 2014 13:11:18 -0000 1.11.2.1 @@ -125,7 +125,6 @@ registerDTO.setMonitorNumber(userManagementService.getCountRoleForSystem(Role.ROLE_MONITOR)); registerDTO.setManagerNumber(userManagementService.getCountRoleForSystem(Role.ROLE_GROUP_MANAGER)); registerDTO.setLearnerNumber(userManagementService.getCountRoleForSystem(Role.ROLE_LEARNER)); - registerDTO.setAuthorAdminNumber(userManagementService.getCountRoleForSystem(Role.ROLE_AUTHOR_ADMIN)); registerDTO.setUserNumber(Integer.valueOf(userManagementService.findAll(User.class).size())); registerDTO.setServerUrl(Configuration.get(ConfigurationKeys.SERVER_URL)); registerDTO.setServerVersion(Configuration.get(ConfigurationKeys.VERSION)); @@ -224,7 +223,6 @@ params.put("authorno", userManagementService.getCountRoleForSystem(Role.ROLE_AUTHOR).toString()); params.put("monitorno", userManagementService.getCountRoleForSystem(Role.ROLE_MONITOR).toString()); params.put("learnerno", userManagementService.getCountRoleForSystem(Role.ROLE_LEARNER).toString()); - params.put("authoradminno", userManagementService.getCountRoleForSystem(Role.ROLE_AUTHOR_ADMIN).toString()); params.put("userno", Integer.valueOf(userManagementService.findAll(User.class).size()).toString()); // make the request to lamscommunity.org Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java,v diff -u -r1.7 -r1.7.2.1 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java 16 Jul 2014 20:17:15 -0000 1.7 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java 30 Sep 2014 13:11:18 -0000 1.7.2.1 @@ -102,7 +102,7 @@ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { // check permission - if (!(request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.AUTHOR_ADMIN))) { + if (!(request.isUserInRole(Role.SYSADMIN))) { request.setAttribute(ToolContentListAction.ATTRIBUTE_ERROR_NAME, "ToolContentListAction"); request.setAttribute( ToolContentListAction.ATTRIBUTE_ERROR_MESSAGE, Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java,v diff -u -r1.21 -r1.21.12.1 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java 29 Feb 2008 06:11:51 -0000 1.21 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java 30 Sep 2014 13:11:18 -0000 1.21.12.1 @@ -140,7 +140,6 @@ HashMap roleCount = new HashMap(); if (orgId.equals(rootOrgId)) { roleCount.put(Role.SYSADMIN, Role.ROLE_SYSADMIN); - roleCount.put(Role.AUTHOR_ADMIN, Role.ROLE_AUTHOR_ADMIN); roleCount.put(Role.GROUP_ADMIN, Role.ROLE_GROUP_ADMIN); } else { roleCount.put(Role.LEARNER, Role.ROLE_LEARNER); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java,v diff -u -r1.17.2.1 -r1.17.2.2 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java 17 Aug 2014 11:40:49 -0000 1.17.2.1 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java 30 Sep 2014 13:11:18 -0000 1.17.2.2 @@ -77,9 +77,6 @@ if (openIDEnabled != null && Boolean.parseBoolean(openIDEnabled.getConfigValue()) == Boolean.TRUE) { links.add(new LinkBean("openIDConfig.do", "admin.openid.title")); } - } else if (request.isUserInRole(Role.AUTHOR_ADMIN)) { - LinkBean linkBean = new LinkBean("toolcontentlist.do", "sysadmin.tool.management"); - links.add(linkBean); } else if (service.isUserGlobalGroupAdmin()) { LinkBean linkBean = new LinkBean("usersearch.do", "admin.user.find"); links.add(linkBean); Index: lams_admin/web/register.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/register.jsp,v diff -u -r1.14.2.1 -r1.14.2.2 --- lams_admin/web/register.jsp 2 Sep 2014 21:49:13 -0000 1.14.2.1 +++ lams_admin/web/register.jsp 30 Sep 2014 13:11:18 -0000 1.14.2.2 @@ -458,14 +458,6 @@ - - - - ${registerDTO.authorAdminNumber} - - - - Index: lams_admin/web/userlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/userlist.jsp,v diff -u -r1.33 -r1.33.2.1 --- lams_admin/web/userlist.jsp 29 Sep 2012 13:58:15 -0000 1.33 +++ lams_admin/web/userlist.jsp 30 Sep 2014 13:11:18 -0000 1.33.2.1 @@ -81,10 +81,6 @@ : - - : - - Index: lams_central/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/web-security.xml,v diff -u -r1.22 -r1.22.2.1 --- lams_central/conf/xdoclet/web-security.xml 2 Aug 2012 14:07:49 -0000 1.22 +++ lams_central/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:24 -0000 1.22.2.1 @@ -1,50 +1,9 @@ + - 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 @@ -53,56 +12,77 @@ GROUP MANAGER GROUP ADMIN SYSADMIN - AUTHOR ADMIN - + - Authoring Update - /authoring.do + Public content + /css/* + /errorpages/* + /images/* + /includes/javascript/* + /signup/* + /favicon.ico + + + + + Authoring content + /authoring/* + /author.jsp + /authoringConfirm.jsp + /lams_authoring_library.swf + /lams_authoring.swf + /lams_preloader.swf + AUTHOR - AUTHOR ADMIN + + MONITOR + 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,34 @@ /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 + LAMS System Adminstrator SYSADMIN - - - - AUTHOR ADMIN - + \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java,v diff -u -r1.29.2.1 -r1.29.2.2 --- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java 19 Sep 2014 10:55:13 -0000 1.29.2.1 +++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java 30 Sep 2014 13:11:24 -0000 1.29.2.2 @@ -75,319 +75,339 @@ public class UniversalLoginModule extends UsernamePasswordLoginModule { - private static Logger log = Logger.getLogger(UniversalLoginModule.class); + private static Logger log = Logger.getLogger(UniversalLoginModule.class); - public UniversalLoginModule() { - } + public UniversalLoginModule() { + } - protected String dsJndiName; + protected String dsJndiName; - protected String rolesQuery; + protected String rolesQuery; - protected String principalsQuery; + protected String principalsQuery; - private IThemeService themeService; - private UserManagementService service; + private IThemeService themeService; + private UserManagementService service; - @Override - public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) { - super.initialize(subject, callbackHandler, sharedState, options); - dsJndiName = (String) options.get("dsJndiName"); - principalsQuery = (String) options.get("principalsQuery"); - rolesQuery = (String) options.get("rolesQuery"); - } + public void initialize(Subject subject, CallbackHandler callbackHandler, + Map sharedState, Map options) { + super.initialize(subject, callbackHandler, sharedState, options); + dsJndiName = (String) options.get("dsJndiName"); + principalsQuery = (String) options.get("principalsQuery"); + rolesQuery = (String) options.get("rolesQuery"); + } - @Override - protected boolean validatePassword(String inputPassword, String expectedPassword) { - boolean isValid = false; - if (inputPassword != null) { - // empty password not allowed - if (inputPassword.length() == 0) { - return false; - } + protected boolean validatePassword(String inputPassword, + String expectedPassword) { + boolean isValid = false; + if (inputPassword != null) { + // empty password not allowed + if (inputPassword.length() == 0) + return false; - try { - String username = getUsername(); - UniversalLoginModule.log.debug("===> authenticating user: " + username); + try { + String username = getUsername(); + log.debug("===> authenticating user: " + username); - WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(HttpSessionManager - .getInstance().getServletContext()); + WebApplicationContext ctx = WebApplicationContextUtils + .getWebApplicationContext(HttpSessionManager + .getInstance().getServletContext()); - if (service == null) { - service = (UserManagementService) ctx.getBean("userManagementService"); - } - User user = service.getUserByLogin(username); + if (service == null) { + service = (UserManagementService) ctx + .getBean("userManagementService"); + } + User user = service.getUserByLogin(username); - if (themeService == null) { - themeService = (IThemeService) ctx.getBean("themeService"); - } + if (themeService == null) { + themeService = (IThemeService) ctx.getBean("themeService"); + } - // LDAP user provisioning - if (user == null) { - // provision a new user by checking ldap server - if (Configuration.getAsBoolean(ConfigurationKeys.LDAP_PROVISIONING_ENABLED)) { - LdapService ldapService; - try { - ldapService = (LdapService) ctx.getBean("ldapService"); - } catch (NoSuchBeanDefinitionException e) { - // LDEV-1937 - UniversalLoginModule.log - .error("NoSuchBeanDefinitionException while getting ldapService bean, will try another method...", - e); - ApplicationContext context = new ClassPathXmlApplicationContext( - "org/lamsfoundation/lams/usermanagement/ldapContext.xml"); - ldapService = (LdapService) context.getBean("ldapService"); - } - UniversalLoginModule.log - .debug("===> LDAP provisioning is enabled, checking username against LDAP server..."); - LDAPAuthenticator ldap = new LDAPAuthenticator(); - isValid = ldap.authenticate(username, inputPassword); - if (isValid) { // create a new user - UniversalLoginModule.log.info("===> Creating new user for LDAP username: " + username); - if (ldapService.createLDAPUser(ldap.getAttrs())) { - user = service.getUserByLogin(username); - if (!ldapService.addLDAPUser(ldap.getAttrs(), user.getUserId())) { - UniversalLoginModule.log.error("===> Couldn't add LDAP user: " + username - + " to organisation."); + // LDAP user provisioning + if (user == null) { + // provision a new user by checking ldap server + if (Configuration + .getAsBoolean(ConfigurationKeys.LDAP_PROVISIONING_ENABLED)) { + LdapService ldapService; + try { + ldapService = (LdapService) ctx + .getBean("ldapService"); + } catch (NoSuchBeanDefinitionException e) { + // LDEV-1937 + log + .error( + "NoSuchBeanDefinitionException while getting ldapService bean, will try another method...", + e); + ApplicationContext context = new ClassPathXmlApplicationContext( + "org/lamsfoundation/lams/usermanagement/ldapContext.xml"); + ldapService = (LdapService) context + .getBean("ldapService"); + } + log + .debug("===> LDAP provisioning is enabled, checking username against LDAP server..."); + LDAPAuthenticator ldap = new LDAPAuthenticator(); + isValid = ldap.authenticate(username, inputPassword); + if (isValid) { // create a new user + log + .info("===> Creating new user for LDAP username: " + + username); + if (ldapService.createLDAPUser(ldap.getAttrs())) { + user = service.getUserByLogin(username); + if (!ldapService.addLDAPUser(ldap.getAttrs(), + user.getUserId())) { + log.error("===> Couldn't add LDAP user: " + + username + " to organisation."); + } + } else { + log + .error("===> Couldn't create new user for LDAP username: " + + username); + return false; + } + } else { // didn't authenticate successfully with + // ldap + return false; + } + } else { + return false; + } } - } else { - UniversalLoginModule.log.error("===> Couldn't create new user for LDAP username: " - + username); - return false; - } - } else { // didn't authenticate successfully with - // ldap - return false; - } - } else { - return false; - } - } - // allow sysadmin to login as another user; in this case, the - // LAMS shared session - // will be present, allowing the following check to work -// if (service.isUserSysAdmin()) { -// isValid = true; -// } + // allow sysadmin to login as another user; in this case, the + // LAMS shared session + // will be present, allowing the following check to work + if (service.isUserSysAdmin()) { + isValid = true; + } - // perform password checking according to user's authentication - // method - if (!isValid) { - String type = user.getAuthenticationMethod().getAuthenticationMethodType().getDescription(); - UniversalLoginModule.log.debug("===> authentication type: " + type); - if (AuthenticationMethodType.LDAP.equals(type)) { - LDAPAuthenticator authenticator = new LDAPAuthenticator(); - isValid = authenticator.authenticate(username, inputPassword); - // if ldap user profile has updated, udpate user object - // for dto below - user = service.getUserByLogin(username); - } else if (AuthenticationMethodType.LAMS.equals(type)) { - DatabaseAuthenticator authenticator = new DatabaseAuthenticator(dsJndiName, principalsQuery); - // if the password is not encrypted when sent from the - // jsp (e.g. when it is passed - // unencrypted to say, ldap) then encrypt it here when - // authenticating against local db - if (!Configuration.getAsBoolean(ConfigurationKeys.LDAP_ENCRYPT_PASSWORD_FROM_BROWSER)) { - // try the passed in password first, - // LoginRequestServlet always passes in encrypted - // passwords - isValid = authenticator.authenticate(username, inputPassword); - if (!isValid) { - inputPassword = HashUtil.sha1(inputPassword); - } - isValid = authenticator.authenticate(username, inputPassword); - } else { - isValid = authenticator.authenticate(username, inputPassword); - } - } else if (AuthenticationMethodType.WEB_AUTH.equals(type)) { - WebAuthAuthenticator authenticator = new WebAuthAuthenticator(); - isValid = authenticator.authenticate(username, inputPassword); - } else { - UniversalLoginModule.log.error("===> Unexpected authentication type: " + type); - return false; - } - } + // perform password checking according to user's authentication + // method + if (!isValid) { + String type = user.getAuthenticationMethod() + .getAuthenticationMethodType().getDescription(); + log.debug("===> authentication type: " + type); + if (AuthenticationMethodType.LDAP.equals(type)) { + LDAPAuthenticator authenticator = new LDAPAuthenticator(); + isValid = authenticator.authenticate(username, + inputPassword); + // if ldap user profile has updated, udpate user object + // for dto below + user = service.getUserByLogin(username); + } else if (AuthenticationMethodType.LAMS.equals(type)) { + DatabaseAuthenticator authenticator = new DatabaseAuthenticator( + dsJndiName, principalsQuery); + // if the password is not encrypted when sent from the + // jsp (e.g. when it is passed + // unencrypted to say, ldap) then encrypt it here when + // authenticating against local db + if (!Configuration + .getAsBoolean(ConfigurationKeys.LDAP_ENCRYPT_PASSWORD_FROM_BROWSER)) { + // try the passed in password first, + // LoginRequestServlet always passes in encrypted + // passwords + isValid = authenticator.authenticate(username, + inputPassword); + if (!isValid) { + inputPassword = HashUtil.sha1(inputPassword); + } + isValid = authenticator.authenticate(username, + inputPassword); + } else { + isValid = authenticator.authenticate(username, + inputPassword); + } + } else if (AuthenticationMethodType.WEB_AUTH.equals(type)) { + WebAuthAuthenticator authenticator = new WebAuthAuthenticator(); + isValid = authenticator.authenticate(username, + inputPassword); + } else { + log.error("===> Unexpected authentication type: " + + type); + return false; + } + } - // disabled users can't login; - // check after authentication to give non-db authentication - // methods - // a chance to update disabled flag - if (user.getDisabledFlag()) { - UniversalLoginModule.log.debug("===> user is disabled."); - return false; - } + // disabled users can't login; + // check after authentication to give non-db authentication + // methods + // a chance to update disabled flag + if (user.getDisabledFlag()) { + log.debug("===> user is disabled."); + return false; + } - // if login is valid, register userDTO into session. - if (isValid) { - UserDTO userDTO = user.getUserDTO(); + // if login is valid, register userDTO into session. + if (isValid) { + UserDTO userDTO = user.getUserDTO(); - // If the user's css theme has been deleted, use the default - // as fallback - CSSThemeBriefDTO userCSSTheme = userDTO.getHtmlTheme(); - if (userCSSTheme != null) { - boolean themeExists = false; - for (Theme theme : themeService.getAllCSSThemes()) { - if (userCSSTheme.getId().equals(theme.getThemeId())) { - themeExists = true; - break; - } - } + // If the user's css theme has been deleted, use the default + // as fallback + CSSThemeBriefDTO userCSSTheme = userDTO.getHtmlTheme(); + if (userCSSTheme != null) { + boolean themeExists = false; + for (Theme theme : themeService.getAllCSSThemes()) { + if (userCSSTheme.getId().equals(theme.getThemeId())) { + themeExists = true; + break; + } + } - if (!themeExists) { - userDTO.setHtmlTheme(new CSSThemeBriefDTO(themeService.getDefaultCSSTheme())); - } - } + if (!themeExists) { + userDTO.setHtmlTheme(new CSSThemeBriefDTO( + themeService.getDefaultCSSTheme())); + } + } - // If the user's flash theme has been deleted, use the - // default as fallback - CSSThemeBriefDTO userFlashTheme = userDTO.getFlashTheme(); - if (userFlashTheme != null) { - boolean themeExists = false; - for (Theme theme : themeService.getAllFlashThemes()) { - if (userFlashTheme.getId().equals(theme.getThemeId())) { - themeExists = true; - break; - } - } + // If the user's flash theme has been deleted, use the + // default as fallback + CSSThemeBriefDTO userFlashTheme = userDTO.getFlashTheme(); + if (userFlashTheme != null) { + boolean themeExists = false; + for (Theme theme : themeService.getAllFlashThemes()) { + if (userFlashTheme.getId().equals( + theme.getThemeId())) { + themeExists = true; + break; + } + } - if (!themeExists) { - userDTO.setFlashTheme(new CSSThemeBriefDTO(themeService.getDefaultFlashTheme())); - } - } + if (!themeExists) { + userDTO.setFlashTheme(new CSSThemeBriefDTO( + themeService.getDefaultFlashTheme())); + } + } - HttpSession sharedsession = SessionManager.getSession(); - sharedsession.setAttribute(AttributeNames.USER, userDTO); + HttpSession sharedsession = SessionManager.getSession(); + sharedsession.setAttribute(AttributeNames.USER, userDTO); + } + } catch (Exception e) { + e.printStackTrace(); + log.error("===> exception: " + e, e); + } } - } catch (Exception e) { - e.printStackTrace(); - UniversalLoginModule.log.error("===> exception: " + e, e); - } + return isValid; } - return isValid; - } - /** - * According to Lams's security policy, all the authorization must be done locally, in other word, through Lams - * database or other "local"(logically) data resource. - * - * @return Group[] containing the sets of roles - */ - @Override - protected Group[] getRoleSets() throws LoginException { - String username = getUsername(); - Connection conn = null; - HashMap setsMap = new HashMap(); - PreparedStatement ps = null; - ResultSet rs = null; + /** + * According to Lams's security policy, all the authorization must be done + * locally, in other word, through Lams database or other "local"(logically) + * data resource. + * + * @return Group[] containing the sets of roles + */ + protected Group[] getRoleSets() throws LoginException { + String username = getUsername(); + Connection conn = null; + HashMap setsMap = new HashMap(); + PreparedStatement ps = null; + ResultSet rs = null; - try { + try { - InitialContext ctx = new InitialContext(); - DataSource ds = (DataSource) ctx.lookup(this.dsJndiName); + InitialContext ctx = new InitialContext(); + DataSource ds = (DataSource) ctx.lookup(this.dsJndiName); - // log.debug("===> getRoleSets() called: " + dsJndiName + ": " + - // rolesQuery); - conn = ds.getConnection(); - // Get the user role names - ps = conn.prepareStatement(this.rolesQuery); - try { - ps.setString(1, username); - } catch (ArrayIndexOutOfBoundsException ignore) { - // The query may not have any parameters so just try it - } - rs = ps.executeQuery(); - if (rs.next() == false) { - if (getUnauthenticatedIdentity() == null) { - throw new FailedLoginException("No matching username found in Roles"); - } - /* - * We are running with an unauthenticatedIdentity so create an - * empty Roles set and return. - */ - Group[] roleSets = { new SimpleGroup("Roles") }; - return roleSets; - } + // log.debug("===> getRoleSets() called: " + dsJndiName + ": " + + // rolesQuery); + conn = ds.getConnection(); + // Get the user role names + ps = conn.prepareStatement(this.rolesQuery); + try { + ps.setString(1, username); + } catch (ArrayIndexOutOfBoundsException ignore) { + // The query may not have any parameters so just try it + } + rs = ps.executeQuery(); + if (rs.next() == false) { + if (getUnauthenticatedIdentity() == null) + throw new FailedLoginException( + "No matching username found in Roles"); + /* + * We are running with an unauthenticatedIdentity so create an + * empty Roles set and return. + */ + Group[] roleSets = { new SimpleGroup("Roles") }; + return roleSets; + } - ArrayList groupMembers = new ArrayList(); - do { - String name = rs.getString(1); - String groupName = rs.getString(2); - if ((groupName == null) || (groupName.length() == 0)) { - groupName = "Roles"; - } - Group group = (Group) setsMap.get(groupName); - if (group == null) { - group = new SimpleGroup(groupName); - setsMap.put(groupName, group); - } + ArrayList groupMembers = new ArrayList(); + do { + String name = rs.getString(1); + String groupName = rs.getString(2); + if (groupName == null || groupName.length() == 0) + groupName = "Roles"; + Group group = (Group) setsMap.get(groupName); + if (group == null) { + group = new SimpleGroup(groupName); + setsMap.put(groupName, group); + } - try { - Principal p; - // Assign minimal role if user has none - if (name == null) { - name = Role.LEARNER; - UniversalLoginModule.log.info("===> Found no roles"); - } - p = super.createIdentity(name); - if (!groupMembers.contains(name)) { - UniversalLoginModule.log.info("===> Assign user to role " + p.getName()); - group.addMember(p); - groupMembers.add(name); - } - if (name.equals(Role.SYSADMIN) || name.equals(Role.AUTHOR_ADMIN)) { - p = super.createIdentity(Role.AUTHOR); - UniversalLoginModule.log.info("===> Found " + name); - if (!groupMembers.contains(Role.AUTHOR)) { - UniversalLoginModule.log.info("===> Assign user to role " + Role.AUTHOR); - group.addMember(p); - groupMembers.add(Role.AUTHOR); + try { + Principal p; + // Assign minimal role if user has none + if (name == null) { + name = Role.LEARNER; + log.info("===> Found no roles"); + } + p = super.createIdentity(name); + if (!groupMembers.contains(name)) { + log.info("===> Assign user to role " + p.getName()); + group.addMember(p); + groupMembers.add(name); + } + if (name.equals(Role.SYSADMIN)) { + p = super.createIdentity(Role.AUTHOR); + log.info("===> Found " + name); + if (!groupMembers.contains(Role.AUTHOR)) { + log.info("===> Assign user to role " + Role.AUTHOR); + group.addMember(p); + groupMembers.add(Role.AUTHOR); + } + } + } catch (Exception e) { + log.debug("===> Failed to create principal: " + name, e); + } + } while (rs.next()); + } catch (NamingException ex) { + throw new LoginException(ex.toString(true)); + } catch (SQLException ex) { + super.log.error("SQL failure", ex); + throw new LoginException(ex.toString()); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException e) { + } } - } - } catch (Exception e) { - UniversalLoginModule.log.debug("===> Failed to create principal: " + name, e); + if (ps != null) { + try { + ps.close(); + } catch (SQLException e) { + } + } + if (conn != null) { + try { + conn.close(); + } catch (Exception ex) { + } + } } - } while (rs.next()); - } catch (NamingException ex) { - throw new LoginException(ex.toString(true)); - } catch (SQLException ex) { - super.log.error("SQL failure", ex); - throw new LoginException(ex.toString()); - } finally { - if (rs != null) { - try { - rs.close(); - } catch (SQLException e) { - } - } - if (ps != null) { - try { - ps.close(); - } catch (SQLException e) { - } - } - if (conn != null) { - try { - conn.close(); - } catch (Exception ex) { - } - } + + Group[] roleSets = new Group[setsMap.size()]; + setsMap.values().toArray(roleSets); + return roleSets; } - Group[] roleSets = new Group[setsMap.size()]; - setsMap.values().toArray(roleSets); - return roleSets; - } + /** + * Overriden to return an empty password string as typically one cannot + * obtain a user's password. We also override the validatePassword so this + * is ok. + * + * @return and empty password String + */ + protected String getUsersPassword() throws LoginException { + return ""; + } - /** - * Overriden to return an empty password string as typically one cannot obtain a user's password. We also override - * the validatePassword so this is ok. - * - * @return and empty password String - */ - @Override - protected String getUsersPassword() throws LoginException { - return ""; - } - } \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v diff -u -r1.54 -r1.54.2.1 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 22 Aug 2013 07:16:02 -0000 1.54 +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 30 Sep 2014 13:11:24 -0000 1.54.2.1 @@ -158,7 +158,7 @@ private static void setHeaderLinks(HttpServletRequest request) { List headerLinks = new ArrayList(); - if (request.isUserInRole(Role.AUTHOR) || request.isUserInRole(Role.AUTHOR_ADMIN)) { + if (request.isUserInRole(Role.AUTHOR)) { if (isPedagogicalPlannerAvailable()) { headerLinks.add(new IndexLinkBean("index.planner", "javascript:openPedagogicalPlanner()")); } @@ -170,7 +170,7 @@ if (reg != null) { if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN) || request.isUserInRole(Role.GROUP_MANAGER) || request.isUserInRole(Role.AUTHOR) - || request.isUserInRole(Role.AUTHOR_ADMIN) || request.isUserInRole(Role.MONITOR)) { + || request.isUserInRole(Role.MONITOR)) { headerLinks.add(new IndexLinkBean("index.community", "index.do?tab=community")); } } @@ -191,8 +191,7 @@ adminLinks.add(new IndexLinkBean("index.courseman", "javascript:openOrgManagement(" + getUserManagementService().getRootOrganisation().getOrganisationId() + ')')); } - if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.AUTHOR_ADMIN) - || getUserManagementService().isUserGlobalGroupAdmin()) { + if (request.isUserInRole(Role.SYSADMIN) || getUserManagementService().isUserGlobalGroupAdmin()) { adminLinks.add(new IndexLinkBean("index.sysadmin", "javascript:openSysadmin()")); } request.setAttribute("adminLinks", adminLinks); Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java,v diff -u -r1.50 -r1.50.2.1 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 25 Jul 2014 13:57:19 -0000 1.50 +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 30 Sep 2014 13:11:24 -0000 1.50.2.1 @@ -982,7 +982,7 @@ try { HttpSession s = SessionManager.getSession(); UserDTO u = (UserDTO) s.getAttribute(AttributeNames.USER); - getPedagogicalPlannerDAO().saveNodeRole(u.getUserID(), nodeUid, Role.ROLE_AUTHOR_ADMIN); + getPedagogicalPlannerDAO().saveNodeRole(u.getUserID(), nodeUid, Role.ROLE_SYSADMIN); } catch (Exception e) { PedagogicalPlannerAction.log.error("Error saving role for newly created root node: " + e.getMessage()); @@ -1877,15 +1877,15 @@ Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true); if (canEditNode(request, nodeUid)) { - List existingUsers = getPedagogicalPlannerDAO().getNodeUsers(nodeUid, Role.ROLE_AUTHOR_ADMIN); + List existingUsers = getPedagogicalPlannerDAO().getNodeUsers(nodeUid, Role.ROLE_SYSADMIN); Integer orgId = getUserManagementService().getRootOrganisation().getOrganisationId(); Vector potentialUsersVector = getUserManagementService().getUsersFromOrganisationByRole(orgId, - Role.AUTHOR_ADMIN, false, true); + Role.SYSADMIN, false, true); // list existing users (inherited role from parent nodes) Set allInheritedUsers = getPedagogicalPlannerDAO().getInheritedNodeUsers(nodeUid, - Role.ROLE_AUTHOR_ADMIN); + Role.ROLE_SYSADMIN); ArrayList filteredInheritedUsers = new ArrayList(); for (Object o : allInheritedUsers) { User u = (User) o; @@ -1927,7 +1927,7 @@ Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true); if (canEditNode(request, nodeUid)) { - getPedagogicalPlannerDAO().saveNodeRole(userId, nodeUid, Role.ROLE_AUTHOR_ADMIN); + getPedagogicalPlannerDAO().saveNodeRole(userId, nodeUid, Role.ROLE_SYSADMIN); } else { PedagogicalPlannerAction.log.debug("Unauthorised attempt to add editor to node."); } @@ -1941,7 +1941,7 @@ Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, false); if (canEditNode(request, nodeUid)) { - getPedagogicalPlannerDAO().removeNodeRole(userId, nodeUid, Role.ROLE_AUTHOR_ADMIN); + getPedagogicalPlannerDAO().removeNodeRole(userId, nodeUid, Role.ROLE_SYSADMIN); } else { PedagogicalPlannerAction.log.debug("Unauthorised attempt to remove editor from node."); } @@ -1963,7 +1963,7 @@ } else { if (nodeUid == null) { // all global author admins (GAA) can create and edit at the root level - return getUserManagementService().isUserGlobalAuthorAdmin(); + return getUserManagementService().isUserSysAdmin(); } else { // at any other node, the user needs to be the node's owner // or linked to that node or one of its parents @@ -1977,7 +1977,7 @@ private boolean isEditor(HttpServletRequest request, Long nodeUid) { User user = getUserManagementService().getUserByLogin(request.getRemoteUser()); - return getPedagogicalPlannerDAO().isEditor(user.getUserId(), nodeUid, Role.ROLE_AUTHOR_ADMIN); + return getPedagogicalPlannerDAO().isEditor(user.getUserId(), nodeUid, Role.ROLE_SYSADMIN); } private boolean canRemoveSubtree(HttpServletRequest request, Long nodeUid) { Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java,v diff -u -r1.61 -r1.61.2.1 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 25 Feb 2014 21:02:19 -0000 1.61 +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 30 Sep 2014 13:11:24 -0000 1.61.2.1 @@ -502,8 +502,7 @@ } private boolean isSysAuthorAdmin(User user) { - return userMgmtService.hasRoleInOrganisation(user, Role.ROLE_AUTHOR_ADMIN) - || userMgmtService.hasRoleInOrganisation(user, Role.ROLE_SYSADMIN); + return userMgmtService.hasRoleInOrganisation(user, Role.ROLE_SYSADMIN); } /** @@ -1411,7 +1410,7 @@ while (roleIterator.hasNext()) { UserOrganisationRole userOrganisationRole = (UserOrganisationRole) roleIterator.next(); Role role = userOrganisationRole.getRole(); - if (role.isAuthor() || role.isSysAdmin() || role.isGroupManager() || role.isAuthorAdmin()) { + if (role.isAuthor() || role.isSysAdmin() || role.isGroupManager()) { return true; } } Index: lams_central/web/includes/javascript/progressBar.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/progressBar.js,v diff -u -r1.13 -r1.13.2.1 --- lams_central/web/includes/javascript/progressBar.js 20 Jun 2014 17:34:18 -0000 1.13 +++ lams_central/web/includes/javascript/progressBar.js 30 Sep 2014 13:11:24 -0000 1.13.2.1 @@ -1021,7 +1021,7 @@ } $.ajax({ - url : LAMS_URL + 'monitoring/monitoring.do', + url : LAMS_URL + 'learning/learner.do', data : { 'method' : 'getLearnerProgress', 'lessonID' : lessonId, Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040032.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040032.sql,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java,v diff -u -r1.15 -r1.15.2.1 --- lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java 10 Apr 2011 16:25:44 -0000 1.15 +++ lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java 30 Sep 2014 13:11:31 -0000 1.15.2.1 @@ -124,7 +124,7 @@ || (user != null && node.getUser() != null && user.getUserID().equals(node.getUser().getUserId())); dto.isEditor = dto.isOwner || (user != null && pedagogicalPlannerDAO.isEditor(user.getUserID(), node.getUid(), - Role.ROLE_AUTHOR_ADMIN)); + Role.ROLE_SYSADMIN)); Integer nodePermissions = node.getPermissions(); dto.permitViewTemplate = dto.isOwner || nodePermissions == null Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java,v diff -u -r1.16.2.1 -r1.16.2.2 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java 27 Aug 2014 12:32:07 -0000 1.16.2.1 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java 30 Sep 2014 13:11:32 -0000 1.16.2.2 @@ -38,8 +38,6 @@ public static final String AUTHOR = "AUTHOR"; - public static final String AUTHOR_ADMIN = "AUTHOR ADMIN"; - public static final String GROUP_MANAGER = "GROUP MANAGER"; public static final String GROUP_ADMIN = "GROUP ADMIN"; @@ -57,7 +55,6 @@ public static final Integer ROLE_MONITOR = new Integer(4); public static final Integer ROLE_LEARNER = new Integer(5); public static final Integer ROLE_GROUP_ADMIN = new Integer(6); - public static final Integer ROLE_AUTHOR_ADMIN = new Integer(7); /***********************************************************/ /** identifier field */ @@ -163,8 +160,4 @@ public boolean isSysAdmin() { return this.roleId.equals(Role.ROLE_SYSADMIN); } - - public boolean isAuthorAdmin() { - return this.roleId.equals(Role.ROLE_AUTHOR_ADMIN); - } -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v diff -u -r1.65 -r1.65.2.1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 18 Sep 2013 16:31:57 -0000 1.65 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 30 Sep 2014 13:11:31 -0000 1.65.2.1 @@ -379,12 +379,6 @@ public boolean isUserGlobalGroupAdmin(); /** - * Return true if user is a global author admin. - * @return - */ - public boolean isUserGlobalAuthorAdmin(); - - /** * Return true if user has sysadmin role in root organisation. * @return */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.115.2.1 -r1.115.2.2 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 27 Aug 2014 12:32:07 -0000 1.115.2.1 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 30 Sep 2014 13:11:31 -0000 1.115.2.2 @@ -887,8 +887,7 @@ log.debug("setting role: " + role.getName() + " in organisation: " + org.getName()); uors.add(uor); // when a user gets these roles, they need a workspace - if (role.getName().equals(Role.AUTHOR) || role.getName().equals(Role.AUTHOR_ADMIN) - || role.getName().equals(Role.SYSADMIN)) { + if (role.getName().equals(Role.AUTHOR) || role.getName().equals(Role.SYSADMIN)) { if (user.getWorkspace() == null) { createWorkspaceForUser(user); } @@ -973,8 +972,6 @@ if (!orgType.getOrganisationTypeId().equals(OrganisationType.ROOT_TYPE) || !isSysadmin) { role.setRoleId(Role.ROLE_SYSADMIN); allRoles.remove(role); - role.setRoleId(Role.ROLE_AUTHOR_ADMIN); - allRoles.remove(role); } else { role.setRoleId(Role.ROLE_AUTHOR); allRoles.remove(role); @@ -1054,12 +1051,6 @@ return requestorId != null ? isUserInRole(requestorId, rootOrgId, Role.GROUP_ADMIN) : false; } - public boolean isUserGlobalAuthorAdmin() { - Integer rootOrgId = getRootOrganisation().getOrganisationId(); - Integer requestorId = getRequestorId(); - return requestorId != null ? isUserInRole(requestorId, rootOrgId, Role.AUTHOR_ADMIN) : false; - } - public boolean isUserSysAdmin() { Integer rootOrgId = getRootOrganisation().getOrganisationId(); Integer requestorId = getRequestorId(); Index: lams_gradebook/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/conf/xdoclet/web-security.xml,v diff -u -r1.2 -r1.2.2.1 --- lams_gradebook/conf/xdoclet/web-security.xml 14 Apr 2009 06:12:15 -0000 1.2 +++ lams_gradebook/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:00 -0000 1.2.2.1 @@ -5,14 +5,24 @@ /* - AUTHOR ADMIN GROUP MANAGER GROUP ADMIN SYSADMIN LEARNER MONITOR + + + + Monitor content + /gradebookMonitoring.do + + + SYSADMIN + MONITOR + + @@ -24,23 +34,34 @@ - - - AUTHOR ADMIN + + + + Student + LEARNER - - GROUP MANAGER + + + Authors Learning Designs + AUTHOR - - GROUP ADMIN - + - SYSADMIN + Member of Staff + MONITOR + - LEARNER + Group Manager + GROUP MANAGER + - MONITOR + Group Administrator + GROUP ADMIN + + LAMS System Adminstrator + SYSADMIN + \ No newline at end of file Index: lams_learning/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-security.xml,v diff -u -r1.7 -r1.7.12.1 --- lams_learning/conf/xdoclet/web-security.xml 15 Sep 2008 02:24:08 -0000 1.7 +++ lams_learning/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:25 -0000 1.7.12.1 @@ -3,14 +3,12 @@ Secure Content /* - /portfolioExport LEARNER - MONITOR AUTHOR + MONITOR SYSADMIN - AUTHOR ADMIN @@ -23,36 +21,34 @@ /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 + LAMS System Adminstrator SYSADMIN - - - - AUTHOR ADMIN \ No newline at end of file Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v diff -u -r1.52.2.1 -r1.52.2.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 22 Aug 2014 12:53:48 -0000 1.52.2.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 30 Sep 2014 13:11:25 -0000 1.52.2.2 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/web-security.xml,v diff -u -r1.5 -r1.5.12.1 --- lams_monitoring/conf/xdoclet/web-security.xml 18 Sep 2008 06:55:39 -0000 1.5 +++ lams_monitoring/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:20 -0000 1.5.12.1 @@ -1,19 +1,33 @@ - + + - Secure Content + Secure content /* - LEARNER MONITOR + SYSADMIN + + + + + + Lesson start content + /initializeLesson + /monitoring.do + + + AUTHOR + MONITOR SYSADMIN - AUTHOR ADMIN + + FORM LAMS @@ -22,36 +36,35 @@ /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 + LAMS System Adminstrator SYSADMIN - - - - AUTHOR ADMIN \ No newline at end of file Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.118.2.4 -r1.118.2.5 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 2 Sep 2014 22:24:07 -0000 1.118.2.4 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 30 Sep 2014 13:11:20 -0000 1.118.2.5 @@ -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,17 +1292,17 @@ 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) { - if (userId.equals(includeId)) { + if (userId.toString().equals(includeId)) { result.add(user); break; } } } - + return result; } Index: lams_tool_assessment/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/web.xml,v diff -u -r1.10.2.3 -r1.10.2.4 --- lams_tool_assessment/web/WEB-INF/web.xml 17 Aug 2014 08:57:33 -0000 1.10.2.3 +++ lams_tool_assessment/web/WEB-INF/web.xml 30 Sep 2014 13:11:04 -0000 1.10.2.4 @@ -235,122 +235,71 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_bbb/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/conf/xdoclet/web-security.xml,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_bbb/conf/xdoclet/web-security.xml 4 May 2011 02:23:39 -0000 1.1 +++ lams_tool_bbb/conf/xdoclet/web-security.xml 30 Sep 2014 13:10:59 -0000 1.1.4.1 @@ -2,57 +2,50 @@ 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 + MONITOR 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 +58,34 @@ /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 ADMIN - + LAMS System Adminstrator + SYSADMIN + \ No newline at end of file Index: lams_tool_chat/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/conf/xdoclet/web-security.xml,v diff -u -r1.4 -r1.4.14.1 --- lams_tool_chat/conf/xdoclet/web-security.xml 31 Oct 2006 05:11:01 -0000 1.4 +++ lams_tool_chat/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:15 -0000 1.4.14.1 @@ -1,103 +1,80 @@ - + - - Secure Content - *.jsp - *.html - *.do - - - LEARNER - TEACHER + + Secure content + /* + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + + + + + Authoring content + /authoring/* + /pages/authoring/* + /authoring.do + /pedagogicalPlanner.do + + + AUTHOR 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 - - - - - + 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 + + + Group Administrator + GROUP ADMIN + - Can add/remove users to the system, set up classes of users for sessions + LAMS System Adminstrator SYSADMIN - - Can create/modify a learning design and edit default tool content - AUTHOR ADMIN - + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + Index: lams_tool_daco/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/web.xml,v diff -u -r1.9.2.2 -r1.9.2.3 --- lams_tool_daco/web/WEB-INF/web.xml 17 Aug 2014 08:57:51 -0000 1.9.2.2 +++ lams_tool_daco/web/WEB-INF/web.xml 30 Sep 2014 13:11:30 -0000 1.9.2.3 @@ -224,122 +224,71 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_eadventure/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/web.xml,v diff -u -r1.7.2.2 -r1.7.2.3 --- lams_tool_eadventure/web/WEB-INF/web.xml 17 Aug 2014 08:57:28 -0000 1.7.2.2 +++ lams_tool_eadventure/web/WEB-INF/web.xml 30 Sep 2014 13:11:03 -0000 1.7.2.3 @@ -247,122 +247,71 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_forum/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/web-security.xml,v diff -u -r1.5 -r1.5.12.1 --- lams_tool_forum/conf/xdoclet/web-security.xml 23 May 2007 06:41:41 -0000 1.5 +++ lams_tool_forum/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:32 -0000 1.5.12.1 @@ -1,123 +1,74 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* + /jsps/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN @@ -129,3 +80,4 @@ /login.jsp?failed=y + \ No newline at end of file Index: lams_tool_gmap/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/xdoclet/web-security.xml,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_gmap/conf/xdoclet/web-security.xml 23 May 2008 06:29:10 -0000 1.1 +++ lams_tool_gmap/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:10 -0000 1.1.12.1 @@ -2,57 +2,49 @@ Secure Content - *.jsp - *.html - *.do + /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /pages/authoring/* /authoring.do AUTHOR - AUTHOR ADMIN + MONITOR 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 +57,34 @@ /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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_images/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/web.xml,v diff -u -r1.7.2.2 -r1.7.2.3 --- lams_tool_images/web/WEB-INF/web.xml 17 Aug 2014 08:57:37 -0000 1.7.2.2 +++ lams_tool_images/web/WEB-INF/web.xml 30 Sep 2014 13:11:21 -0000 1.7.2.3 @@ -230,117 +230,77 @@ LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_imscc/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/web.xml,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_imscc/web/WEB-INF/web.xml 17 Aug 2014 08:57:56 -0000 1.5.2.2 +++ lams_tool_imscc/web/WEB-INF/web.xml 30 Sep 2014 13:11:30 -0000 1.5.2.3 @@ -240,117 +240,77 @@ LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_kaltura/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/conf/xdoclet/web-security.xml,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_kaltura/conf/xdoclet/web-security.xml 15 Nov 2012 14:39:31 -0000 1.1 +++ lams_tool_kaltura/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:33 -0000 1.1.2.1 @@ -1,103 +1,72 @@ - 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 + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN + \ No newline at end of file Index: lams_tool_lamc/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v diff -u -r1.32.2.1 -r1.32.2.2 --- lams_tool_lamc/web/WEB-INF/web.xml 12 Aug 2014 19:18:54 -0000 1.32.2.1 +++ lams_tool_lamc/web/WEB-INF/web.xml 30 Sep 2014 13:11:26 -0000 1.32.2.2 @@ -277,112 +277,73 @@ - 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 + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_laqa/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/web.xml,v diff -u -r1.35.2.1 -r1.35.2.2 --- lams_tool_laqa/web/WEB-INF/web.xml 12 Aug 2014 19:19:02 -0000 1.35.2.1 +++ lams_tool_laqa/web/WEB-INF/web.xml 30 Sep 2014 13:11:08 -0000 1.35.2.2 @@ -278,111 +278,73 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - Authoring Update + Authoring content + /authoring/* + /authoring.do /authoringStarter.do + /pedagogicalPlanner.do AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_larsrc/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/web.xml,v diff -u -r1.24.2.2 -r1.24.2.3 --- lams_tool_larsrc/web/WEB-INF/web.xml 17 Aug 2014 08:57:35 -0000 1.24.2.2 +++ lams_tool_larsrc/web/WEB-INF/web.xml 30 Sep 2014 13:11:14 -0000 1.24.2.3 @@ -245,122 +245,71 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_leader/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/conf/xdoclet/web-security.xml,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_leader/conf/xdoclet/web-security.xml 8 Jan 2014 20:13:49 -0000 1.1 +++ lams_tool_leader/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:03 -0000 1.1.2.1 @@ -1,103 +1,80 @@ - 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 + MONITOR 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 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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/conf/xdoclet/web-security.xml,v diff -u -r1.1 -r1.1.8.1 --- lams_tool_mindmap/conf/xdoclet/web-security.xml 3 Apr 2009 00:00:32 -0000 1.1 +++ lams_tool_mindmap/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:28 -0000 1.1.8.1 @@ -1,106 +1,81 @@ - - - Secure Content - *.jsp - *.html - *.do - - + + + Secure content + /* + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + + + + + Authoring content + /authoring/* + /pages/authoring/* + /authoring.do + /pedagogicalPlanner.do + + + AUTHOR + MONITOR + 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 + + Group Manager + GROUP MANAGER + + + + Group Administrator + GROUP ADMIN + + + + LAMS System Adminstrator SYSADMIN - AUTHOR ADMIN - - + - - 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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/xdoclet/web-security.xml,v diff -u -r1.5 -r1.5.14.1 --- lams_tool_nb/conf/xdoclet/web-security.xml 31 Oct 2006 05:17:08 -0000 1.5 +++ lams_tool_nb/conf/xdoclet/web-security.xml 30 Sep 2014 13:10:58 -0000 1.5.14.1 @@ -1,107 +1,80 @@ - 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 + MONITOR 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 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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/xdoclet/web-security.xml,v diff -u -r1.3 -r1.3.14.1 --- lams_tool_notebook/conf/xdoclet/web-security.xml 31 Oct 2006 05:13:38 -0000 1.3 +++ lams_tool_notebook/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:34 -0000 1.3.14.1 @@ -1,103 +1,80 @@ - 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 + MONITOR 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 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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/conf/xdoclet/web-security.xml,v diff -u -r1.1 -r1.1.10.1 --- lams_tool_pixlr/conf/xdoclet/web-security.xml 7 Jan 2009 22:37:48 -0000 1.1 +++ lams_tool_pixlr/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:11 -0000 1.1.10.1 @@ -1,103 +1,80 @@ - 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 + MONITOR 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 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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/web-security.xml,v diff -u -r1.6 -r1.6.14.1 --- lams_tool_sbmt/conf/xdoclet/web-security.xml 31 Oct 2006 05:13:39 -0000 1.6 +++ lams_tool_sbmt/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:06 -0000 1.6.14.1 @@ -1,115 +1,73 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content + /authoring/* /authoring.do + /pedagogicalPlanner.do AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN @@ -120,4 +78,4 @@ /login.jsp /login.jsp?failed=y - + \ No newline at end of file Index: lams_tool_scratchie/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/web.xml,v diff -u -r1.2.2.3 -r1.2.2.4 --- lams_tool_scratchie/web/WEB-INF/web.xml 17 Aug 2014 08:57:26 -0000 1.2.2.3 +++ lams_tool_scratchie/web/WEB-INF/web.xml 30 Sep 2014 13:11:35 -0000 1.2.2.4 @@ -228,129 +228,89 @@ LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - 500 /error.jsp Index: lams_tool_scribe/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/xdoclet/web-security.xml,v diff -u -r1.2 -r1.2.14.1 --- lams_tool_scribe/conf/xdoclet/web-security.xml 31 Oct 2006 05:14:01 -0000 1.2 +++ lams_tool_scribe/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:29 -0000 1.2.14.1 @@ -1,103 +1,80 @@ - 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 + MONITOR 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 + Group Administrator + GROUP ADMIN + + + + LAMS System Adminstrator SYSADMIN - - Can create/modify a learning design and edit default tool content - AUTHOR ADMIN - \ No newline at end of file + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + \ No newline at end of file Index: lams_tool_spreadsheet/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/web.xml,v diff -u -r1.8.2.2 -r1.8.2.3 --- lams_tool_spreadsheet/web/WEB-INF/web.xml 17 Aug 2014 08:57:41 -0000 1.8.2.2 +++ lams_tool_spreadsheet/web/WEB-INF/web.xml 30 Sep 2014 13:11:12 -0000 1.8.2.3 @@ -219,122 +219,71 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_survey/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/web.xml,v diff -u -r1.13.2.2 -r1.13.2.3 --- lams_tool_survey/web/WEB-INF/web.xml 17 Aug 2014 08:57:31 -0000 1.13.2.2 +++ lams_tool_survey/web/WEB-INF/web.xml 30 Sep 2014 13:11:01 -0000 1.13.2.3 @@ -224,121 +224,71 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_task/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/web.xml,v diff -u -r1.10.2.2 -r1.10.2.3 --- lams_tool_task/web/WEB-INF/web.xml 17 Aug 2014 08:57:51 -0000 1.10.2.2 +++ lams_tool_task/web/WEB-INF/web.xml 30 Sep 2014 13:11:09 -0000 1.10.2.3 @@ -224,122 +224,71 @@ - Secure Content + Secure content /* LEARNER - TEACHER MONITOR AUTHOR - ADMIN SYSADMIN - AUTHOR ADMIN - Authoring Update + Authoring content /authoring/* + /pages/authoring/* AUTHOR - AUTHOR ADMIN + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN Index: lams_tool_videorecorder/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/conf/xdoclet/web-security.xml,v diff -u -r1.1 -r1.1.6.1 --- lams_tool_videorecorder/conf/xdoclet/web-security.xml 18 Dec 2008 02:20:34 -0000 1.1 +++ lams_tool_videorecorder/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:07 -0000 1.1.6.1 @@ -1,103 +1,80 @@ - 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 + MONITOR 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 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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/web.xml,v diff -u -r1.24.2.1 -r1.24.2.2 --- lams_tool_vote/web/WEB-INF/web.xml 12 Aug 2014 19:19:00 -0000 1.24.2.1 +++ lams_tool_vote/web/WEB-INF/web.xml 30 Sep 2014 13:11:14 -0000 1.24.2.2 @@ -295,111 +295,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 + MONITOR 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 ADMIN + LAMS System Adminstrator + SYSADMIN + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + + Index: lams_tool_wiki/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/xdoclet/web-security.xml,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_wiki/conf/xdoclet/web-security.xml 8 Oct 2008 05:33:00 -0000 1.1 +++ lams_tool_wiki/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:13 -0000 1.1.12.1 @@ -1,103 +1,80 @@ - 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 + MONITOR 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 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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wookie/conf/xdoclet/web-security.xml,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_wookie/conf/xdoclet/web-security.xml 28 Jul 2009 05:30:14 -0000 1.1 +++ lams_tool_wookie/conf/xdoclet/web-security.xml 30 Sep 2014 13:11:22 -0000 1.1.2.1 @@ -2,57 +2,50 @@ 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 + MONITOR 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 +58,34 @@ /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 ADMIN - + LAMS System Adminstrator + SYSADMIN + \ No newline at end of file Index: lams_www/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/web.xml,v diff -u -r1.5 -r1.5.2.1 --- lams_www/web/WEB-INF/web.xml 30 Jul 2012 18:45:12 -0000 1.5 +++ lams_www/web/WEB-INF/web.xml 30 Sep 2014 13:11:02 -0000 1.5.2.1 @@ -170,33 +170,35 @@ /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 + LAMS System Adminstrator SYSADMIN