Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/Call.java =================================================================== diff -u -rbe522daa5f74c45a552e71392fe59b94d4ed25bc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- TestHarness4LAMS2/src/org/lamsfoundation/testharness/Call.java (.../Call.java) (revision be522daa5f74c45a552e71392fe59b94d4ed25bc) +++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/Call.java (.../Call.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -45,6 +45,7 @@ import com.meterware.httpunit.WebForm; import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebResponse; +import com.meterware.httpunit.cookies.Cookie; import com.sun.net.ssl.HostnameVerifier; import com.sun.net.ssl.HttpsURLConnection; @@ -221,10 +222,10 @@ resp = wc.getResponse(req); end = System.currentTimeMillis(); } - + httpStatusCode = resp.getResponseCode(); if (httpStatusCode >= 400) { - log.debug("Got " + httpStatusCode + " HTTP code. Retrying call: " + callee); + Call.log.debug("Got " + httpStatusCode + " HTTP code. Retrying call: " + callee); resp = wc.getResponse(req); end = System.currentTimeMillis(); httpStatusCode = resp.getResponseCode(); @@ -233,19 +234,38 @@ throw new TestHarnessException(test.testName + " got HTTP code " + httpStatusCode); } } - + message = resp.getResponseMessage(); for (String headerFieldName : resp.getHeaderFieldNames()) { if (headerFieldName.equalsIgnoreCase("SET-COOKIE")) { + String cookieName = null; + String cookieValue = null; + String path = null; for (String headerFieldValue : resp.getHeaderFields(headerFieldName)) { String[] headerFieldSplit = headerFieldValue.split("=|;"); - String cookieName = headerFieldSplit[0]; - if ("JSESSIONID".equalsIgnoreCase(cookieName) && (wc.getCookieValue(cookieName) == null)) { - String cookieValue = headerFieldSplit[1]; - Call.log.debug("Manually setting cookie: " + cookieName + "=" + cookieValue); - wc.putCookie(cookieName, cookieValue); + for (int index = 0; index < headerFieldSplit.length; index++) { + String name = headerFieldSplit[index].trim(); + if (name.startsWith("JSESSIONID")) { + cookieName = headerFieldSplit[index]; + cookieValue = headerFieldSplit[index + 1].trim(); + } else if (name.equalsIgnoreCase("path")) { + path = headerFieldSplit[index + 1].trim(); + } } } + + String currentCookieValue = wc.getCookieValue(cookieName); + Cookie cookie = wc.getCookieDetails(cookieName); + String currentCookiePath = wc.getCookieDetails(cookieName).getPath(); + Call.log.debug("Cookie " + cookie.getName() + " value " + currentCookieValue + " (" + cookieValue + + ") and path " + currentCookiePath + " (" + path + ")"); + // either JSESSIONID or JSESSIONIDSSO + if ((cookieName != null) && currentCookiePath.equals(path) + && !cookieValue.equals(currentCookieValue)) { + Call.log.debug("Manually setting cookie " + cookieName + " with path " + path + " from value " + + currentCookieValue + " to " + cookieValue); + wc.putCookie(cookieName, cookieValue); + } } } Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_admin/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_admin/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_admin/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_admin/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_admin/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_admin/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_admin/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_admin/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_admin/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_build/build_base.xml =================================================================== diff -u -rde0533849e57e6955014df363e10ae75f9e3cea8 -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_build/build_base.xml (.../build_base.xml) (revision de0533849e57e6955014df363e10ae75f9e3cea8) +++ lams_build/build_base.xml (.../build_base.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -26,8 +26,8 @@ that are also present in lams_build/lib. --> - - + + @@ -203,7 +203,6 @@ - @@ -273,15 +272,7 @@ - - - ${ant.project.name}: Preparing SSO config file - - - - ${ant.project.name}: Building JAR @@ -293,7 +284,7 @@ + depends="_build-webdoclet, _build-manifest, _copy-language, _jsp-plaincopy, _jsp-precompile"> ${ant.project.name}: Building WAR Index: lams_build/common.properties =================================================================== diff -u -r9da35349a62686e5112d5be703c9047c48d88467 -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_build/common.properties (.../common.properties) (revision 9da35349a62686e5112d5be703c9047c48d88467) +++ lams_build/common.properties (.../common.properties) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -23,9 +23,6 @@ # which o/s related property file do you want? valid values "windows" or "unix" osPropertiesName=windows -# a servlet extension that pulls credentials from shared session and allows access -ssoClass=org.lamsfoundation.lams.integration.security.SsoConsumer - # To precompile JSP pages uncomment the property below # jsp.precompile=anyvalue Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -ra3249210e9a22e8f54ece275f8243a8f3f3e7217 -r0c0cbdac26679e47d5c48e045c30e5496e1f809b Binary files differ Index: lams_central/build.properties =================================================================== diff -u -r6ac0dd279c712feae12fadb39e06990c5e7ee2dd -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_central/build.properties (.../build.properties) (revision 6ac0dd279c712feae12fadb39e06990c5e7ee2dd) +++ lams_central/build.properties (.../build.properties) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -6,8 +6,4 @@ product.path.filesystem=org/lamsfoundation/lams/central # Project is a core one, not a Tool -product.core=true - -# a servlet extension that puts credentials into shared session to allows access for other modules -# overrides default setting in lams_build/common.properties -ssoClass=org.lamsfoundation.lams.integration.security.SsoProducer\norg.lamsfoundation.lams.integration.security.SsoConsumer \ No newline at end of file +product.core=true \ No newline at end of file Index: lams_central/build.xml =================================================================== diff -u -r9da35349a62686e5112d5be703c9047c48d88467 -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_central/build.xml (.../build.xml) (revision 9da35349a62686e5112d5be703c9047c48d88467) +++ lams_central/build.xml (.../build.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -34,7 +34,7 @@ + depends="_build-webdoclet, _build-manifest, _copy-war-resources, _copy-planner, _jsp-plaincopy, _jsp-precompile"> ${ant.project.name}: Building exploded WAR Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/mime-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/taglib-tag.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_central/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java =================================================================== diff -u -rfea1fd0181076357eaa2139840d25474a5e35d53 -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java (.../UniversalLoginModule.java) (revision fea1fd0181076357eaa2139840d25474a5e35d53) +++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java (.../UniversalLoginModule.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -48,7 +48,6 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.FailedLoginException; import javax.security.auth.login.LoginException; -import javax.servlet.http.HttpSession; import javax.sql.DataSource; import org.apache.log4j.Logger; @@ -64,8 +63,6 @@ import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; -import org.lamsfoundation.lams.web.session.SessionManager; -import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.HttpSessionManager; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.ApplicationContext; @@ -75,338 +72,315 @@ public class UniversalLoginModule extends UsernamePasswordLoginModule { - private static Logger log = Logger.getLogger(UniversalLoginModule.class); + private static Logger log = Logger.getLogger(UniversalLoginModule.class); - public UniversalLoginModule() { - } + public UniversalLoginModule() { + } - protected String dsJndiName; + protected String dsJndiName; - protected String rolesQuery; + protected String rolesQuery; - protected String principalsQuery; + protected String principalsQuery; - private IThemeService themeService; - private UserManagementService service; + private IThemeService themeService; + private UserManagementService service; - public void initialize(Subject subject, CallbackHandler callbackHandler, - Map sharedState, Map options) { - super.initialize(subject, callbackHandler, sharedState, options); - dsJndiName = (String) options.get("dsJndiName"); - principalsQuery = (String) options.get("principalsQuery"); - rolesQuery = (String) options.get("rolesQuery"); - } + @Override + public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) { + super.initialize(subject, callbackHandler, sharedState, options); + dsJndiName = (String) options.get("dsJndiName"); + principalsQuery = (String) options.get("principalsQuery"); + rolesQuery = (String) options.get("rolesQuery"); + } - protected boolean validatePassword(String inputPassword, - String expectedPassword) { - boolean isValid = false; - HttpSession sharedsession = SessionManager.getSession(); - if (inputPassword != null && sharedsession != null) { - // empty password not allowed - if (inputPassword.length() == 0) - return false; + @Override + protected boolean validatePassword(String inputPassword, String expectedPassword) { + boolean isValid = false; + if (inputPassword != null) { + // empty password not allowed + if (inputPassword.length() == 0) { + return false; + } - try { - String username = getUsername(); - log.debug("===> authenticating user: " + username); + try { + String username = getUsername(); + UniversalLoginModule.log.debug("===> authenticating user: " + username); - WebApplicationContext ctx = WebApplicationContextUtils - .getWebApplicationContext(HttpSessionManager - .getInstance().getServletContext()); + WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(HttpSessionManager + .getInstance().getServletContext()); - if (service == null) { - service = (UserManagementService) ctx - .getBean("userManagementService"); - } - User user = service.getUserByLogin(username); + if (service == null) { + service = (UserManagementService) ctx.getBean("userManagementService"); + } + User user = service.getUserByLogin(username); - if (themeService == null) { - themeService = (IThemeService) ctx.getBean("themeService"); - } + if (themeService == null) { + themeService = (IThemeService) ctx.getBean("themeService"); + } - // LDAP user provisioning - if (user == null) { - // provision a new user by checking ldap server - if (Configuration - .getAsBoolean(ConfigurationKeys.LDAP_PROVISIONING_ENABLED)) { - LdapService ldapService; - try { - ldapService = (LdapService) ctx - .getBean("ldapService"); - } catch (NoSuchBeanDefinitionException e) { - // LDEV-1937 - log - .error( - "NoSuchBeanDefinitionException while getting ldapService bean, will try another method...", - e); - ApplicationContext context = new ClassPathXmlApplicationContext( - "org/lamsfoundation/lams/usermanagement/ldapContext.xml"); - ldapService = (LdapService) context - .getBean("ldapService"); - } - log - .debug("===> LDAP provisioning is enabled, checking username against LDAP server..."); - LDAPAuthenticator ldap = new LDAPAuthenticator(); - isValid = ldap.authenticate(username, inputPassword); - if (isValid) { // create a new user - log - .info("===> Creating new user for LDAP username: " - + username); - if (ldapService.createLDAPUser(ldap.getAttrs())) { - user = service.getUserByLogin(username); - if (!ldapService.addLDAPUser(ldap.getAttrs(), - user.getUserId())) { - log.error("===> Couldn't add LDAP user: " - + username + " to organisation."); - } - } else { - log - .error("===> Couldn't create new user for LDAP username: " - + username); - return false; - } - } else { // didn't authenticate successfully with - // ldap - return false; - } - } else { - return false; - } + // LDAP user provisioning + if (user == null) { + // provision a new user by checking ldap server + if (Configuration.getAsBoolean(ConfigurationKeys.LDAP_PROVISIONING_ENABLED)) { + LdapService ldapService; + try { + ldapService = (LdapService) ctx.getBean("ldapService"); + } catch (NoSuchBeanDefinitionException e) { + // LDEV-1937 + UniversalLoginModule.log + .error("NoSuchBeanDefinitionException while getting ldapService bean, will try another method...", + e); + ApplicationContext context = new ClassPathXmlApplicationContext( + "org/lamsfoundation/lams/usermanagement/ldapContext.xml"); + ldapService = (LdapService) context.getBean("ldapService"); + } + UniversalLoginModule.log + .debug("===> LDAP provisioning is enabled, checking username against LDAP server..."); + LDAPAuthenticator ldap = new LDAPAuthenticator(); + isValid = ldap.authenticate(username, inputPassword); + if (isValid) { // create a new user + UniversalLoginModule.log.info("===> Creating new user for LDAP username: " + username); + if (ldapService.createLDAPUser(ldap.getAttrs())) { + user = service.getUserByLogin(username); + if (!ldapService.addLDAPUser(ldap.getAttrs(), user.getUserId())) { + UniversalLoginModule.log.error("===> Couldn't add LDAP user: " + username + + " to organisation."); } + } else { + UniversalLoginModule.log.error("===> Couldn't create new user for LDAP username: " + + username); + return false; + } + } else { // didn't authenticate successfully with + // ldap + return false; + } + } else { + return false; + } + } - // allow sysadmin to login as another user; in this case, the - // LAMS shared session - // will be present, allowing the following check to work - if (service.isUserSysAdmin()) { - isValid = true; - } + // allow sysadmin to login as another user; in this case, the + // LAMS shared session + // will be present, allowing the following check to work + if (service.isUserSysAdmin()) { + isValid = true; + } - // perform password checking according to user's authentication - // method - if (!isValid) { - String type = user.getAuthenticationMethod() - .getAuthenticationMethodType().getDescription(); - log.debug("===> authentication type: " + type); - if (AuthenticationMethodType.LDAP.equals(type)) { - LDAPAuthenticator authenticator = new LDAPAuthenticator(); - isValid = authenticator.authenticate(username, - inputPassword); - // if ldap user profile has updated, udpate user object - // for dto below - user = service.getUserByLogin(username); - } else if (AuthenticationMethodType.LAMS.equals(type)) { - DatabaseAuthenticator authenticator = new DatabaseAuthenticator( - dsJndiName, principalsQuery); - // if the password is not encrypted when sent from the - // jsp (e.g. when it is passed - // unencrypted to say, ldap) then encrypt it here when - // authenticating against local db - if (!Configuration - .getAsBoolean(ConfigurationKeys.LDAP_ENCRYPT_PASSWORD_FROM_BROWSER)) { - // try the passed in password first, - // LoginRequestServlet always passes in encrypted - // passwords - isValid = authenticator.authenticate(username, - inputPassword); - if (!isValid) { - inputPassword = HashUtil.sha1(inputPassword); - } - isValid = authenticator.authenticate(username, - inputPassword); - } else { - isValid = authenticator.authenticate(username, - inputPassword); - } - } else if (AuthenticationMethodType.WEB_AUTH.equals(type)) { - WebAuthAuthenticator authenticator = new WebAuthAuthenticator(); - isValid = authenticator.authenticate(username, - inputPassword); - } else { - log.error("===> Unexpected authentication type: " - + type); - return false; - } - } + // perform password checking according to user's authentication + // method + if (!isValid) { + String type = user.getAuthenticationMethod().getAuthenticationMethodType().getDescription(); + UniversalLoginModule.log.debug("===> authentication type: " + type); + if (AuthenticationMethodType.LDAP.equals(type)) { + LDAPAuthenticator authenticator = new LDAPAuthenticator(); + isValid = authenticator.authenticate(username, inputPassword); + // if ldap user profile has updated, udpate user object + // for dto below + user = service.getUserByLogin(username); + } else if (AuthenticationMethodType.LAMS.equals(type)) { + DatabaseAuthenticator authenticator = new DatabaseAuthenticator(dsJndiName, principalsQuery); + // if the password is not encrypted when sent from the + // jsp (e.g. when it is passed + // unencrypted to say, ldap) then encrypt it here when + // authenticating against local db + if (!Configuration.getAsBoolean(ConfigurationKeys.LDAP_ENCRYPT_PASSWORD_FROM_BROWSER)) { + // try the passed in password first, + // LoginRequestServlet always passes in encrypted + // passwords + isValid = authenticator.authenticate(username, inputPassword); + if (!isValid) { + inputPassword = HashUtil.sha1(inputPassword); + } + isValid = authenticator.authenticate(username, inputPassword); + } else { + isValid = authenticator.authenticate(username, inputPassword); + } + } else if (AuthenticationMethodType.WEB_AUTH.equals(type)) { + WebAuthAuthenticator authenticator = new WebAuthAuthenticator(); + isValid = authenticator.authenticate(username, inputPassword); + } else { + UniversalLoginModule.log.error("===> Unexpected authentication type: " + type); + return false; + } + } - // disabled users can't login; - // check after authentication to give non-db authentication - // methods - // a chance to update disabled flag - if (user.getDisabledFlag()) { - log.debug("===> user is disabled."); - return false; - } + // disabled users can't login; + // check after authentication to give non-db authentication + // methods + // a chance to update disabled flag + if (user.getDisabledFlag()) { + UniversalLoginModule.log.debug("===> user is disabled."); + return false; + } - // if login is valid, register userDTO into session. - if (isValid) { - UserDTO userDTO = user.getUserDTO(); + // if login is valid, register userDTO into session. + if (isValid) { + UserDTO userDTO = user.getUserDTO(); - // If the user's css theme has been deleted, use the default - // as fallback - CSSThemeBriefDTO userCSSTheme = userDTO.getHtmlTheme(); - if (userCSSTheme != null) { - boolean themeExists = false; - for (Theme theme : themeService.getAllCSSThemes()) { - if (userCSSTheme.getId().equals(theme.getThemeId())) { - themeExists = true; - break; - } - } + // If the user's css theme has been deleted, use the default + // as fallback + CSSThemeBriefDTO userCSSTheme = userDTO.getHtmlTheme(); + if (userCSSTheme != null) { + boolean themeExists = false; + for (Theme theme : themeService.getAllCSSThemes()) { + if (userCSSTheme.getId().equals(theme.getThemeId())) { + themeExists = true; + break; + } + } - if (!themeExists) { - userDTO.setHtmlTheme(new CSSThemeBriefDTO( - themeService.getDefaultCSSTheme())); - } - } + if (!themeExists) { + userDTO.setHtmlTheme(new CSSThemeBriefDTO(themeService.getDefaultCSSTheme())); + } + } - // If the user's flash theme has been deleted, use the - // default as fallback - CSSThemeBriefDTO userFlashTheme = userDTO.getFlashTheme(); - if (userFlashTheme != null) { - boolean themeExists = false; - for (Theme theme : themeService.getAllFlashThemes()) { - if (userFlashTheme.getId().equals( - theme.getThemeId())) { - themeExists = true; - break; - } - } + // If the user's flash theme has been deleted, use the + // default as fallback + CSSThemeBriefDTO userFlashTheme = userDTO.getFlashTheme(); + if (userFlashTheme != null) { + boolean themeExists = false; + for (Theme theme : themeService.getAllFlashThemes()) { + if (userFlashTheme.getId().equals(theme.getThemeId())) { + themeExists = true; + break; + } + } - if (!themeExists) { - userDTO.setFlashTheme(new CSSThemeBriefDTO( - themeService.getDefaultFlashTheme())); - } - } - - sharedsession.setAttribute(AttributeNames.USER, userDTO); - } - } catch (Exception e) { - log.error("===> exception: " + e, e); + if (!themeExists) { + userDTO.setFlashTheme(new CSSThemeBriefDTO(themeService.getDefaultFlashTheme())); } + } } - return isValid; + } catch (Exception e) { + UniversalLoginModule.log.error("Error while validating password", e); + } } + return isValid; + } - /** - * According to Lams's security policy, all the authorization must be done - * locally, in other word, through Lams database or other "local"(logically) - * data resource. - * - * @return Group[] containing the sets of roles - */ - protected Group[] getRoleSets() throws LoginException { - String username = getUsername(); - Connection conn = null; - HashMap setsMap = new HashMap(); - PreparedStatement ps = null; - ResultSet rs = null; + /** + * According to Lams's security policy, all the authorization must be done locally, in other word, through Lams + * database or other "local"(logically) data resource. + * + * @return Group[] containing the sets of roles + */ + @Override + protected Group[] getRoleSets() throws LoginException { + String username = getUsername(); + Connection conn = null; + HashMap setsMap = new HashMap(); + PreparedStatement ps = null; + ResultSet rs = null; - try { + try { - InitialContext ctx = new InitialContext(); - DataSource ds = (DataSource) ctx.lookup(this.dsJndiName); + InitialContext ctx = new InitialContext(); + DataSource ds = (DataSource) ctx.lookup(this.dsJndiName); - // log.debug("===> getRoleSets() called: " + dsJndiName + ": " + - // rolesQuery); - conn = ds.getConnection(); - // Get the user role names - ps = conn.prepareStatement(this.rolesQuery); - try { - ps.setString(1, username); - } catch (ArrayIndexOutOfBoundsException ignore) { - // The query may not have any parameters so just try it - } - rs = ps.executeQuery(); - if (rs.next() == false) { - if (getUnauthenticatedIdentity() == null) - throw new FailedLoginException( - "No matching username found in Roles"); - /* - * We are running with an unauthenticatedIdentity so create an - * empty Roles set and return. - */ - Group[] roleSets = { new SimpleGroup("Roles") }; - return roleSets; - } + // log.debug("===> getRoleSets() called: " + dsJndiName + ": " + + // rolesQuery); + conn = ds.getConnection(); + // Get the user role names + ps = conn.prepareStatement(this.rolesQuery); + try { + ps.setString(1, username); + } catch (ArrayIndexOutOfBoundsException ignore) { + // The query may not have any parameters so just try it + } + rs = ps.executeQuery(); + if (rs.next() == false) { + if (getUnauthenticatedIdentity() == null) { + throw new FailedLoginException("No matching username found in Roles"); + } + /* + * We are running with an unauthenticatedIdentity so create an + * empty Roles set and return. + */ + Group[] roleSets = { new SimpleGroup("Roles") }; + return roleSets; + } - ArrayList groupMembers = new ArrayList(); - do { - String name = rs.getString(1); - String groupName = rs.getString(2); - if (groupName == null || groupName.length() == 0) - groupName = "Roles"; - Group group = (Group) setsMap.get(groupName); - if (group == null) { - group = new SimpleGroup(groupName); - setsMap.put(groupName, group); - } + ArrayList groupMembers = new ArrayList(); + do { + String name = rs.getString(1); + String groupName = rs.getString(2); + if ((groupName == null) || (groupName.length() == 0)) { + groupName = "Roles"; + } + Group group = (Group) setsMap.get(groupName); + if (group == null) { + group = new SimpleGroup(groupName); + setsMap.put(groupName, group); + } - try { - Principal p; - // Assign minimal role if user has none - if (name == null) { - name = Role.LEARNER; - log.info("===> Found no roles"); - } - p = super.createIdentity(name); - if (!groupMembers.contains(name)) { - log.info("===> Assign user to role " + p.getName()); - group.addMember(p); - groupMembers.add(name); - } - if (name.equals(Role.SYSADMIN)) { - p = super.createIdentity(Role.AUTHOR); - log.info("===> Found " + name); - if (!groupMembers.contains(Role.AUTHOR)) { - log.info("===> Assign user to role " + Role.AUTHOR); - group.addMember(p); - groupMembers.add(Role.AUTHOR); - } - } - } catch (Exception e) { - log.debug("===> Failed to create principal: " + name, e); - } - } while (rs.next()); - } catch (NamingException ex) { - throw new LoginException(ex.toString(true)); - } catch (SQLException ex) { - super.log.error("SQL failure", ex); - throw new LoginException(ex.toString()); - } finally { - if (rs != null) { - try { - rs.close(); - } catch (SQLException e) { - } + try { + Principal p; + // Assign minimal role if user has none + if (name == null) { + name = Role.LEARNER; + UniversalLoginModule.log.info("===> Found no roles"); + } + p = super.createIdentity(name); + if (!groupMembers.contains(name)) { + UniversalLoginModule.log.info("===> Assign user to role " + p.getName()); + group.addMember(p); + groupMembers.add(name); + } + if (name.equals(Role.SYSADMIN)) { + p = super.createIdentity(Role.AUTHOR); + UniversalLoginModule.log.info("===> Found " + name); + if (!groupMembers.contains(Role.AUTHOR)) { + UniversalLoginModule.log.info("===> Assign user to role " + Role.AUTHOR); + group.addMember(p); + groupMembers.add(Role.AUTHOR); } - if (ps != null) { - try { - ps.close(); - } catch (SQLException e) { - } - } - if (conn != null) { - try { - conn.close(); - } catch (Exception ex) { - } - } + } + } catch (Exception e) { + UniversalLoginModule.log.debug("===> Failed to create principal: " + name, e); } - - Group[] roleSets = new Group[setsMap.size()]; - setsMap.values().toArray(roleSets); - return roleSets; + } while (rs.next()); + } catch (NamingException ex) { + throw new LoginException(ex.toString(true)); + } catch (SQLException ex) { + super.log.error("SQL failure", ex); + throw new LoginException(ex.toString()); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException e) { + } + } + if (ps != null) { + try { + ps.close(); + } catch (SQLException e) { + } + } + if (conn != null) { + try { + conn.close(); + } catch (Exception ex) { + } + } } - /** - * Overriden to return an empty password string as typically one cannot - * obtain a user's password. We also override the validatePassword so this - * is ok. - * - * @return and empty password String - */ - protected String getUsersPassword() throws LoginException { - return ""; - } + Group[] roleSets = new Group[setsMap.size()]; + setsMap.values().toArray(roleSets); + return roleSets; + } + /** + * Overriden to return an empty password string as typically one cannot obtain a user's password. We also override + * the validatePassword so this is ok. + * + * @return and empty password String + */ + @Override + protected String getUsersPassword() throws LoginException { + return ""; + } + } \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== diff -u -r4ab4ba6ef63a831648ca63ca4d91edd4c0fba55f -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 4ab4ba6ef63a831648ca63ca4d91edd4c0fba55f) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -438,9 +438,6 @@ HomeAction.log.debug("Need to log out user from lamscoomunity"); req.getSession().invalidate(); - // clear system shared session. - SessionManager.getSession().invalidate(); - // redirect to lamscommunity logout servlet to log out. String url = "http://lamscommunity.org/register/logout?return_url="; url += URLEncoder.encode(Configuration.get(ConfigurationKeys.SERVER_URL), "UTF8"); @@ -449,10 +446,6 @@ } else { req.getSession().invalidate(); - - // clear system shared session. - SessionManager.getSession().invalidate(); - return mapping.findForward("index"); } } Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java =================================================================== diff -u -r63bafc8f23a1ac3ba2388441c37f0f9bd20e8117 -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 63bafc8f23a1ac3ba2388441c37f0f9bd20e8117) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -544,7 +544,7 @@ boolean createdTemporarySession = false; if (ss == null) { // import requires a session containing the user details, so dummy it up here. - SessionManager.startSession(request, response); + SessionManager.startSession(request); ss = SessionManager.getSession(); ss.setAttribute(AttributeNames.USER, user.getUserDTO()); createdTemporarySession = true; Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r093df66baaeb89432c9e5a0351c8fb91cc4a13ac -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 093df66baaeb89432c9e5a0351c8fb91cc4a13ac) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -463,10 +463,7 @@ - 60 - + destroy-method="destroy" /> @@ -477,4 +474,4 @@ - + \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoConsumer.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -0,0 +1,133 @@ +/** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + */ +package org.lamsfoundation.lams.integration.security; + +import io.undertow.Handlers; +import io.undertow.server.HandlerWrapper; +import io.undertow.server.HttpHandler; +import io.undertow.server.HttpServerExchange; +import io.undertow.server.session.Session; +import io.undertow.servlet.ServletExtension; +import io.undertow.servlet.api.DeploymentInfo; +import io.undertow.servlet.handlers.ServletRequestContext; +import io.undertow.servlet.spec.HttpSessionImpl; + +import java.security.AccessController; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.apache.commons.lang.StringUtils; +import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.usermanagement.service.UserManagementService; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.lamsfoundation.lams.web.util.HttpSessionManager; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +/** + * Allows access to LAMS WARs if an user logged in. It puts user Account into shared session so SsoConsumer in other + * WARs can use it. + * + * @author Marcin Cieslak + * + */ +public class SsoHandler implements ServletExtension { + private static IUserManagementService userManagementService = null; + + protected static final String SESSION_KEY = "io.undertow.servlet.form.auth.redirect.location"; + + @Override + public void handleDeployment(final DeploymentInfo deploymentInfo, final ServletContext servletContext) { + // run when request and response were already parsed, but before security handlers + deploymentInfo.addOuterHandlerChainWrapper(new HandlerWrapper() { + @Override + public HttpHandler wrap(final HttpHandler handler) { + // just forward all requests except one for logging in + return Handlers.path().addPrefixPath("/", handler).addExactPath("/j_security_check", new HttpHandler() { + @Override + public void handleRequest(HttpServerExchange exchange) throws Exception { + ServletRequestContext context = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY); + HttpServletRequest request = (HttpServletRequest) context.getServletRequest(); + + // LoginRequestServlet (integrations) sets this parameter + String redirectURL = request.getParameter("redirectURL"); + if (!StringUtils.isBlank(redirectURL)) { + SsoHandler.handleRedirectBack(context, redirectURL); + } + + // store session so UniversalLoginModule can access it + HttpSession session = request.getSession(); + SessionManager.startSession(request); + HttpSessionManager.getInstance().setServletContext(session.getServletContext()); + // do the logging in UniversalLoginModule + handler.handleRequest(exchange); + SessionManager.endSession(); + + String login = request.getRemoteUser(); + // was the user authenticated? + if (login != null) { + // is there already correct DTO in the session? + UserDTO userDTO = (UserDTO) session.getAttribute(AttributeNames.USER); + if ((userDTO == null) || !userDTO.getLogin().equals(login)) { + User user = getUserManagementService(session.getServletContext()).getUserByLogin(login); + // user can be null for authentication methods other than LAMS DB + if (user != null) { + session.setAttribute(AttributeNames.USER, user.getUserDTO()); + } + } + } + } + }); + } + }); + } + + /** + * Notifies authentication mechanism where it should redirect after log in. Based on + * ServletFormAuthenticationMechanism method. + */ + protected static void handleRedirectBack(ServletRequestContext context, String redirectURL) { + HttpSessionImpl httpSession = context.getCurrentServletContext().getSession(context.getExchange(), false); + if (httpSession != null) { + Session session; + if (System.getSecurityManager() == null) { + session = httpSession.getSession(); + } else { + session = AccessController.doPrivileged(new HttpSessionImpl.UnwrapSessionAction(httpSession)); + } + + session.setAttribute(SsoHandler.SESSION_KEY, redirectURL); + } + } + + protected IUserManagementService getUserManagementService(ServletContext context) { + if (SsoHandler.userManagementService == null) { + WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(context); + SsoHandler.userManagementService = (UserManagementService) ctx.getBean("userManagementService"); + } + return SsoHandler.userManagementService; + } +} \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoProducer.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java =================================================================== diff -u -r606581007abbdaee5483777096f32ffac1c3e3eb -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java (.../UserDTO.java) (revision 606581007abbdaee5483777096f32ffac1c3e3eb) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java (.../UserDTO.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -23,6 +23,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.usermanagement.dto; +import java.io.Serializable; import java.util.Set; import java.util.TimeZone; @@ -32,8 +33,10 @@ /** * @author Manpreet Minhas */ -public class UserDTO { +public class UserDTO implements Serializable{ + private static final long serialVersionUID = 5299784226270953691L; + private Integer userID; private String firstName; private String lastName; Index: lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java =================================================================== diff -u -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java (.../CSSThemeUtil.java) (revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a) +++ lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java (.../CSSThemeUtil.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -40,10 +40,8 @@ public static String DEFAULT_FLASH_THEME = "default"; /** - * Will return a list of stylesheets for the current user. If the user does - * not have a specific stylesheet, then the default stylesheet will be - * included in this list. The default stylesheet will always be included in - * this list. + * Will return a list of stylesheets for the current user. If the user does not have a specific stylesheet, then the + * default stylesheet will be included in this list. The default stylesheet will always be included in this list. * * @return */ @@ -53,31 +51,35 @@ // Always have default as that defines everything. Other themes // define changes. - themeList.add(DEFAULT_HTML_THEME); + themeList.add(CSSThemeUtil.DEFAULT_HTML_THEME); boolean userThemeFound = false; HttpSession ss = SessionManager.getSession(); if (ss != null) { - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + UserDTO user = null; + try { + user = (UserDTO) ss.getAttribute(AttributeNames.USER); + } catch (IllegalStateException e) { + // session was invalidated, normal situation so do not show any error + } if (user != null) { CSSThemeBriefDTO theme = user.getHtmlTheme(); if (theme != null) { userThemeFound = true; String themeName = theme.getName(); - if (themeName != null && !isLAMSDefaultTheme(themeName)) { + if ((themeName != null) && !CSSThemeUtil.isLAMSDefaultTheme(themeName)) { themeList.add(theme.getName()); } } } - } // if we haven't got a user theme, we are probably on the login page // so we'd better include the default server theme (if it isn't the LAMS default theme if (!userThemeFound) { String serverDefaultTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME); - if (serverDefaultTheme != null && !serverDefaultTheme.equals(DEFAULT_HTML_THEME)) { + if ((serverDefaultTheme != null) && !serverDefaultTheme.equals(CSSThemeUtil.DEFAULT_HTML_THEME)) { themeList.add(serverDefaultTheme); } } @@ -103,6 +105,6 @@ // Is this theme the LAMS basic theme, which must always be included on a web page? // This is NOT the server default theme - which may be a custom theme. public static boolean isLAMSDefaultTheme(String themeName) { - return themeName.equals(DEFAULT_HTML_THEME); + return themeName.equals(CSSThemeUtil.DEFAULT_HTML_THEME); } } Index: lams_common/src/java/org/lamsfoundation/lams/web/session/LoginFormAuthenticator.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_common/src/java/org/lamsfoundation/lams/web/session/LoginFormAuthenticator.java (.../LoginFormAuthenticator.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/web/session/LoginFormAuthenticator.java (.../LoginFormAuthenticator.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -47,7 +47,7 @@ //only when URI is j_security_check, execute the shared session initialize. //Otherwise, the shared session initializtion will run in Filter. if(uri.endsWith("j_security_check")){ - SessionManager.startSession(request,response); + SessionManager.startSession(request); result = super.authenticate(request, response, config); SessionManager.endSession(); }else Index: lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java =================================================================== diff -u -r64ff024c2b81e5d3f75ed1b3f098aa0581aea6d8 -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java (.../SessionManager.java) (revision 64ff024c2b81e5d3f75ed1b3f098aa0581aea6d8) +++ lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java (.../SessionManager.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -23,553 +23,65 @@ /* $$Id$$ */ package org.lamsfoundation.lams.web.session; -import java.util.Enumeration; -import java.util.Iterator; import java.util.Map; -import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionBindingListener; -import javax.servlet.http.HttpSessionContext; -import org.apache.log4j.Logger; -import org.hibernate.id.UUIDHexGenerator; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; - -/** - * - * @author Steve.Ni - * - * @version $Revision$ - */ public class SessionManager { - - private static final Logger log = Logger.getLogger(SessionManager.class); - // singleton - private static SessionManager sessionMgr; - // KEY: sessionId, each session will have an identified id. VALUE: SessionImpl instance, which contains - // true session key/value pairs. - private Map sessionContainer = new ConcurrentHashMap(); - // Save current session id + private static SessionManager sessionManager; + private static final Map sessionContainer = new ConcurrentHashMap(); private ThreadLocal currentSessionIdContainer = new ThreadLocal(); - // The system monitoring thread instance - private Monitor monitor; - // The sleep time in seconds period to monitoring the thread. - // This attribute could be set in spring context.xml. - private short monitorPeriod = 20; - /** - * Get the singleton instance of this class. - * - * @return - */ - private static SessionManager getInstance() { - if (SessionManager.sessionMgr == null) { - SessionManager.log.error("init SessionManager failed"); - } - - return SessionManager.sessionMgr; - } - - /** * Get system level HttpSession by current session id. - * - * @return HttpSession instanceof org.lamsfoundation.lams.systemsession.SessionManager#SessionImpl */ public static HttpSession getSession() { - String sessionId = SessionManager.getInstance().currentSessionIdContainer.get(); + String sessionId = SessionManager.sessionManager.currentSessionIdContainer.get(); return SessionManager.getSession(sessionId); } /** * Get system session by given session id. - * - * @param sessionId - * @return system session. Return an null if the given sessionid can not map to an existed session. */ public static HttpSession getSession(String sessionId) { - if (sessionId == null) { - SessionManager.log.debug("Failed on finding current system session with null sessionId"); - return null; - } - return SessionManager.getInstance().sessionContainer.get(sessionId); - + return sessionId == null ? null : SessionManager.sessionContainer.get(sessionId); } - static void createSession(String sessionId) { - // initialize a new one - HttpSession session = SessionManager.getInstance().new SessionImpl(sessionId); - SessionManager.getInstance().sessionContainer.put(sessionId, session); - } - /** - * Return SessionVisitor of currentSessionId. An internal method, only available - * in package. - * - * @return - */ - static SessionVisitor getSessionVisitor() { - return (SessionVisitor) SessionManager.getSession(); - } - - /** - * An internal method, only available in package. - * - * @param currentSessionId - */ - static void setCurrentSessionId(String currentSessionId) { - SessionManager.getInstance().currentSessionIdContainer.set(currentSessionId); - } - - /** * This class initialize method called by Spring framework. */ public void init() { - if (SessionManager.sessionMgr == null) { + if (SessionManager.sessionManager == null) { // only start once - SessionManager.sessionMgr = this; - if (monitorPeriod > 0) { - monitor = new Monitor(); - monitor.start(); - } + SessionManager.sessionManager = this; } } /** * This class destroy method called by Spring framework. */ public void destroy() { - if (monitor != null) { - SessionManager.sessionMgr = null; - monitor.stop(); - monitor = null; - } - + SessionManager.sessionManager = null; } - public short getMonitorPeriod() { - return monitorPeriod; - } - - public void setMonitorPeriod(short monitorPeriod) { - this.monitorPeriod = monitorPeriod; - } - /** - * Start a session for current ServletRequest and SerlvetResponse. If session does not exist, then create a new - * session. If it exists, just using current session. - * - * @param req - * @param res + * Proxy to a HTTP session. */ - public static void startSession(ServletRequest req, ServletResponse res) { - Cookie ssoCookie = SessionManager.findCookie((HttpServletRequest) req, SystemSessionFilter.SSO_SESSION_COOKIE); - String currentSessionId = null; - if (ssoCookie != null) { - currentSessionId = ssoCookie.getValue(); - Object obj = SessionManager.getSession(currentSessionId); - // log.debug(ssoCookie.getName() + " cookie exists, value " + currentSessionId); - // if cookie exists, but session does not - usually means session expired. - // delete the cookie first and set it to null in order to create a new one - if (obj == null) { - SessionManager.log.debug(SystemSessionFilter.SSO_SESSION_COOKIE + " " + currentSessionId - + " cookie exists, but corresponding session doesn't exist, removing cookie"); - SessionManager.removeCookie((HttpServletResponse) res, SystemSessionFilter.SSO_SESSION_COOKIE); - ssoCookie = null; - } - } - if (ssoCookie == null) { - currentSessionId = (String) new UUIDHexGenerator().generate(null, null); - // create new session and set it into cookie - SessionManager.createSession(currentSessionId); - ssoCookie = SessionManager.createCookie((HttpServletResponse) res, SystemSessionFilter.SSO_SESSION_COOKIE, - currentSessionId); - SessionManager.log.debug("==>Creating new " + SystemSessionFilter.SSO_SESSION_COOKIE + " - " - + ssoCookie.getValue()); - } - - Cookie cookie = SessionManager.findCookie((HttpServletRequest) req, SystemSessionFilter.SYS_SESSION_COOKIE); - if (cookie == null) { - // If a session exists in the request without a corresponding JSESSIONID cookie, assume - // user lost their cookie or closed their browser, so invalidate the session - HttpSession session = ((HttpServletRequest) req).getSession(false); - if (session != null) { - session.invalidate(); - } - } - - SessionManager.setCurrentSessionId(currentSessionId); - // reset session last access time - SessionVisitor sessionVisitor = SessionManager.getSessionVisitor(); - sessionVisitor.accessed(); + public static void startSession(HttpServletRequest request) { + HttpSession session = request.getSession(); + String sessionId = session.getId(); + SessionManager.sessionContainer.put(sessionId, session); + SessionManager.sessionManager.currentSessionIdContainer.set(sessionId); } /** * This method will reset current session id, so programs can not use getSession() to get current * session after this method is called. */ public static void endSession() { - SessionManager.setCurrentSessionId(null); + SessionManager.sessionManager.currentSessionIdContainer.set(null); } - - /** - * Find a cookie by given cookie name from request. - * - * @param req - * @param name - * The cookie name - * @return The cookie of this name in the request, or null if not found. - */ - private static Cookie findCookie(HttpServletRequest req, String name) { - Cookie[] cookies = req.getCookies(); - if (cookies != null) { - for (int i = 0; i < cookies.length; i++) { - if (cookies[i].getName().equals(name)) { - return cookies[i]; - } - } - } - - return null; - } - - /** - * Remove cookie by given name from request - * - * @param res - * @param name - * @return the removed cookies - */ - private static Cookie removeCookie(HttpServletResponse res, String name) { - Cookie cookie = new Cookie(name, ""); - cookie.setPath("/"); - cookie.setMaxAge(0); - res.addCookie(cookie); - - return cookie; - } - - /** - * Create a new cookie for request. - * - * @param res - * @param name - * cookie name - * @param value - * cookie value - * @return the created cookie. - */ - private static Cookie createCookie(HttpServletResponse res, String name, String value) { - Cookie cookie = new Cookie(name, value); - cookie.setPath("/"); - // cookie.setMaxAge(Configuration.getAsInt(ConfigurationKeys.INACTIVE_TIME)); - res.addCookie(cookie); - - return cookie; - } - - // ************************************************************************ - // SYSTEM SESSION MONITOR CLASS - // ************************************************************************ - class Monitor implements Runnable { - private static final String THREAD_NAME = "LAMS SYSTEM SESSION MONITOR"; - private Thread monitoringThread; - private boolean stopSign = false; - - public void start() { - monitoringThread = new Thread(this, Monitor.THREAD_NAME); - stopSign = false; - monitoringThread.start(); - } - - @Override - public void run() { - while (!stopSign) { - try { - // check whether session is expired - Iterator iter = sessionContainer.values().iterator(); - while (iter.hasNext()) { - SessionImpl session = (SessionImpl) iter.next(); - if (session.getMaxInactiveInterval() > 0) { - if (System.currentTimeMillis() - session.getLastAccessedTime() - - session.getMaxInactiveInterval() * 1000L > 0) { - session.invalidate(); - } - } - } - } catch (Throwable e) { - SessionManager.log.warn("Monitor thread exception: " + e); - } - if (!stopSign) { - try { - Thread.sleep(monitorPeriod * 1000L); - } catch (Exception e) { - // do nothing - } - } - } - } - - public void stop() { - - if (monitoringThread != null) { - stopSign = true; - monitoringThread.interrupt(); - try { - monitoringThread.join(); - } catch (InterruptedException ignore) { - SessionManager.log.error("Exception when interruptting Session Monitoring Thread"); - } - monitoringThread = null; - } - } - } - - // ************************************************************************ - // SYSTEM SESSION IMPLEMENTAION CLASS - // ************************************************************************ - class SessionImpl implements HttpSession, SessionVisitor { - - private String sessionId; - private long createTime; - private long accessTime; - private int timeout; - - private Map valueMap; - - public SessionImpl(String sessionId) { - this.sessionId = sessionId; - createTime = System.currentTimeMillis(); - accessTime = createTime; - timeout = Configuration.getAsInt(ConfigurationKeys.INACTIVE_TIME); - valueMap = new ConcurrentHashMap(); - } - - /** - * {@inheritDoc} - */ - @Override - public long getCreationTime() { - return createTime; - } - - /** - * {@inheritDoc} - */ - @Override - public String getId() { - return sessionId; - } - - /** - * {@inheritDoc} - */ - @Override - public long getLastAccessedTime() { - return accessTime; - } - - /** - * {@inheritDoc} - */ - @Override - public void setMaxInactiveInterval(int timeout) { - this.timeout = timeout; - } - - /** - * {@inheritDoc} - */ - @Override - public int getMaxInactiveInterval() { - return timeout; - } - - /** - * {@inheritDoc} - */ - @Override - public Object getAttribute(String name) { - return valueMap.get(name); - } - - /** - * {@inheritDoc} - */ - @Override - public Enumeration getAttributeNames() { - return new Enumeration() { - Iterator iter = valueMap.keySet().iterator(); - - @Override - public boolean hasMoreElements() { - return iter.hasNext(); - } - - @Override - public String nextElement() { - return iter.next(); - } - - }; - } - - /** - * {@inheritDoc} - */ - @Override - public void setAttribute(String name, Object value) { - if (value == null) { - removeAttribute(name); - return; - } - - Object old = valueMap.put(name, value); - - fireBound(name, value); - - if (old != null) { - fireUnbound(name, old); - } - } - - /** - * {@inheritDoc} - */ - @Override - public void removeAttribute(String name) { - Object value = valueMap.remove(name); - if (value != null) { - fireUnbound(name, value); - } - } - - /** - * {@inheritDoc} - */ - @Override - public void invalidate() { - Iterator> iter = valueMap.entrySet().iterator(); - while (iter.hasNext()) { - Entry entry = iter.next(); - fireUnbound(entry.getKey(), entry.getValue()); - } - valueMap.clear(); - // remove from map - SessionManager.getInstance().sessionContainer.remove(this.sessionId); - } - - /** - * Notice: This method always return false {@inheritDoc} - */ - @Override - public boolean isNew() { - return false; - } - - /** - * {@inheritDoc} - */ - @Override - public void putValue(String name, Object value) { - setAttribute(name, value); - } - - /** - * {@inheritDoc} - */ - @Override - public void removeValue(String name) { - removeAttribute(name); - } - - /** - * {@inheritDoc} - */ - @Override - public Object getValue(String name) { - return getAttribute(name); - } - - /** - * {@inheritDoc} - */ - @Override - public String[] getValueNames() { - return valueMap.keySet().toArray(new String[valueMap.size()]); - } - - /** - * {@inheritDoc} - */ - @Override - public HttpSessionContext getSessionContext() { - return new HttpSessionContext() { - - @Override - public HttpSession getSession(String sessionId) { - return SessionImpl.this; - } - - @Override - public Enumeration getIds() { - return new Enumeration() { - @Override - public boolean hasMoreElements() { - return false; - } - - @Override - public Object nextElement() { - return null; - } - }; - } - - }; - } - - /** - * Notice: This method always return null. {@inheritDoc} - */ - @Override - public ServletContext getServletContext() { - return null; - } - - // ********************************************************** - // SessionVisitor method - @Override - public void accessed() { - accessTime = System.currentTimeMillis(); - } - - // ********************************************************** - // private method - private void fireUnbound(String name, Object value) { - if (value instanceof HttpSessionBindingListener) { - HttpSessionBindingEvent event = new HttpSessionBindingEvent(this, name, value); - ((HttpSessionBindingListener) value).valueUnbound(event); - } - } - - private void fireBound(String name, Object value) { - if (value instanceof HttpSessionBindingListener) { - HttpSessionBindingEvent event = new HttpSessionBindingEvent(this, name, value); - ((HttpSessionBindingListener) value).valueBound(event); - } - } - - } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/web/session/SystemSessionFilter.java =================================================================== diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_common/src/java/org/lamsfoundation/lams/web/session/SystemSessionFilter.java (.../SystemSessionFilter.java) (revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077) +++ lams_common/src/java/org/lamsfoundation/lams/web/session/SystemSessionFilter.java (.../SystemSessionFilter.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -45,34 +45,27 @@ * @version $Revision$ */ public class SystemSessionFilter implements Filter { - - // The session name to trace shared session + // The session cookie name to trace shared session public static final String SYS_SESSION_COOKIE = "JSESSIONID"; - public static final String SSO_SESSION_COOKIE = "JSESSIONIDSSO"; - public void init(FilterConfig config) throws ServletException { } - public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - // Skip non-http request/response - if (!(req instanceof HttpServletRequest && res instanceof HttpServletResponse)) { - chain.doFilter(req, res); + if (!(request instanceof HttpServletRequest && response instanceof HttpServletResponse)) { + chain.doFilter(request, response); return; } - SessionManager.startSession(req, res); - + SessionManager.startSession((HttpServletRequest)request); // do following part of chain - chain.doFilter(req, res); - + chain.doFilter(request, response); SessionManager.endSession(); - } public void destroy() { // do nothing } -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java (.../HttpSessionManager.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java (.../HttpSessionManager.java) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -24,149 +24,130 @@ package org.lamsfoundation.lams.web.util; import java.util.Collections; +import java.util.Enumeration; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import java.util.Enumeration; import javax.servlet.ServletContext; import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionEvent; import javax.servlet.jsp.jstl.core.Config; -import org.apache.log4j.Logger; - import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.web.filter.LocaleFilter; - /** - * It is used to manage HttpSession according to lams configuration (in lams.xml file). - * There are 2 configuration items related to it. - * One is AllowMultipleLogin, the other is UserInactiveTimeout + * It is used to manage HttpSession according to lams configuration (in lams.xml file). There are 2 configuration items + * related to it. One is AllowMultipleLogin, the other is UserInactiveTimeout *

- * When running with the test harness, need to set a configuration parameter allowMultipleLogins=true - * This disables the invalidation of older - * duplicated sessions - so that the poll and application test threads will run together. - * It shouldn't be run with this set to true in production as not all the sessions are - * tracked properly - only one session is tracked for each user. + * When running with the test harness, need to set a configuration parameter allowMultipleLogins=true This disables the + * invalidation of older duplicated sessions - so that the poll and application test threads will run together. It + * shouldn't be run with this set to true in production as not all the sessions are tracked properly - only one session + * is tracked for each user. *

- * Why isn't this class a servlet rather than a singleton? Because it doesn't directly - * serve data back to a webpage - its primary function is to return data to the controller. - * Yet it is in the "web" part of the system, so there - * is some argument for it being a servlet. An advantage of it being a servlet would be - * that we could probably make it directly a listener (rather than having a listener - * which calls this class), and we wouldn't need the test servlet ReportHttpSessionDataServlet - * to dump the current status to a webpage. + * Why isn't this class a servlet rather than a singleton? Because it doesn't directly serve data back to a webpage - + * its primary function is to return data to the controller. Yet it is in the "web" part of the system, so there is some + * argument for it being a servlet. An advantage of it being a servlet would be that we could probably make it directly + * a listener (rather than having a listener which calls this class), and we wouldn't need the test servlet + * ReportHttpSessionDataServlet to dump the current status to a webpage. * * @author Fei Yang - * + * */ -public class HttpSessionManager -{ - private static Logger log = Logger.getLogger(HttpSessionManager.class); +public class HttpSessionManager { + private static HttpSessionManager instance = null; + private static ServletContext context = null; //for UniversalLoginModule to use - private static HttpSessionManager realMe = null; + private Map httpSessionsByLogin = null; // allows checking for two sessions + private int timeout;//in seconds + private boolean allowMultipleLogin; // must only be true for the test harness. - private static ServletContext context = null; //for UniversalLoginModule to use + private HttpSessionManager() { + httpSessionsByLogin = Collections.synchronizedMap(new HashMap()); + timeout = Configuration.getAsInt(ConfigurationKeys.INACTIVE_TIME); + allowMultipleLogin = Configuration.getAsBoolean(ConfigurationKeys.ALLOW_MULTIPLE_LOGIN); + } - private Map HttpSessionsByLogin = null; // allows checking for two sessions - private int timeout;//in seconds - private boolean allowMultipleLogin; // must only be true for the test harness. - - private HttpSessionManager() - { - HttpSessionsByLogin = Collections.synchronizedMap(new HashMap()); - - timeout = Configuration.getAsInt(ConfigurationKeys.INACTIVE_TIME); - - allowMultipleLogin = Configuration.getAsBoolean(ConfigurationKeys.ALLOW_MULTIPLE_LOGIN); + public static HttpSessionManager getInstance() { + if (HttpSessionManager.instance == null) { + HttpSessionManager.instance = new HttpSessionManager(); } + return HttpSessionManager.instance; + } - public static HttpSessionManager getInstance() - { - if (realMe == null) - realMe= new HttpSessionManager(); + /** + * Get the user http session. + */ + public HttpSession getHttpSessionByLogin(String login) { + return httpSessionsByLogin.get(login); + } - return realMe; + /** + * Update the user record + */ + public void updateHttpSessionByLogin(HttpSession session, String login) { + if (!allowMultipleLogin) { + if ((login == null) || (session == null)) { + return; + } + HttpSession oldSession = httpSessionsByLogin.get(login); + if (oldSession != null) { + if (oldSession.getId().equals(session.getId())) { + return; + } + try { + copySessionAttributes(oldSession, session); + oldSession.invalidate(); + } catch (IllegalStateException e) { + //it's already invalidated + //do nothing + } + } + httpSessionsByLogin.put(login, session); } - - /** - * Get the user http session. - */ - public HttpSession getHttpSessionByLogin(String login) - { - return (HttpSession)HttpSessionsByLogin.get(login); + } + + private void copySessionAttributes(HttpSession oldSession, HttpSession session) { + Enumeration enu = oldSession.getAttributeNames(); + while (enu.hasMoreElements()) { + String name = enu.nextElement(); + session.setAttribute(name, oldSession.getAttribute(name)); } + } - /** - * Update the user record - */ - public void updateHttpSessionByLogin(HttpSession session, String login) - { - if(!allowMultipleLogin) - { - if (login == null || session == null) - return; - HttpSession oldSession = (HttpSession)HttpSessionsByLogin.get(login); - if (oldSession != null) - { - if(oldSession.getId().equals(session.getId())) - return; - try - { - copySessionAttributes(oldSession,session); - oldSession.invalidate(); - }catch(IllegalStateException e) - { - //it's already invalidated - //do nothing - } - } - HttpSessionsByLogin.put(login,session); - } + public ServletContext getServletContext() { + return HttpSessionManager.context; + } + + public void setServletContext(ServletContext context) { + if (HttpSessionManager.context == null) { + HttpSessionManager.context = context; } + } - private void copySessionAttributes(HttpSession oldSession,HttpSession session) - { - Enumeration enu = oldSession.getAttributeNames(); - while(enu.hasMoreElements()) - { - String name = (String)enu.nextElement(); - session.setAttribute(name,oldSession.getAttribute(name)); - } + /** + * Matches sessionCreated in SessionListener, which implements the HttpSessionListener interface. SessionListener + * passes the session event to here. Can't be accessed directly (ie defined in web.xml) in this class as this class + * is a singleton and the creation method is private. + */ + public void sessionCreated(HttpSessionEvent sessionEvent) { + if (sessionEvent == null) { + return; } - - public ServletContext getServletContext() - { - return context; - } - - /** - * Matches sessionCreated in SessionListener, which implements the - * HttpSessionListener interface. SessionListener passes the session event - * to here. Can't be accessed directly (ie defined in web.xml) in this class as - * this class is a singleton and the creation method is private. - */ - public void sessionCreated(HttpSessionEvent se) - { - if (se == null) - return; - HttpSession session= se.getSession(); - session.setMaxInactiveInterval(timeout); - context = session.getServletContext(); - - //set server default locale for STURTS and JSTL. This value should be overwrite - //LocaleFilter class. But this part code can cope with login.jsp Locale. - if (session != null) { - Locale preferredLocale = new Locale(Configuration.get(ConfigurationKeys.SERVER_LANGUAGE)); - if (preferredLocale != null) { - session.setAttribute(LocaleFilter.PREFERRED_LOCALE_KEY, preferredLocale); - Config.set(session, Config.FMT_LOCALE, preferredLocale); - } - } - } -} + HttpSession session = sessionEvent.getSession(); + session.setMaxInactiveInterval(timeout); + setServletContext(session.getServletContext()); - \ No newline at end of file + //set server default locale for STURTS and JSTL. This value should be overwrite + //LocaleFilter class. But this part code can cope with login.jsp Locale. + if (session != null) { + Locale preferredLocale = new Locale(Configuration.get(ConfigurationKeys.SERVER_LANGUAGE)); + if (preferredLocale != null) { + session.setAttribute(LocaleFilter.PREFERRED_LOCALE_KEY, preferredLocale); + Config.set(session, Config.FMT_LOCALE, preferredLocale); + } + } + } +} \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_gradebook/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_gradebook/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_gradebook/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_gradebook/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_gradebook/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_gradebook/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_gradebook/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_gradebook/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_gradebook/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_gradebook/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_monitoring/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_monitoring/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_monitoring/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_monitoring/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_monitoring/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_monitoring/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_monitoring/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_monitoring/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_monitoring/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,120 +1,119 @@ - - Assessment - - Assessment tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.assessment.ApplicationResources - - - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + Assessment + + Assessment tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.assessment.ApplicationResources + - - - org.springframework.web.context.ContextLoaderListener - - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - - org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - - + + + org.springframework.web.context.ContextLoaderListener + + - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + + - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - + - + exportPortfolio org.lamsfoundation.lams.tool.assessment.web.servlet.ExportServlet - + - + populateMarks org.lamsfoundation.lams.tool.assessment.web.servlet.PopulateMarksServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -126,31 +125,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - laasseAssessmentToolContentHandler - - 3 + + toolContentHandlerBeanName + laasseAssessmentToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -166,112 +165,112 @@ /populateMarks - - + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /definelater.do + + + MONITOR + SYSADMIN + + - + Student LEARNER @@ -296,33 +295,38 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - + + /login.jsp + /login.jsp?failed=y + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_bbb/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_bbb/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_bbb/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_bbb/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_bbb/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_bbb/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_bbb/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_bbb/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_bbb/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_chat/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_chat/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_chat/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_chat/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_chat/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_chat/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_chat/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_chat/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_chat/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_daco/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_daco/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_daco/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,114 +1,113 @@ - - Shared Daco - - Shared Daco tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.daco.ApplicationResources - + + Shared Daco + + Shared Daco tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.daco.ApplicationResources + - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - - org.springframework.web.context.ContextLoaderListener - - - - - org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - - + + + org.springframework.web.context.ContextLoaderListener + + + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - + - + exportPortfolio org.lamsfoundation.lams.tool.daco.web.servlet.ExportServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -120,31 +119,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - dacoToolContentHandler - - 3 + + toolContentHandlerBeanName + dacoToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -155,112 +154,112 @@ /exportPortfolio - - + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /definelater.do + + + MONITOR + SYSADMIN + + - + Student LEARNER @@ -285,33 +284,38 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + /login.jsp + /login.jsp?failed=y + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + + \ No newline at end of file Index: lams_tool_eadventure/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_eadventure/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_eadventure/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,127 +1,126 @@ - - Eadventure - - Eadventure tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.eucm.lams.tool.eadventure.ApplicationResources - + + Eadventure + + Eadventure tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.eucm.lams.tool.eadventure.ApplicationResources + - - contextConfigLocation - classpath:/org/eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + contextConfigLocation + classpath:/org/eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - - org.springframework.web.context.ContextLoaderListener - - + + + org.springframework.web.context.ContextLoaderListener + + - - - org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - - + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - + - + exportPortfolio org.eucm.lams.tool.eadventure.web.servlet.ExportServlet - + - + completeItem org.eucm.lams.tool.eadventure.web.servlet.CompleteItemServlet - + - + eadventureExchange org.eucm.lams.tool.eadventure.web.servlet.VarsExchangeServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -133,31 +132,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - eadventureToolContentHandler - - 3 + + toolContentHandlerBeanName + eadventureToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -169,121 +168,121 @@ - completeItem - /learning/completeItem + completeItem + /learning/completeItem - + - eadventureExchange - /eadventure/* + eadventureExchange + /eadventure/* - - - + + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /definelater.do + + + MONITOR + SYSADMIN + + - + Student LEARNER @@ -308,33 +307,38 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + /login.jsp + /login.jsp?failed=y + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + + \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_forum/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_forum/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_forum/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_forum/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_forum/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_forum/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_forum/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_forum/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_forum/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_gmap/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_gmap/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_gmap/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_gmap/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_gmap/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_gmap/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_gmap/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_gmap/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_gmap/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_images/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_images/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,115 +1,114 @@ - - Image Gallery - - ImageGallery tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.imageGallery.ApplicationResources - + + Image Gallery + + ImageGallery tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.imageGallery.ApplicationResources + - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - - org.springframework.web.context.ContextLoaderListener - - + + + org.springframework.web.context.ContextLoaderListener + + - - - org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - - + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - + - + exportPortfolio org.lamsfoundation.lams.tool.imageGallery.web.servlet.ExportServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -121,31 +120,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - laimagImageGalleryToolContentHandler - - 3 + + toolContentHandlerBeanName + laimagImageGalleryToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -156,123 +155,123 @@ /exportPortfolio - - + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure Content + + Secure Content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /definelater.do + + + MONITOR + SYSADMIN + + - - - Admin content - /pages/admin/* - /laimag10admin/* - - - SYSADMIN - - + + + Admin content + /pages/admin/* + /laimag10admin/* + + + SYSADMIN + + - + Student LEARNER @@ -297,33 +296,38 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + /login.jsp + /login.jsp?failed=y + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + + \ No newline at end of file Index: lams_tool_imscc/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_imscc/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_imscc/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,120 +1,119 @@ - - Shared CommonCartridge - - Shared CommonCartridge tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.commonCartridge.ApplicationResources - + + Shared CommonCartridge + + Shared CommonCartridge tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.commonCartridge.ApplicationResources + - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - - org.springframework.web.context.ContextLoaderListener - - + + + org.springframework.web.context.ContextLoaderListener + + - - - org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - - + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - + - + exportPortfolio org.lamsfoundation.lams.tool.commonCartridge.web.servlet.ExportServlet - + - + completeItem org.lamsfoundation.lams.tool.commonCartridge.web.servlet.CompleteItemServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -126,31 +125,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - commonCartridgeToolContentHandler - - 3 + + toolContentHandlerBeanName + commonCartridgeToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -162,127 +161,127 @@ - completeItem - /learning/completeItem + completeItem + /learning/completeItem - - - + + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure Content + + Secure Content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /definelater.do + + + MONITOR + SYSADMIN + + - - - Admin content - /pages/admin/* - /laimsc11admin/* - - - SYSADMIN - - + + + Admin content + /pages/admin/* + /laimsc11admin/* + + + SYSADMIN + + - + Student LEARNER @@ -307,33 +306,38 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + /login.jsp + /login.jsp?failed=y + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + + \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_kaltura/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_kaltura/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_kaltura/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_kaltura/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_kaltura/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_kaltura/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_kaltura/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_kaltura/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_kaltura/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/web/WEB-INF/web.xml =================================================================== diff -u --- lams_tool_kaltura/web/WEB-INF/web.xml (revision 0) +++ lams_tool_kaltura/web/WEB-INF/web.xml (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -0,0 +1,322 @@ + + + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.kaltura.ApplicationResources + + + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/kaltura/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + + + + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + hibernateFilter + + org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + + + UrlRewriteFilter + /* + REQUEST + FORWARD + + + + SystemSessionFilter + /* + + + hibernateFilter + /* + + + LocaleFilter + /* + + + + + org.springframework.web.context.ContextLoaderListener + + + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + + + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 2 + + + validate + true + + 1 + + + + + + Connector + net.fckeditor.connector.ConnectorServlet + + baseDir + /UserFiles/ + + + debug + false + + 1 + + + + + Attachment Download + download + org.lamsfoundation.lams.contentrepository.client.ToolDownload + + toolContentHandlerBeanName + kalturaToolContentHandler + + 3 + + + + exportPortfolio + org.lamsfoundation.lams.tool.kaltura.web.servlets.ExportServlet + + + + action + *.do + + + + + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector + + + + download + /download/* + + + + exportPortfolio + /exportPortfolio + + + + + /lams + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + + + + + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld + + + tags-html + /WEB-INF/tlds/struts/struts-html.tld + + + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld + + + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld + + + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld + + + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld + + + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld + + + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld + + + + + + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-permittedTaglibs + /WEB-INF/tlds/jstl/permittedTaglibs.tld + + + tags-scriptfree + /WEB-INF/tlds/jstl/scriptfree.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + + + + + + + + Secure content + /* + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + + + + + Authoring content + /authoring/* + /pages/authoring/* + /authoring.do + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /monitoring.do + + + MONITOR + SYSADMIN + + + + + Student + LEARNER + + + + Authors Learning Designs + AUTHOR + + + + Member of Staff + MONITOR + + + + Group Manager + GROUP MANAGER + + + Group Administrator + GROUP ADMIN + + + LAMS System Adminstrator + SYSADMIN + + \ No newline at end of file Index: lams_tool_lamc/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,126 +1,128 @@ - + javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.mc.ApplicationResources + org.lamsfoundation.lams.tool.mc.ApplicationResources - - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - - - UrlRewriteFilter - org.tuckey.web.filters.urlrewrite.UrlRewriteFilter - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - UrlRewriteFilter - /* - REQUEST - FORWARD - + + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - - - hibernateFilter - - org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter - + + UrlRewriteFilter + /* + REQUEST + FORWARD + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + + hibernateFilter + + org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter + sessionFactoryBeanName - coreSessionFactory + coreSessionFactory - + LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - + + org.lamsfoundation.lams.web.filter.LocaleFilter + - - SystemSessionFilter - /* - - - - hibernateFilter - /* - + + SystemSessionFilter + /* + - LocaleFilter - /* - + hibernateFilter + /* + - + + LocaleFilter + /* + + + - org.springframework.web.context.ContextLoaderListener + org.springframework.web.context.ContextLoaderListener - - + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 2 - - - validate - true - - 1 - + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 2 + + + validate + true + + 1 + download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - mcToolContentHandler - - 3 + + toolContentHandlerBeanName + mcToolContentHandler + + 3 - + exportPortfolio org.lamsfoundation.lams.tool.mc.web.ExportServlet - + Connector net.fckeditor.connector.ConnectorServlet @@ -137,185 +139,179 @@ action - *.do + *.do download /download/* - + - + exportPortfolio /exportPortfolio/* - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - - + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + - + + + - + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - + - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - + - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - + - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - - - - tags-permittedTaglibs - /WEB-INF/tlds/jstl/permittedTaglibs.tld - - - - tags-scriptfree - /WEB-INF/tlds/jstl/scriptfree.tld - - - - - - - - tags-lams - /WEB-INF/tlds/lams/lams.tld + + + + + + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + + tags-permittedTaglibs + /WEB-INF/tlds/jstl/permittedTaglibs.tld + + + + tags-scriptfree + /WEB-INF/tlds/jstl/scriptfree.tld + + + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + + - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /authoring.do - /authoringStarter.do - /pedagogicalPlanner.do - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /monitoring.do - /monitoringStarter.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /authoring.do + /authoringStarter.do + /pedagogicalPlanner.do + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /monitoring.do + /monitoringStarter.do + + + MONITOR + SYSADMIN + + - + Student LEARNER @@ -340,20 +336,25 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - + + /login.jsp + /login.jsp?failed=y + + + + + + /lams + + + \ No newline at end of file Index: lams_tool_laqa/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,128 +1,130 @@ - + - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.qa.ApplicationResources - + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.qa.ApplicationResources + - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - UrlRewriteFilter - org.tuckey.web.filters.urlrewrite.UrlRewriteFilter - + + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + - - UrlRewriteFilter - /* - REQUEST - FORWARD - + + UrlRewriteFilter + /* + REQUEST + FORWARD + - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - - - hibernateFilter - - org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter - + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + + hibernateFilter + + org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter + sessionFactoryBeanName coreSessionFactory - + LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - + + org.lamsfoundation.lams.web.filter.LocaleFilter + - - SystemSessionFilter - /* - - - - hibernateFilter - /* - + + SystemSessionFilter + /* + - LocaleFilter - /* - + hibernateFilter + /* + - + + LocaleFilter + /* + + + - org.springframework.web.context.ContextLoaderListener + org.springframework.web.context.ContextLoaderListener - - + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - + - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 2 - - - validate - true - - 1 - + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 2 + + + validate + true + + 1 + download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - qaToolContentHandler - - 3 + + toolContentHandlerBeanName + qaToolContentHandler + + 3 - + exportPortfolio org.lamsfoundation.lams.tool.qa.web.ExportServlet - - + + Connector net.fckeditor.connector.ConnectorServlet @@ -139,184 +141,177 @@ action - *.do + *.do download /download/* - + - + exportPortfolio /exportPortfolio/* - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + - - - --> - + + - + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - + - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - + - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - + - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - - - - tags-permittedTaglibs - /WEB-INF/tlds/jstl/permittedTaglibs.tld - - - - tags-scriptfree - /WEB-INF/tlds/jstl/scriptfree.tld - - - - - - - - tags-lams - /WEB-INF/tlds/lams/lams.tld + + + + + + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + + tags-permittedTaglibs + /WEB-INF/tlds/jstl/permittedTaglibs.tld + + + + tags-scriptfree + /WEB-INF/tlds/jstl/scriptfree.tld + + + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + + - - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /authoring.do - /authoringStarter.do - /pedagogicalPlanner.do - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /monitoring.do - /monitoringStarter.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /authoring.do + /authoringStarter.do + /pedagogicalPlanner.do + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /monitoring.do + /monitoringStarter.do + + + MONITOR + SYSADMIN + + - + Student LEARNER @@ -341,21 +336,25 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - + + /login.jsp + /login.jsp?failed=y + + - - + + + /lams + + + \ No newline at end of file Index: lams_tool_larsrc/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_larsrc/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_larsrc/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,130 +1,126 @@ - - Shared Resources - - Shared Resources tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.rsrc.ApplicationResources - + + Shared Resources + + Shared Resources tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.rsrc.ApplicationResources + - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - - org.springframework.web.context.ContextLoaderListener - - + + + org.springframework.web.context.ContextLoaderListener + + - - - org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - - + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + - - UrlRewriteFilter - org.tuckey.web.filters.urlrewrite.UrlRewriteFilter - - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - - + + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + + + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - UrlRewriteFilter - /* - REQUEST - FORWARD - - - hibernateFilter - /* - - SystemSessionFilter - /* - - - LocaleFilter - /* - + UrlRewriteFilter + /* + REQUEST + FORWARD + + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - - - + exportPortfolio org.lamsfoundation.lams.tool.rsrc.web.servlet.ExportServlet - + - + completeItem org.lamsfoundation.lams.tool.rsrc.web.servlet.CompleteItemServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -136,31 +132,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - resourceToolContentHandler - - 3 + + toolContentHandlerBeanName + resourceToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -172,116 +168,116 @@ - completeItem - /learning/completeItem + completeItem + /learning/completeItem - - - + + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /definelater.do + + + MONITOR + SYSADMIN + + - + Student LEARNER @@ -306,33 +302,38 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + /login.jsp + /login.jsp?failed=y + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + + \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_leader/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_leader/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_leader/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_leader/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_leader/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_leader/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_leader/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_leader/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_leader/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_leader/web/WEB-INF/web.xml =================================================================== diff -u --- lams_tool_leader/web/WEB-INF/web.xml (revision 0) +++ lams_tool_leader/web/WEB-INF/web.xml (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -0,0 +1,315 @@ + + + + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.leaderselection.ApplicationResources + + + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/leaderselection/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + + + + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + hibernateFilter + + org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + + + UrlRewriteFilter + /* + REQUEST + FORWARD + + + + SystemSessionFilter + /* + + + hibernateFilter + /* + + + LocaleFilter + /* + + + + + org.springframework.web.context.ContextLoaderListener + + + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + + + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 2 + + + validate + true + + 1 + + + + + + Connector + net.fckeditor.connector.ConnectorServlet + + baseDir + /UserFiles/ + + + debug + false + + 1 + + + + exportPortfolio + org.lamsfoundation.lams.tool.leaderselection.web.servlets.ExportServlet + + + + action + *.do + + + + + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector + + + + exportPortfolio + /exportPortfolio + + + + + /lams + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + + + + + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld + + + tags-html + /WEB-INF/tlds/struts/struts-html.tld + + + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld + + + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld + + + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld + + + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld + + + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld + + + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld + + + + + + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-permittedTaglibs + /WEB-INF/tlds/jstl/permittedTaglibs.tld + + + tags-scriptfree + /WEB-INF/tlds/jstl/scriptfree.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + + + + + + + + Secure content + /* + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + + + + + Authoring content + /pages/authoring/* + /authoring.do + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /pages/monitoring/* + /monitoring.do + + + MONITOR + SYSADMIN + + + + + + Student + LEARNER + + + + Authors Learning Designs + AUTHOR + + + + Member of Staff + MONITOR + + + + Group Manager + GROUP MANAGER + + + Group Administrator + GROUP ADMIN + + + LAMS System Adminstrator + SYSADMIN + + + + + FORM + LAMS + + /login.jsp + /login.jsp?failed=y + + + \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_mindmap/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_mindmap/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_mindmap/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_mindmap/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_mindmap/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_mindmap/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_mindmap/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_mindmap/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_mindmap/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_nb/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_nb/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_nb/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_nb/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_nb/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_nb/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_nb/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_nb/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_nb/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_notebook/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_notebook/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_notebook/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_notebook/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_notebook/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_notebook/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_notebook/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_notebook/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_notebook/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_pixlr/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_pixlr/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_pixlr/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_pixlr/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_pixlr/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_pixlr/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_pixlr/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_pixlr/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_pixlr/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_pixlr/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scratchie/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_scratchie/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_scratchie/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,120 +1,116 @@ - - Shared Scratchie - - Shared Scratchie tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.scratchie.ApplicationResources - + + Shared Scratchie + + Shared Scratchie tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.scratchie.ApplicationResources + - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - - org.springframework.web.context.ContextLoaderListener - - + + + org.springframework.web.context.ContextLoaderListener + + - - - org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - - + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - - - + exportPortfolio org.lamsfoundation.lams.tool.scratchie.web.servlet.ExportServlet - + - + populateMarks org.lamsfoundation.lams.tool.scratchie.web.servlet.PopulateMarksServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -126,31 +122,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - scratchieToolContentHandler - - 3 + + toolContentHandlerBeanName + scratchieToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -160,127 +156,127 @@ exportPortfolio /exportPortfolio - + populateMarks /populateMarks - completeItem - /learning/completeItem + completeItem + /learning/completeItem - - - + + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure Content + + Secure Content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /pages/monitoring/* - /monitoring.do - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /pages/monitoring/* + /monitoring.do + /definelater.do + + + MONITOR + SYSADMIN + + - - - Admin content - /admin/* - /pages/admin/* - - - SYSADMIN - - + + + Admin content + /admin/* + /pages/admin/* + + + SYSADMIN + + - - - FORM + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - + + /login.jsp + /login.jsp?failed=y + + + + Student LEARNER @@ -305,23 +301,28 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + + \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_scribe/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_scribe/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_scribe/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_scribe/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_scribe/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_scribe/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_scribe/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_scribe/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_scribe/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_scribe/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_spreadsheet/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_spreadsheet/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,109 +1,108 @@ - - Shared Spreadsheet - - Shared Spreadsheet tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources - + + Shared Spreadsheet + + Shared Spreadsheet tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources + - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - - org.springframework.web.context.ContextLoaderListener - - + + + org.springframework.web.context.ContextLoaderListener + + - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - + - + exportPortfolio org.lamsfoundation.lams.tool.spreadsheet.web.servlet.ExportServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -115,31 +114,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - spreadsheetToolContentHandler - - 3 + + toolContentHandlerBeanName + spreadsheetToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -150,112 +149,112 @@ /exportPortfolio - - + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /definelater.do + + + MONITOR + SYSADMIN + + - + Student LEARNER @@ -280,33 +279,38 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + /login.jsp + /login.jsp?failed=y + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + + \ No newline at end of file Index: lams_tool_survey/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,114 +1,113 @@ - - Shared Surveys - - Shared Surveys tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.survey.ApplicationResources - - - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + Shared Surveys + + Shared Surveys tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.survey.ApplicationResources + - - - org.springframework.web.context.ContextLoaderListener - - - - - org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - + + + org.springframework.web.context.ContextLoaderListener + + + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + + - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - + - + exportPortfolio org.lamsfoundation.lams.tool.survey.web.servlet.ExportServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -120,31 +119,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - lasurvSurveyToolContentHandler - - 3 + + toolContentHandlerBeanName + lasurvSurveyToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -155,112 +154,112 @@ /exportPortfolio - - + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /definelater.do + + + MONITOR + SYSADMIN + + - + Student LEARNER @@ -285,33 +284,38 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + /login.jsp + /login.jsp?failed=y + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + + \ No newline at end of file Index: lams_tool_task/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_task/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_task/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,114 +1,113 @@ - - Shared TaskList - - TaskList tool - - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.taskList.ApplicationResources - + + Shared TaskList + + TaskList tool + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.taskList.ApplicationResources + - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + - - - org.springframework.web.context.ContextLoaderListener - - - - - org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - - + + + org.springframework.web.context.ContextLoaderListener + + + + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + + - - hibernateFilter - - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - + hibernateFilter + + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + - + - + exportPortfolio org.lamsfoundation.lams.tool.taskList.web.servlet.ExportServlet - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - - - validate - true - - 2 - + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 1 + + + validate + true + + 2 + - + Connector net.fckeditor.connector.ConnectorServlet @@ -120,31 +119,31 @@ false 1 - + - + Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - lataskTaskListToolContentHandler - - 3 + + toolContentHandlerBeanName + lataskTaskListToolContentHandler + + 3 - - action - *.do + + action + *.do - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - + download /download/* @@ -155,112 +154,112 @@ /exportPortfolio - - + + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - + + + - tags-lams - /WEB-INF/tlds/lams/lams.tld + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /pages/authoring/* - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /definelater.do - - - MONITOR - SYSADMIN - - + + + Authoring content + /authoring/* + /pages/authoring/* + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /pages/monitoring/* + /definelater.do + + + MONITOR + SYSADMIN + + - + Student LEARNER @@ -285,33 +284,38 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + /login.jsp + /login.jsp?failed=y + + + + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + + + + + /lams + + + \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/web/WEB-INF/web.xml =================================================================== diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc) +++ lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -1,147 +1,139 @@ - - + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.vote.ApplicationResources + -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -USA + + UrlRewriteFilter + /* + REQUEST + FORWARD + -http://www.gnu.org/licenses/gpl.txt ---> - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.vote.ApplicationResources - - - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml - - - locatorFactorySelector - classpath:/org/lamsfoundation/lams/beanRefContext.xml - - - parentContextKey - context.central - + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + - - UrlRewriteFilter - org.tuckey.web.filters.urlrewrite.UrlRewriteFilter - - - - UrlRewriteFilter - /* - REQUEST - FORWARD - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - - - hibernateFilter - - org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter - + + hibernateFilter + + org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter + sessionFactoryBeanName - coreSessionFactory + coreSessionFactory - + LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - + + org.lamsfoundation.lams.web.filter.LocaleFilter + - - SystemSessionFilter - /* - - - - hibernateFilter - /* - + + SystemSessionFilter + /* + - LocaleFilter - /* - + hibernateFilter + /* + - + + LocaleFilter + /* + + + - org.springframework.web.context.ContextLoaderListener + org.springframework.web.context.ContextLoaderListener - - + + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 2 - - - validate - true - - 1 - + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts-config.xml + + + debug + 999 + + + detail + 2 + + + validate + true + + 1 + download org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - voteToolContentHandler - - 3 + + toolContentHandlerBeanName + voteToolContentHandler + + 3 - + exportPortfolio org.lamsfoundation.lams.tool.vote.web.ExportServlet - + Connector net.fckeditor.connector.ConnectorServlet @@ -158,182 +150,176 @@ action - *.do + *.do download /download/* - + - + exportPortfolio /exportPortfolio/* - + - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector + Connector + /ckeditor/filemanager/browser/default/connectors/jsp/connector - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + + 500 + /error.jsp + + + 403 + /403.jsp + + + 404 + /404.jsp + - - - --> - + + - + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - + - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - + - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - + - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - - - - tags-permittedTaglibs - /WEB-INF/tlds/jstl/permittedTaglibs.tld - - - - tags-scriptfree - /WEB-INF/tlds/jstl/scriptfree.tld - - - - - - - - tags-lams - /WEB-INF/tlds/lams/lams.tld + + + + + + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + + tags-permittedTaglibs + /WEB-INF/tlds/jstl/permittedTaglibs.tld + + + + tags-scriptfree + /WEB-INF/tlds/jstl/scriptfree.tld + + + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + + - + - - Secure content + + Secure content /* - - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - + + + LEARNER + MONITOR + AUTHOR + SYSADMIN + + - - - Authoring content - /authoring/* - /authoring.do - /authoringStarter.do - /pedagogicalPlanner.do - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /monitoring.do - /monitoringStarter.do - - - MONITOR - SYSADMIN - - - - + + + Authoring content + /authoring/* + /authoring.do + /authoringStarter.do + /pedagogicalPlanner.do + + + AUTHOR + MONITOR + SYSADMIN + + + + + Staff content + /monitoring/* + /monitoring.do + /monitoringStarter.do + + + MONITOR + SYSADMIN + + + + Student LEARNER @@ -358,20 +344,25 @@ Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN - - - - FORM + + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - + + /login.jsp + /login.jsp?failed=y + + - + + + /lams + + + \ No newline at end of file Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wiki/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wiki/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wiki/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wiki/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wiki/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wiki/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wiki/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wiki/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wiki/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wookie/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wookie/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wookie/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wookie/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wookie/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wookie/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wookie/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wookie/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0c0cbdac26679e47d5c48e045c30e5496e1f809b refers to a dead (removed) revision in file `lams_tool_wookie/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d56929f06ad90a63082d514e6521adc175f3de27 refers to a dead (removed) revision in file `lams_tool_wookie/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_www/build.xml =================================================================== diff -u -r9da35349a62686e5112d5be703c9047c48d88467 -r0c0cbdac26679e47d5c48e045c30e5496e1f809b --- lams_www/build.xml (.../build.xml) (revision 9da35349a62686e5112d5be703c9047c48d88467) +++ lams_www/build.xml (.../build.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) @@ -29,7 +29,7 @@ + depends="_clean-dirs, _build-manifest, _copy-war-resources, _jsp-plaincopy, _jsp-precompile"> ${ant.project.name}: Building WAR + + - + javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.central.ApplicationResources + org.lamsfoundation.lams.central.ApplicationResources - + contextConfigLocation classpath:/org/lamsfoundation/lams/applicationContext.xml @@ -16,162 +19,155 @@ - + SystemSessionFilter org.lamsfoundation.lams.web.session.SystemSessionFilter SystemSessionFilter - /* + /* LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - + + org.lamsfoundation.lams.web.filter.LocaleFilter + - - LocaleFilter - *.jsp - + + LocaleFilter + *.jsp + - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - + - + - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld + tags-bean + /WEB-INF/tlds/struts/struts-bean.tld - + - tags-html - /WEB-INF/tlds/struts/struts-html.tld + tags-html + /WEB-INF/tlds/struts/struts-html.tld - + - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld + tags-logic + /WEB-INF/tlds/struts/struts-logic.tld - + - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld + tags-tiles + /WEB-INF/tlds/struts/struts-tiles.tld - + - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld + tags-bean-el + /WEB-INF/tlds/struts/struts-bean-el.tld - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld + tags-html-el + /WEB-INF/tlds/struts/struts-html-el.tld - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld + tags-logic-el + /WEB-INF/tlds/struts/struts-logic-el.tld - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld + tags-tiles-el + /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - - - - tags-permittedTaglibs - /WEB-INF/tlds/jstl/permittedTaglibs.tld - - - - tags-scriptfree - /WEB-INF/tlds/jstl/scriptfree.tld - - - - - - - - tags-lams - /WEB-INF/tlds/lams/lams.tld + + + + + + tags-fmt + /WEB-INF/tlds/jstl/fmt.tld + + tags-core + /WEB-INF/tlds/jstl/c.tld + + + + tags-function + /WEB-INF/tlds/jstl/fn.tld + + + + tags-xml + /WEB-INF/tlds/jstl/x.tld + + + + + + + tags-permittedTaglibs + /WEB-INF/tlds/jstl/permittedTaglibs.tld + + + + tags-scriptfree + /WEB-INF/tlds/jstl/scriptfree.tld + + + + + + + + tags-lams + /WEB-INF/tlds/lams/lams.tld + + - - + + - - Secure Content - /secure/* - - - LEARNER - MONITOR - AUTHOR - GROUP MANAGER - GROUP ADMIN - SYSADMIN - - + + Secure Content + /secure/* + + + LEARNER + MONITOR + AUTHOR + GROUP MANAGER + GROUP ADMIN + SYSADMIN + + - - - FORM + + + FORM LAMS - - /login.jsp - /login.jsp?failed=y - - - - + + /login.jsp + /login.jsp?failed=y + + + + Student LEARNER @@ -191,15 +187,20 @@ Group Manager GROUP MANAGER - + Group Administrator GROUP ADMIN - + LAMS System Adminstrator SYSADMIN + + + /lams + + \ No newline at end of file