Index: lams_tool_scratchie/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/web.xml,v diff -u -r1.2.2.4 -r1.2.2.5 --- lams_tool_scratchie/web/WEB-INF/web.xml 30 Sep 2014 13:11:35 -0000 1.2.2.4 +++ lams_tool_scratchie/web/WEB-INF/web.xml 18 Nov 2014 16:20:53 -0000 1.2.2.5 @@ -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