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 -r1.101 --- lams_admin/conf/language/lams/ApplicationResources.properties 16 Jul 2014 20:17:15 -0000 1.100 +++ lams_admin/conf/language/lams/ApplicationResources.properties 29 Sep 2014 17:09:37 -0000 1.101 @@ -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.2 --- 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 29 Sep 2014 17:09:37 -0000 1.2 @@ -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.5 --- 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 29 Sep 2014 17:09:37 -0000 1.5 @@ -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.5 --- 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 29 Sep 2014 17:09:37 -0000 1.5 @@ -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.41 --- 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 29 Sep 2014 17:09:37 -0000 1.41 @@ -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.93 --- 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 29 Sep 2014 17:09:37 -0000 1.93 @@ -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.36 --- 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 29 Sep 2014 17:09:37 -0000 1.36 @@ -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.5 --- 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 29 Sep 2014 17:09:37 -0000 1.5 @@ -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.17 --- 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 29 Sep 2014 17:09:37 -0000 1.17 @@ -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.7 --- 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 29 Sep 2014 17:09:37 -0000 1.7 @@ -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.11 --- 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 29 Sep 2014 17:09:37 -0000 1.11 @@ -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.6 --- 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 29 Sep 2014 17:09:37 -0000 1.6 @@ -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.4 --- 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 29 Sep 2014 17:09:37 -0000 1.4 @@ -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.2 --- 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 29 Sep 2014 17:09:37 -0000 1.2 @@ -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.44 --- 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 29 Sep 2014 17:09:37 -0000 1.44 @@ -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.9 --- 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 29 Sep 2014 17:09:37 -0000 1.9 @@ -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.5 --- 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 29 Sep 2014 17:09:37 -0000 1.5 @@ -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.2 --- 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 29 Sep 2014 17:09:37 -0000 1.2 @@ -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.4 --- 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 29 Sep 2014 17:09:37 -0000 1.4 @@ -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.2 --- 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 29 Sep 2014 17:09:37 -0000 1.2 @@ -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.4 --- 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 29 Sep 2014 17:09:37 -0000 1.4 @@ -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.8 -r1.9 --- lams_admin/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:19 -0000 1.8 +++ lams_admin/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:37 -0000 1.9 @@ -5,7 +5,6 @@ /* - AUTHOR ADMIN GROUP MANAGER GROUP ADMIN SYSADMIN @@ -49,11 +48,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN \ 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.12 --- 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 29 Sep 2014 17:09:37 -0000 1.12 @@ -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.8 --- 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 29 Sep 2014 17:09:37 -0000 1.8 @@ -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.22 --- 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 29 Sep 2014 17:09:37 -0000 1.22 @@ -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 -r1.18 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java 7 Jan 2013 08:52:19 -0000 1.17 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java 29 Sep 2014 17:09:37 -0000 1.18 @@ -79,9 +79,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.15 -r1.16 --- lams_admin/web/register.jsp 1 Aug 2014 16:04:07 -0000 1.15 +++ lams_admin/web/register.jsp 29 Sep 2014 17:09:37 -0000 1.16 @@ -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.34 --- lams_admin/web/userlist.jsp 29 Sep 2012 13:58:15 -0000 1.33 +++ lams_admin/web/userlist.jsp 29 Sep 2014 17:09:37 -0000 1.34 @@ -81,10 +81,6 @@ : - - : - - Index: lams_build/conf/j2ee/lams.application.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/lams.application.xml,v diff -u -r1.20 -r1.21 --- lams_build/conf/j2ee/lams.application.xml 26 Sep 2014 11:33:22 -0000 1.20 +++ lams_build/conf/j2ee/lams.application.xml 29 Sep 2014 17:09:56 -0000 1.21 @@ -86,11 +86,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN Index: lams_build/lib/lams/lams-admin.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-admin.jar,v diff -u -r1.4 -r1.5 Binary files differ Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.424 -r1.425 Binary files differ Index: lams_central/conf/xdoclet/web-security.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/web-security.xml,v diff -u -r1.23 -r1.24 --- lams_central/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:20 -0000 1.23 +++ lams_central/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:40 -0000 1.24 @@ -11,7 +11,6 @@ AUTHOR GROUP MANAGER GROUP ADMIN - AUTHOR ADMIN SYSADMIN @@ -24,15 +23,14 @@ /images/* /includes/javascript/* /signup/* - *.ico + /favicon.ico - + - Author content + Authoring content /authoring/* - /addLesson.jsp /author.jsp /authoringConfirm.jsp /lams_authoring_library.swf @@ -41,6 +39,8 @@ AUTHOR + + MONITOR SYSADMIN @@ -121,11 +121,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN \ 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 -r1.30 --- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java 18 Feb 2010 05:42:17 -0000 1.29 +++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java 29 Sep 2014 17:09:40 -0000 1.30 @@ -355,8 +355,7 @@ group.addMember(p); groupMembers.add(name); } - if (name.equals(Role.SYSADMIN) - || name.equals(Role.AUTHOR_ADMIN)) { + if (name.equals(Role.SYSADMIN)) { p = super.createIdentity(Role.AUTHOR); log.info("===> Found " + name); if (!groupMembers.contains(Role.AUTHOR)) { 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.55 --- 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 29 Sep 2014 17:09:40 -0000 1.55 @@ -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.51 --- 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 29 Sep 2014 17:09:40 -0000 1.51 @@ -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.62 --- 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 29 Sep 2014 17:09:40 -0000 1.62 @@ -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_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 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.16 --- 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 29 Sep 2014 17:09:57 -0000 1.16 @@ -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.17 -r1.18 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java 27 Aug 2014 12:26:33 -0000 1.17 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java 29 Sep 2014 17:09:57 -0000 1.18 @@ -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.66 --- 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 29 Sep 2014 17:09:57 -0000 1.66 @@ -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.116 -r1.117 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 27 Aug 2014 12:26:32 -0000 1.116 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 29 Sep 2014 17:09:57 -0000 1.117 @@ -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.3 -r1.4 --- lams_gradebook/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:16 -0000 1.3 +++ lams_gradebook/conf/xdoclet/web-security.xml 29 Sep 2014 17:10:02 -0000 1.4 @@ -62,11 +62,6 @@ - Author Administrator - AUTHOR 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.8 -r1.9 --- lams_learning/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:03 -0000 1.8 +++ lams_learning/conf/xdoclet/web-security.xml 29 Sep 2014 17:10:05 -0000 1.9 @@ -6,6 +6,7 @@ LEARNER + AUTHOR MONITOR SYSADMIN @@ -48,11 +49,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN \ 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.6 -r1.7 --- lams_monitoring/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:14 -0000 1.6 +++ lams_monitoring/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:28 -0000 1.7 @@ -2,14 +2,29 @@ - Secure Content + Secure content /* MONITOR SYSADMIN + + + + Lesson start content + /initializeLesson + /monitoring.do + + + + AUTHOR + MONITOR + SYSADMIN + + + @@ -50,11 +65,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN \ No newline at end of file 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.11 -r1.12 --- lams_tool_assessment/web/WEB-INF/web.xml 26 Sep 2014 11:33:04 -0000 1.11 +++ lams_tool_assessment/web/WEB-INF/web.xml 29 Sep 2014 17:09:47 -0000 1.12 @@ -265,6 +265,7 @@ AUTHOR + MONITOR SYSADMIN @@ -308,11 +309,6 @@ - Author Administrator - 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.2 -r1.3 --- lams_tool_bbb/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:09 -0000 1.2 +++ lams_tool_bbb/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:26 -0000 1.3 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -85,11 +86,6 @@ - Author Administrator - 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.5 -r1.6 --- lams_tool_chat/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:26 -0000 1.5 +++ lams_tool_chat/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:49 -0000 1.6 @@ -22,6 +22,7 @@ AUTHOR + MONITOR SYSADMIN @@ -62,13 +63,8 @@ Group Administrator GROUP ADMIN - + - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.10 -r1.11 --- lams_tool_daco/web/WEB-INF/web.xml 26 Sep 2014 11:33:05 -0000 1.10 +++ lams_tool_daco/web/WEB-INF/web.xml 29 Sep 2014 17:10:01 -0000 1.11 @@ -247,6 +247,7 @@ AUTHOR + MONITOR SYSADMIN @@ -291,11 +292,6 @@ - Author Administrator - 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.8 -r1.9 --- lams_tool_eadventure/web/WEB-INF/web.xml 26 Sep 2014 11:33:24 -0000 1.8 +++ lams_tool_eadventure/web/WEB-INF/web.xml 29 Sep 2014 17:09:32 -0000 1.9 @@ -270,6 +270,7 @@ AUTHOR + MONITOR SYSADMIN @@ -314,11 +315,6 @@ - Author Administrator - 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.6 -r1.7 --- lams_tool_forum/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:21 -0000 1.6 +++ lams_tool_forum/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:43 -0000 1.7 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -66,11 +67,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.2 -r1.3 --- lams_tool_gmap/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:10 -0000 1.2 +++ lams_tool_gmap/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:22 -0000 1.3 @@ -20,6 +20,7 @@ AUTHOR + MONITOR SYSADMIN @@ -84,11 +85,6 @@ - Author Administrator - 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.8 -r1.9 --- lams_tool_images/web/WEB-INF/web.xml 26 Sep 2014 11:32:59 -0000 1.8 +++ lams_tool_images/web/WEB-INF/web.xml 29 Sep 2014 17:09:29 -0000 1.9 @@ -248,6 +248,7 @@ AUTHOR + MONITOR SYSADMIN @@ -303,11 +304,6 @@ - Author Administrator - 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.6 -r1.7 --- lams_tool_imscc/web/WEB-INF/web.xml 26 Sep 2014 11:33:31 -0000 1.6 +++ lams_tool_imscc/web/WEB-INF/web.xml 29 Sep 2014 17:09:44 -0000 1.7 @@ -258,6 +258,7 @@ AUTHOR + MONITOR SYSADMIN @@ -313,11 +314,6 @@ - Author Administrator - 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.2 -r1.3 --- lams_tool_kaltura/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:13 -0000 1.2 +++ lams_tool_kaltura/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:48 -0000 1.3 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -65,11 +66,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.33 -r1.34 --- lams_tool_lamc/web/WEB-INF/web.xml 26 Sep 2014 11:33:02 -0000 1.33 +++ lams_tool_lamc/web/WEB-INF/web.xml 29 Sep 2014 17:09:32 -0000 1.34 @@ -301,6 +301,7 @@ AUTHOR + MONITOR SYSADMIN @@ -345,11 +346,6 @@ - Author Administrator - 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.36 -r1.37 --- lams_tool_laqa/web/WEB-INF/web.xml 26 Sep 2014 11:33:18 -0000 1.36 +++ lams_tool_laqa/web/WEB-INF/web.xml 29 Sep 2014 17:09:25 -0000 1.37 @@ -303,6 +303,7 @@ AUTHOR + MONITOR SYSADMIN @@ -347,11 +348,6 @@ - Author Administrator - 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.25 -r1.26 --- lams_tool_larsrc/web/WEB-INF/web.xml 26 Sep 2014 11:33:12 -0000 1.25 +++ lams_tool_larsrc/web/WEB-INF/web.xml 29 Sep 2014 17:10:02 -0000 1.26 @@ -268,6 +268,7 @@ AUTHOR + MONITOR SYSADMIN @@ -312,11 +313,6 @@ - Author Administrator - 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.2 -r1.3 --- lams_tool_leader/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:07 -0000 1.2 +++ lams_tool_leader/conf/xdoclet/web-security.xml 29 Sep 2014 17:10:04 -0000 1.3 @@ -20,6 +20,7 @@ AUTHOR + MONITOR SYSADMIN @@ -63,11 +64,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.2 -r1.3 --- lams_tool_mindmap/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:17 -0000 1.2 +++ lams_tool_mindmap/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:24 -0000 1.3 @@ -22,6 +22,7 @@ AUTHOR + MONITOR SYSADMIN @@ -63,13 +64,8 @@ Group Administrator GROUP ADMIN - + - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.6 -r1.7 --- lams_tool_nb/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:30 -0000 1.6 +++ lams_tool_nb/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:33 -0000 1.7 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -64,11 +65,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.4 -r1.5 --- lams_tool_notebook/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:00 -0000 1.4 +++ lams_tool_notebook/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:45 -0000 1.5 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -64,11 +65,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.2 -r1.3 --- lams_tool_pixlr/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:01 -0000 1.2 +++ lams_tool_pixlr/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:42 -0000 1.3 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -64,11 +65,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.7 -r1.8 --- lams_tool_sbmt/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:13 -0000 1.7 +++ lams_tool_sbmt/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:59 -0000 1.8 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -65,11 +66,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.3 -r1.4 --- lams_tool_scratchie/web/WEB-INF/web.xml 26 Sep 2014 11:33:25 -0000 1.3 +++ lams_tool_scratchie/web/WEB-INF/web.xml 29 Sep 2014 17:09:30 -0000 1.4 @@ -251,6 +251,7 @@ AUTHOR + MONITOR SYSADMIN @@ -314,13 +315,8 @@ Group Administrator GROUP ADMIN - + - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.3 -r1.4 --- lams_tool_scribe/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:11 -0000 1.3 +++ lams_tool_scribe/conf/xdoclet/web-security.xml 29 Sep 2014 17:10:06 -0000 1.4 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -64,11 +65,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.9 -r1.10 --- lams_tool_spreadsheet/web/WEB-INF/web.xml 26 Sep 2014 11:33:06 -0000 1.9 +++ lams_tool_spreadsheet/web/WEB-INF/web.xml 29 Sep 2014 17:09:23 -0000 1.10 @@ -241,6 +241,7 @@ AUTHOR + MONITOR SYSADMIN @@ -285,11 +286,6 @@ - Author Administrator - 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.14 -r1.15 --- lams_tool_survey/web/WEB-INF/web.xml 26 Sep 2014 11:32:57 -0000 1.14 +++ lams_tool_survey/web/WEB-INF/web.xml 29 Sep 2014 17:09:31 -0000 1.15 @@ -246,6 +246,7 @@ AUTHOR + MONITOR SYSADMIN @@ -290,11 +291,6 @@ - Author Administrator - 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.11 -r1.12 --- lams_tool_task/web/WEB-INF/web.xml 26 Sep 2014 11:33:29 -0000 1.11 +++ lams_tool_task/web/WEB-INF/web.xml 29 Sep 2014 17:09:46 -0000 1.12 @@ -246,6 +246,7 @@ AUTHOR + MONITOR SYSADMIN @@ -290,11 +291,6 @@ - Author Administrator - 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.2 -r1.3 --- lams_tool_videorecorder/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:27 -0000 1.2 +++ lams_tool_videorecorder/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:43 -0000 1.3 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -64,11 +65,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.25 -r1.26 --- lams_tool_vote/web/WEB-INF/web.xml 26 Sep 2014 11:33:28 -0000 1.25 +++ lams_tool_vote/web/WEB-INF/web.xml 29 Sep 2014 17:09:50 -0000 1.26 @@ -320,6 +320,7 @@ AUTHOR + MONITOR SYSADMIN @@ -364,11 +365,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.2 -r1.3 --- lams_tool_wiki/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:23 -0000 1.2 +++ lams_tool_wiki/conf/xdoclet/web-security.xml 29 Sep 2014 17:09:24 -0000 1.3 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -64,11 +65,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN 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.2 -r1.3 --- lams_tool_wookie/conf/xdoclet/web-security.xml 26 Sep 2014 11:33:25 -0000 1.2 +++ lams_tool_wookie/conf/xdoclet/web-security.xml 29 Sep 2014 17:10:03 -0000 1.3 @@ -21,6 +21,7 @@ AUTHOR + MONITOR SYSADMIN @@ -85,11 +86,6 @@ - Author Administrator - 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.6 -r1.7 --- lams_www/web/WEB-INF/web.xml 26 Sep 2014 11:32:58 -0000 1.6 +++ lams_www/web/WEB-INF/web.xml 29 Sep 2014 17:09:58 -0000 1.7 @@ -157,7 +157,6 @@ AUTHOR GROUP MANAGER GROUP ADMIN - AUTHOR ADMIN SYSADMIN @@ -199,11 +198,6 @@ - Author Administrator - AUTHOR ADMIN - - - LAMS System Adminstrator SYSADMIN