Index: lams_central/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/build.xml,v diff -u -r1.36 -r1.36.6.1 --- lams_central/build.xml 28 Sep 2006 23:28:23 -0000 1.36 +++ lams_central/build.xml 12 Mar 2007 07:26:44 -0000 1.36.6.1 @@ -100,20 +100,21 @@ - - - + + + + + + + + + - - - - - - - + + @@ -149,7 +150,7 @@ - + Fisheye: Tag 1.59.6.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_ar_JO.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_cy_GB.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.6.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_da_DK.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_de_DE.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_el_GK.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_en_AU.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.11.6.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_es_ES.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_fr_FR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_it_IT.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.10.2.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_ko_KR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_mi_NZ.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.10.6.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_no_NO.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7.2.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_pl_PL.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_pt_BR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_sv_SE.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/conf/language/ApplicationResources_vi_VN.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/language/lams/ApplicationResources_el_GK.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssuesDialog.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Attic/ValidationIssuesDialog.as,v diff -u -r1.3 -r1.3.6.1 Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Attic/Lesson.as,v diff -u -r1.22 -r1.22.2.1 Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/Attic/LessonManagerDialog.as,v diff -u -r1.13.6.1 -r1.13.6.2 Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/User.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/Attic/User.as,v diff -u -r1.6.6.1 -r1.6.6.2 Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/wizard/Attic/WizardView.as,v diff -u -r1.35.6.1 -r1.35.6.2 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java,v diff -u -r1.7 -r1.7.6.1 --- lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java 11 Oct 2006 05:43:55 -0000 1.7 +++ lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java 12 Mar 2007 07:19:20 -0000 1.7.6.1 @@ -75,15 +75,10 @@ String checkStatus = (String) session.getAttribute(AUTH_OBJECT_NAME); String id = session.getId(); - if (checkStatus == null) { - log.debug("===>LOGIN PAGE: there is no auth obj in session, auth obj created. session id: " + id); + if (checkStatus == null || checkStatus.equals(SECURITY_CHECK_NOT_PASSED)) { + log.debug("===>LOGIN PAGE: there is no auth obj in session or accessing login page before login succeed, auth obj created. session id: " + id); session.setAttribute(AUTH_OBJECT_NAME, SECURITY_CHECK_NOT_PASSED); - response.sendRedirect(WELCOME_PAGE); - return true; - } else if (checkStatus.equals(SECURITY_CHECK_NOT_PASSED)) { - log.debug("===>LOGIN PAGE: accessing login page before login succeed, display login page. session id: "+ id); - //set local information for login page. Because login.jsp does not pass thru any filters. try { LocaleFilter filter = new LocaleFilter(); filter.doFilter(request, response, null); 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.32 -r1.32.6.1 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 29 Nov 2006 23:48:14 -0000 1.32 +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 12 Mar 2007 07:19:20 -0000 1.32.6.1 @@ -97,6 +97,14 @@ setAdminLinks(request); } + // check if user is flagged as needing to change their password + User loggedInUser = getService().getUserByLogin(request.getRemoteUser()); + if (loggedInUser.getChangePassword()!=null) { + if (loggedInUser.getChangePassword()) { + return mapping.findForward("password"); + } + } + String tab = WebUtil.readStrParam(request, "tab", true); if (StringUtils.equals(tab, "profile")) { return mapping.findForward("profile"); @@ -122,7 +130,6 @@ organisations.addAll(getService().getOrganisationsByTypeAndStatus(OrganisationType.COURSE_TYPE,OrganisationState.ACTIVE)); } for (Organisation org:organisations) { - log.debug("archived date: "+org.getArchivedDate()); List roles = new ArrayList(); roles.add(Role.ROLE_SYSADMIN); List userOrganisationRoles = getService().getUserOrganisationRoles(org.getOrganisationId(),request.getRemoteUser()); @@ -145,7 +152,6 @@ userOrganisations.addAll(getService().getUserOrganisationsForUserByTypeAndStatus(request.getRemoteUser(),OrganisationType.COURSE_TYPE,OrganisationState.ACTIVE)); } for (UserOrganisation userOrganisation: userOrganisations) { - log.debug("archived date: "+userOrganisation.getOrganisation().getArchivedDate()); List roles = new ArrayList(); for(Object userOrganisationRole:userOrganisation.getUserOrganisationRoles()){ roles.add(((UserOrganisationRole)userOrganisationRole).getRole().getRoleId()); @@ -160,6 +166,7 @@ orgBeans.add(iob); } } + Collections.sort(orgBeans); request.setAttribute("orgBeans",orgBeans); if(state.equals(OrganisationState.ACTIVE)) return mapping.findForward("main"); @@ -274,13 +281,22 @@ if(organisation.getOrganisationState().getOrganisationStateId().equals(state)){ List classRoles = new ArrayList(); List userOrganisationRoles = getService().getUserOrganisationRoles(organisation.getOrganisationId(),username); + // don't list the subgroup if user is not a member, and not a group admin/manager + if (userOrganisationRoles==null || userOrganisationRoles.isEmpty()) { + if (!contains(roles,Role.ROLE_GROUP_ADMIN) && + !contains(roles,Role.ROLE_GROUP_MANAGER) && + !contains(roles,Role.ROLE_SYSADMIN)) { + continue; + } + } for(UserOrganisationRole userOrganisationRole:userOrganisationRoles){ classRoles.add(userOrganisationRole.getRole().getRoleId()); } if(contains(roles,Role.ROLE_GROUP_MANAGER)) classRoles.add(Role.ROLE_GROUP_MANAGER); childOrgBeans.add(createOrgBean(organisation,classRoles,username,isSysAdmin)); } } + Collections.sort(childOrgBeans); orgBean.setChildIndexOrgBeans(childOrgBeans); } return orgBean; Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexOrgBean.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/Attic/IndexOrgBean.java,v diff -u -r1.3 -r1.3.6.1 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexOrgBean.java 29 Nov 2006 23:48:14 -0000 1.3 +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexOrgBean.java 12 Mar 2007 07:19:20 -0000 1.3.6.1 @@ -26,6 +26,8 @@ import java.util.Date; import java.util.List; +import org.lamsfoundation.lams.usermanagement.Role; + /** * @version * @@ -37,7 +39,7 @@ * * Created at 10:01:23 on 14/06/2006 */ -public class IndexOrgBean { +public class IndexOrgBean implements Comparable { private String name; private Date archivedDate; @@ -126,5 +128,10 @@ public void setArchivedDate(Date archivedDate) { this.archivedDate = archivedDate; } + + public int compareTo(Object indexOrgBean){ + IndexOrgBean b = (IndexOrgBean)indexOrgBean; + return name.compareTo(b.getName()); + } } Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java,v diff -u -r1.4 -r1.4.6.1 --- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java 29 Nov 2006 03:59:17 -0000 1.4 +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java 12 Mar 2007 07:19:20 -0000 1.4.6.1 @@ -142,8 +142,8 @@ Organisation org = orgMap.getOrganisation(); IUserManagementService userManagementService = integrationService.getService(); UserOrganisation uo = userManagementService.getUserOrganisation(user.getUserId(), org.getOrganisationId()); - //GROUP_MANAGER role is to enable user to see the course's workspace folder - Integer[] roleIds = new Integer[]{Role.ROLE_AUTHOR,Role.ROLE_GROUP_MANAGER,Role.ROLE_LEARNER}; + // make sure external user has minimal set of roles, i.e. learner + Integer[] roleIds = new Integer[]{Role.ROLE_LEARNER}; //we have to assign all the roles to the external user here, because once the user logged in, the roles //are cached in JBoss, all the calls of request.isUserInRole() will be based on the cached roles Map properties = new HashMap(); Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java,v diff -u -r1.10 -r1.10.6.1 --- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java 21 Nov 2006 05:09:49 -0000 1.10 +++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java 12 Mar 2007 07:19:20 -0000 1.10.6.1 @@ -119,6 +119,7 @@ { //service.updatePassword(login, HashUtil.sha1(password)); user.setPassword(HashUtil.sha1(password)); + user.setChangePassword(false); service.save(user); // make 'password changed' audit log entry Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/LAMSMultiLinesTextareaTag.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/LAMSMultiLinesTextareaTag.java,v diff -u -r1.3 -r1.3.2.1 --- lams_central/src/java/org/lamsfoundation/lams/web/tag/LAMSMultiLinesTextareaTag.java 2 Jan 2007 00:37:29 -0000 1.3 +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/LAMSMultiLinesTextareaTag.java 12 Mar 2007 07:19:20 -0000 1.3.2.1 @@ -85,6 +85,10 @@ keys.clear(); values.clear(); + // reset id and onChange as these are optional, and if they aren't included and there is more than one + // instance of this tag on the page, then the same values are used for all tags. + this.setId(null); + this.setOnchange(null); return super.doEndTag(); } Index: lams_central/src/java/org/lamsfoundation/lams/webservice/Register.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/Register.java,v diff -u -r1.2 -r1.2.2.1 --- lams_central/src/java/org/lamsfoundation/lams/webservice/Register.java 3 Jan 2007 01:29:31 -0000 1.2 +++ lams_central/src/java/org/lamsfoundation/lams/webservice/Register.java 12 Mar 2007 07:19:20 -0000 1.2.2.1 @@ -16,4 +16,32 @@ String serverId, String datetime, String hash) throws java.rmi.RemoteException; + + public boolean addUserToGroup( + String username, + String serverId, + String datetime, + String hash, + Boolean isTeacher) throws java.rmi.RemoteException; + + public boolean addUserToGroupLessons( + String username, + String serverId, + String datetime, + String hash) throws java.rmi.RemoteException; + + public boolean addUserToSubgroup( + String username, + String orgid, + String serverId, + String datetime, + String hash, + Boolean isTeacher) throws java.rmi.RemoteException; + + public boolean addUserToSubgroupLessons( + String username, + String orgId, + String serverId, + String datetime, + String hash) throws java.rmi.RemoteException; } Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java,v diff -u -r1.8 -r1.8.2.1 --- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java 3 Jan 2007 01:29:31 -0000 1.8 +++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java 12 Mar 2007 07:19:20 -0000 1.8.2.1 @@ -10,6 +10,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import java.util.Set; import javax.servlet.http.HttpServlet; @@ -55,8 +56,15 @@ ((HttpServlet) context.getProperty(HTTPConstants.MC_HTTP_SERVLET)) .getServletContext()).getBean("integrationService"); - public boolean createUser(String username, String password, String firstName, String lastName, - String email, String serverId, String datetime, String hash) throws java.rmi.RemoteException { + public boolean createUser( + String username, + String password, + String firstName, + String lastName, + String email, + String serverId, + String datetime, + String hash) throws java.rmi.RemoteException { try { ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId); Authenticator.authenticate(extServer, datetime, hash); @@ -86,29 +94,125 @@ user.setHtmlTheme(htmlTheme); } service.save(user); + return true; + } catch (Exception e) { + log.debug(e.getMessage(), e); + throw new java.rmi.RemoteException(e.getMessage()); + } + } + + public boolean addUserToGroup( + String username, + String serverId, + String datetime, + String hash, + Boolean isTeacher) throws java.rmi.RemoteException { + try { + ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId); + Authenticator.authenticate(extServer, datetime, hash); + User user = service.getUserByLogin(username); Organisation org = extServer.getOrganisation(); - addMemberships(user, org); + addMemberships(user, org, isTeacher); + return true; + } catch (Exception e) { + log.debug(e.getMessage(), e); + throw new java.rmi.RemoteException(e.getMessage()); + } + } + + public boolean addUserToSubgroup( + String username, + String orgId, + String serverId, + String datetime, + String hash, + Boolean isTeacher) throws java.rmi.RemoteException { + try { + ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId); + Authenticator.authenticate(extServer, datetime, hash); + User user = service.getUserByLogin(username); + Organisation group = extServer.getOrganisation(); + Organisation subgroup = (Organisation)service.findById(Organisation.class, new Integer(orgId)); + Set children = group.getChildOrganisations(); + Iterator iter = children.iterator(); + while (iter.hasNext()) { + Organisation child = (Organisation)iter.next(); + if (child.getOrganisationId().equals(subgroup.getOrganisationId())) { + addMemberships(user, subgroup, isTeacher); + return true; + } + } + return false; + } catch (Exception e) { + log.debug(e.getMessage(), e); + throw new java.rmi.RemoteException(e.getMessage()); + } + } + + public boolean addUserToGroupLessons( + String username, + String serverId, + String datetime, + String hash) throws java.rmi.RemoteException { + try { + ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId); + Authenticator.authenticate(extServer, datetime, hash); + User user = service.getUserByLogin(username); + Organisation org = extServer.getOrganisation(); addUserToLessons(user, org); return true; } catch (Exception e) { log.debug(e.getMessage(), e); throw new java.rmi.RemoteException(e.getMessage()); } } - + + public boolean addUserToSubgroupLessons( + String username, + String orgId, + String serverId, + String datetime, + String hash) throws java.rmi.RemoteException { + try { + ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId); + Authenticator.authenticate(extServer, datetime, hash); + User user = service.getUserByLogin(username); + Organisation group = extServer.getOrganisation(); + + Organisation subgroup = (Organisation)service.findById(Organisation.class, new Integer(orgId)); + Set children = group.getChildOrganisations(); + Iterator iter = children.iterator(); + while (iter.hasNext()) { + Organisation child = (Organisation)iter.next(); + if (child.getOrganisationId().equals(subgroup.getOrganisationId())) { + addUserToLessons(user, subgroup); + return true; + } + } + return false; + } catch (Exception e) { + log.debug(e.getMessage(), e); + throw new java.rmi.RemoteException(e.getMessage()); + } + } + private SupportedLocale getLocale() { String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); return service .getSupportedLocale(defaultLocale.substring(0, 2), defaultLocale.substring(3)); } @SuppressWarnings("unchecked") - private void addMemberships(User user, Organisation org) { + private void addMemberships(User user, Organisation org, Boolean isTeacher) { log.debug("adding memberships for user " + user.getUserId() + " in " + org.getName()); UserOrganisation uo = new UserOrganisation(user, org); service.save(uo); - Integer[] roles = new Integer[] { Role.ROLE_AUTHOR, Role.ROLE_MONITOR, - Role.ROLE_GROUP_MANAGER, Role.ROLE_LEARNER }; + Integer[] roles; + if (isTeacher) { + roles = new Integer[] { Role.ROLE_AUTHOR, Role.ROLE_MONITOR, Role.ROLE_LEARNER }; + } else { + roles = new Integer[] { Role.ROLE_LEARNER }; + } for (Integer roleId : roles) { UserOrganisationRole uor = new UserOrganisationRole(uo, (Role) service.findById( Role.class, roleId)); Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingSkeleton.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingSkeleton.java,v diff -u -r1.2 -r1.2.2.1 --- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingSkeleton.java 3 Jan 2007 01:29:31 -0000 1.2 +++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingSkeleton.java 12 Mar 2007 07:19:20 -0000 1.2.2.1 @@ -7,6 +7,7 @@ package org.lamsfoundation.lams.webservice; + public class RegisterServiceSoapBindingSkeleton implements org.lamsfoundation.lams.webservice.Register, org.apache.axis.wsdl.Skeleton { private org.lamsfoundation.lams.webservice.Register impl; private static java.util.Map _myOperations = new java.util.Hashtable(); @@ -27,7 +28,15 @@ } static { - org.apache.axis.description.OperationDesc _oper; + addCreateUser(); + addAddUserToGroup(); + addAddUserToGroupLessons(); + addAddUserToSubgroup(); + addAddUserToSubgroupLessons(); + } + + private static void addCreateUser() { + org.apache.axis.description.OperationDesc _oper; org.apache.axis.description.FaultDesc _fault; org.apache.axis.description.ParameterDesc [] _params; _params = new org.apache.axis.description.ParameterDesc [] { @@ -50,6 +59,94 @@ } ((java.util.List)_myOperations.get("createUser")).add(_oper); } + + private static void addAddUserToGroup() { + org.apache.axis.description.OperationDesc _oper; + org.apache.axis.description.FaultDesc _fault; + org.apache.axis.description.ParameterDesc [] _params; + _params = new org.apache.axis.description.ParameterDesc [] { + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hash"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "isTeacher"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "boolean"), java.lang.Boolean.class, false, false), + }; + _oper = new org.apache.axis.description.OperationDesc("addUserToGroup", _params, new javax.xml.namespace.QName("", "addUserToGroupReturn")); + _oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); + _oper.setElementQName(new javax.xml.namespace.QName("", "addUserToGroup")); + _oper.setSoapAction(""); + _myOperationsList.add(_oper); + if (_myOperations.get("addUserToGroup") == null) { + _myOperations.put("addUserToGroup", new java.util.ArrayList()); + } + ((java.util.List)_myOperations.get("addUserToGroup")).add(_oper); + } + + private static void addAddUserToGroupLessons() { + org.apache.axis.description.OperationDesc _oper; + org.apache.axis.description.FaultDesc _fault; + org.apache.axis.description.ParameterDesc [] _params; + _params = new org.apache.axis.description.ParameterDesc [] { + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hash"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + }; + _oper = new org.apache.axis.description.OperationDesc("addUserToGroupLessons", _params, new javax.xml.namespace.QName("", "addUserToGroupLessonsReturn")); + _oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); + _oper.setElementQName(new javax.xml.namespace.QName("", "addUserToGroupLessons")); + _oper.setSoapAction(""); + _myOperationsList.add(_oper); + if (_myOperations.get("addUserToGroupLessons") == null) { + _myOperations.put("addUserToGroupLessons", new java.util.ArrayList()); + } + ((java.util.List)_myOperations.get("addUserToGroupLessons")).add(_oper); + } + + private static void addAddUserToSubgroup() { + org.apache.axis.description.OperationDesc _oper; + org.apache.axis.description.FaultDesc _fault; + org.apache.axis.description.ParameterDesc [] _params; + _params = new org.apache.axis.description.ParameterDesc [] { + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "orgId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hash"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "isTeacher"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "boolean"), java.lang.Boolean.class, false, false), + }; + _oper = new org.apache.axis.description.OperationDesc("addUserToSubgroup", _params, new javax.xml.namespace.QName("", "addUserToSubgroupReturn")); + _oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); + _oper.setElementQName(new javax.xml.namespace.QName("", "addUserToSubgroup")); + _oper.setSoapAction(""); + _myOperationsList.add(_oper); + if (_myOperations.get("addUserToSubgroup") == null) { + _myOperations.put("addUserToSubgroup", new java.util.ArrayList()); + } + ((java.util.List)_myOperations.get("addUserToSubgroup")).add(_oper); + } + + private static void addAddUserToSubgroupLessons() { + org.apache.axis.description.OperationDesc _oper; + org.apache.axis.description.FaultDesc _fault; + org.apache.axis.description.ParameterDesc [] _params; + _params = new org.apache.axis.description.ParameterDesc [] { + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "orgId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hash"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), + }; + _oper = new org.apache.axis.description.OperationDesc("addUserToSubgroupLessons", _params, new javax.xml.namespace.QName("", "addUserToSubgroupLessonsReturn")); + _oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); + _oper.setElementQName(new javax.xml.namespace.QName("", "addUserToSubgroupLessons")); + _oper.setSoapAction(""); + _myOperationsList.add(_oper); + if (_myOperations.get("addUserToSubgroupLessons") == null) { + _myOperations.put("addUserToSubgroupLessons", new java.util.ArrayList()); + } + ((java.util.List)_myOperations.get("addUserToSubgroupLessons")).add(_oper); + } public RegisterServiceSoapBindingSkeleton() { this.impl = new org.lamsfoundation.lams.webservice.RegisterServiceSoapBindingImpl(); @@ -58,10 +155,30 @@ public RegisterServiceSoapBindingSkeleton(org.lamsfoundation.lams.webservice.Register impl) { this.impl = impl; } + public boolean createUser(String username, String password, String firstName, String lastName, String email, String serverId, String datetime, String hash) throws java.rmi.RemoteException { boolean ret = impl.createUser(username, password, firstName, lastName, email, serverId, datetime, hash); return ret; } + + public boolean addUserToGroup(String username, String serverId, String datetime, String hash, Boolean isTeacher) throws java.rmi.RemoteException { + boolean ret = impl.addUserToGroup(username, serverId, datetime, hash, isTeacher); + return ret; + } + + public boolean addUserToGroupLessons(String username, String serverId, String datetime, String hash) throws java.rmi.RemoteException { + boolean ret = impl.addUserToGroupLessons(username, serverId, datetime, hash); + return ret; + } + public boolean addUserToSubgroup(String username, String orgId, String serverId, String datetime, String hash, Boolean isTeacher) throws java.rmi.RemoteException { + boolean ret = impl.addUserToSubgroup(username, orgId, serverId, datetime, hash, isTeacher); + return ret; + } + + public boolean addUserToSubgroupLessons(String username, String orgId, String serverId, String datetime, String hash) throws java.rmi.RemoteException { + boolean ret = impl.addUserToSubgroupLessons(username, orgId, serverId, datetime, hash); + return ret; + } } Index: lams_central/web/editprofile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v diff -u -r1.8 -r1.8.6.1 --- lams_central/web/editprofile.jsp 17 Nov 2006 08:17:19 -0000 1.8 +++ lams_central/web/editprofile.jsp 12 Mar 2007 07:24:33 -0000 1.8.6.1 @@ -29,63 +29,63 @@ : - + *: - + *: - + *: - + : - + : - + : - + : - + : - + : - + : - + : - + : - + : - + : - + : Index: lams_central/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/lams.tld,v diff -u -r1.33 -r1.33.2.1 --- lams_central/web/WEB-INF/lams.tld 6 Dec 2006 03:52:50 -0000 1.33 +++ lams_central/web/WEB-INF/lams.tld 12 Mar 2007 07:24:32 -0000 1.33.2.1 @@ -13,56 +13,28 @@ - Converts role name into form usable as message resources key - Converts role name into form usable as message resources key + Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/ + Base URL for the current web app - role - org.lamsfoundation.lams.web.tag.RoleTag + WebAppURL + org.lamsfoundation.lams.web.tag.WebAppURLTag empty - - Converts role name into form usable as message resources key - role - true - - true - - - - Output the Server URL as defined in the lams.xml configuration file. - LAMS URL + Output a random number for the learner and passon flash movies to communicate directly. + generate unique ID - LAMSURL - org.lamsfoundation.lams.web.tag.LAMSURLTag + generateID + org.lamsfoundation.lams.web.tag.GenerateIDTag empty - - - - converts text from \n or \r\n to before rendering - converts text from \n or \r\n to before rendering - - - out - org.lamsfoundation.lams.web.tag.MultiLinesOutputTag - empty - - converts text from \n or \r\n to before rendering - value - true - - true - - - - converts text from \n or \r\n to before rendering - escapeXml + Output a random number for the learner and passon flash movies to communicate directly. + id false true @@ -72,18 +44,18 @@ - Render html tag with direction and language - Render html tag with direction and language + Converts role name into form usable as message resources key + Converts role name into form usable as message resources key - html - org.lamsfoundation.lams.web.tag.HtmlTag - JSP + role + org.lamsfoundation.lams.web.tag.RoleTag + empty - Render html tag with direction and language - xhtml - false + Converts role name into form usable as message resources key + role + true true @@ -128,23 +100,42 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID + Output the Server URL as defined in the lams.xml configuration file. + LAMS URL - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag + LAMSURL + org.lamsfoundation.lams.web.tag.LAMSURLTag empty + + + + Output stylesheet based on the user preferences. + User's chosen stylesheet + + + css + org.lamsfoundation.lams.web.tag.CssTag + empty + - Output a random number for the learner and passon flash movies to communicate directly. - id + Output stylesheet based on the user preferences. + localLinkPath false true + + Output stylesheet based on the user preferences. + style + false + true + + + @@ -168,36 +159,45 @@ - Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/ - Base URL for the current web app + Render html tag with direction and language + Render html tag with direction and language - WebAppURL - org.lamsfoundation.lams.web.tag.WebAppURLTag - empty + html + org.lamsfoundation.lams.web.tag.HtmlTag + JSP + + Render html tag with direction and language + xhtml + false + + true + + + - Output stylesheet based on the user preferences. - User's chosen stylesheet + converts text from \n or \r\n to before rendering + converts text from \n or \r\n to before rendering - css - org.lamsfoundation.lams.web.tag.CssTag + out + org.lamsfoundation.lams.web.tag.MultiLinesOutputTag

empty

- Output stylesheet based on the user preferences. - localLinkPath - false + converts text from \n or \r\n to before rendering + value + true true - Output stylesheet based on the user preferences. - style + converts text from \n or \r\n to before rendering + escapeXml false true @@ -434,5 +434,35 @@ ImgButtonWrapper /WEB-INF/tags/ImgButtonWrapper.tag + + textarea + org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag + JSP + true + + Render text exactly same as original input, which even won't escape the input HTML tag. + + + + + name + true + true + + + + + id + false + true + + + + + onchange + false + true + + Index: lams_central/web/WEB-INF/struts/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/struts/Attic/struts-config.xml,v diff -u -r1.20 -r1.20.2.1 --- lams_central/web/WEB-INF/struts/struts-config.xml 20 Dec 2006 04:53:33 -0000 1.20 +++ lams_central/web/WEB-INF/struts/struts-config.xml 12 Mar 2007 07:24:19 -0000 1.20.2.1 @@ -297,7 +297,7 @@ /> Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/all_learning_designs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/all_library_details.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.15.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/configData.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.22.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/defaultTheme.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learning_design.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/limeTheme.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/rubyTheme.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/ar_JO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/bg_BG_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/cy_GB_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/da_DK_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/de_DE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/el_GR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.11.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/es_ES_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/fr_FR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/it_IT_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.10.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/ko_KR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/mi_NZ_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/nl_BE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.10.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/no_NO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.9.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/pl_PL_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/pt_BR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.10.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/sv_SE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/th_TH_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/vi_VN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/zh_CN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/zh_TW_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/ar_JO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/cy_GB_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/da_DK_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/de_DE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/el_GR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.14.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/en_AU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.15.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/en_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/es_ES_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/fr_FR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/it_IT_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/ko_KR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/mi_NZ_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/nl_BE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/no_NO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/pl_PL_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/pt_BR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/ru_RU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/sv_SE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/vi_VN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/zh_CN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/ar_JO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/cy_GB_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/da_DK_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/de_DE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/el_GR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.9.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/es_ES_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/fr_FR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/it_IT_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.9.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/ko_KR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/mi_NZ_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.11.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/no_NO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/pl_PL_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/pt_BR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/sv_SE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/vi_VN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/zh_CN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/ar_JO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/cy_GB_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/da_DK_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/de_DE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/el_GR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.18.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/en_AU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.18.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/en_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/es_ES_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/fr_FR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/it_IT_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/ko_KR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/mi_NZ_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/nl_BE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/no_NO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/pl_PL_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/pt_BR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/ru_RU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/sv_SE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/vi_VN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/zh_CN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff?