Index: calendar/calendar-summary-tool/tool/project.xml =================================================================== --- calendar/calendar-summary-tool/tool/project.xml (revision 33817) +++ calendar/calendar-summary-tool/tool/project.xml (revision 33818) @@ -148,7 +148,7 @@ myfaces tomahawk - 1.1.1 + 1.1.6 true Index: gradebook/app/sakai-tool/src/webapp/inc/preludeEmbedded.jspf =================================================================== --- gradebook/app/sakai-tool/src/webapp/inc/preludeEmbedded.jspf (revision 33818) +++ gradebook/app/sakai-tool/src/webapp/inc/preludeEmbedded.jspf (revision 33819) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%> +<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%> <%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai"%> <%@ taglib uri="http://sakaiproject.org/jsf/gradebook" prefix="gbx"%> Index: gradebook/app/sakai-tool/src/webapp/inc/preludeEmbeddedClassic.jspf =================================================================== --- gradebook/app/sakai-tool/src/webapp/inc/preludeEmbeddedClassic.jspf (revision 33818) +++ gradebook/app/sakai-tool/src/webapp/inc/preludeEmbeddedClassic.jspf (revision 33819) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%> +<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%> <%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai"%> <%@ taglib uri="http://sakaiproject.org/jsf/gradebook" prefix="gbx"%> Index: gradebook/app/project.xml =================================================================== --- gradebook/app/project.xml (revision 33818) +++ gradebook/app/project.xml (revision 33819) @@ -261,12 +261,28 @@ myfaces - myfaces-all + myfaces-api 1.1.1 true + + myfaces + myfaces-impl + 1.1.1 + + true + + + + myfaces + tomahawk + 1.1.6 + + true + + commons-fileupload Index: gradebook/app/standalone-app/src/webapp/inc/preludeStandalone.jspf =================================================================== --- gradebook/app/standalone-app/src/webapp/inc/preludeStandalone.jspf (revision 33818) +++ gradebook/app/standalone-app/src/webapp/inc/preludeStandalone.jspf (revision 33819) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%> +<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%> <%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai"%> <%@ taglib uri="http://sakaiproject.org/jsf/gradebook" prefix="gbx"%> Index: gradebook/service/impl/project.xml =================================================================== --- gradebook/service/impl/project.xml (revision 33818) +++ gradebook/service/impl/project.xml (revision 33819) @@ -41,10 +41,29 @@ myfaces - myfaces-all + myfaces-api 1.1.1 + + true + + myfaces + myfaces-impl + 1.1.1 + + true + + + + myfaces + tomahawk + 1.1.6 + + true + + + servletapi 2.4 Index: gradebook/testservice-tool/project.xml =================================================================== --- gradebook/testservice-tool/project.xml (revision 33818) +++ gradebook/testservice-tool/project.xml (revision 33819) @@ -62,12 +62,28 @@ myfaces - myfaces-all + myfaces-api 1.1.1 true + + myfaces + myfaces-impl + 1.1.1 + + true + + + + myfaces + tomahawk + 1.1.6 + + true + + commons-logging Index: jsf/widgets/project.xml =================================================================== --- jsf/widgets/project.xml (revision 33819) +++ jsf/widgets/project.xml (revision 33820) @@ -62,7 +62,7 @@ ${sakai.version} true - + @@ -84,11 +84,30 @@ --> - - myfaces - myfaces-all - 1.1.1 - + + myfaces + myfaces-api + 1.1.1 + + true + + + + myfaces + myfaces-impl + 1.1.1 + + true + + + + myfaces + tomahawk + 1.1.6 + + true + + Index: jsf/example/project.xml =================================================================== --- jsf/example/project.xml (revision 33819) +++ jsf/example/project.xml (revision 33820) @@ -72,12 +72,28 @@ myfaces - myfaces-all + myfaces-api 1.1.1 true + + myfaces + myfaces-impl + 1.1.1 + + true + + + + myfaces + tomahawk + 1.1.6 + + true + + - - myfaces - myfaces-all - 1.1.1 - + + myfaces + myfaces-api + 1.1.1 + + true + + + + myfaces + myfaces-impl + 1.1.1 + + true + + + + myfaces + tomahawk + 1.1.6 + + true + + servletapi Index: gradebook/app/ui/src/webapp/overview.jsp =================================================================== --- gradebook/app/ui/src/webapp/overview.jsp (revision 33893) +++ gradebook/app/ui/src/webapp/overview.jsp (revision 33894) @@ -53,7 +53,8 @@ - + @@ -66,7 +67,8 @@ - + @@ -88,7 +90,8 @@ - + Index: blog/.classpath =================================================================== --- blog/.classpath (revision 34153) +++ blog/.classpath (revision 34154) @@ -15,7 +15,7 @@ - + Index: blog/tool/project.xml =================================================================== --- blog/tool/project.xml (revision 34153) +++ blog/tool/project.xml (revision 34154) @@ -241,7 +241,7 @@ myfaces tomahawk - 1.1.1 + 1.1.6 jar true Index: sections/sections-app/project.xml =================================================================== --- sections/sections-app/project.xml (revision 34154) +++ sections/sections-app/project.xml (revision 34155) @@ -250,16 +250,32 @@ + myfaces - myfaces-all + myfaces-api 1.1.1 true + + myfaces + myfaces-impl + 1.1.1 + + true + + + + myfaces + tomahawk + 1.1.6 + + true + + - commons-validator commons-validator Index: sections/sections-app/src/webapp/sakai21/inc/prelude.jspf =================================================================== --- sections/sections-app/src/webapp/sakai21/inc/prelude.jspf (revision 34154) +++ sections/sections-app/src/webapp/sakai21/inc/prelude.jspf (revision 34155) @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%> +<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%> <%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai"%> Index: tool/tool-util/servlet/src/java/org/sakaiproject/util/RequestFilter.java =================================================================== --- tool/tool-util/servlet/src/java/org/sakaiproject/util/RequestFilter.java (revision 34441) +++ tool/tool-util/servlet/src/java/org/sakaiproject/util/RequestFilter.java (revision 34442) @@ -3,7 +3,7 @@ * $Id$ *********************************************************************************** * - * Copyright (c) 2005, 2006 The Sakai Foundation. + * Copyright (c) 2005, 2006, 2007 The Sakai Foundation. * * Licensed under the Educational Community License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -157,6 +158,9 @@ /** Key in the ThreadLocalManager for access to the current http response object. */ public final static String CURRENT_HTTP_RESPONSE = "org.sakaiproject.util.RequestFilter.http_response"; + /** Key in the ThreadLocalManager for access to the current servlet context. */ + public final static String CURRENT_SERVLET_CONTEXT = "org.sakaiproject.util.RequestFilter.servlet_context"; + /** The "." character */ protected static final String DOT = "."; @@ -191,6 +195,9 @@ protected boolean m_displayModJkWarning = true; + /** The servlet context for the filter. */ + protected ServletContext m_servletContext = null; + /** * Wraps a request object so we can override some standard behavior. */ @@ -467,6 +474,9 @@ ThreadLocalManager.set(CURRENT_HTTP_SESSION, new Integer(m_sakaiHttpSession)); ThreadLocalManager.set(CURRENT_CONTEXT, m_contextId); + // make the servlet context available + ThreadLocalManager.set(CURRENT_SERVLET_CONTEXT, m_servletContext); + // we are expecting HTTP stuff if (!((requestObj instanceof HttpServletRequest) && (responseObj instanceof HttpServletResponse))) { @@ -568,6 +578,9 @@ */ public void init(FilterConfig filterConfig) throws ServletException { + // capture the servlet context for later user + m_servletContext = filterConfig.getServletContext(); + if (filterConfig.getInitParameter(CONFIG_SESSION) != null) { String s = filterConfig.getInitParameter(CONFIG_SESSION); @@ -609,7 +622,7 @@ } else { - m_contextId = filterConfig.getServletContext().getServletContextName(); + m_contextId = m_servletContext.getServletContextName(); if (m_contextId == null) { m_contextId = toString(); Index: tool/tool-impl/impl/src/java/org/sakaiproject/tool/impl/SessionComponent.java =================================================================== --- tool/tool-impl/impl/src/java/org/sakaiproject/tool/impl/SessionComponent.java (revision 34441) +++ tool/tool-impl/impl/src/java/org/sakaiproject/tool/impl/SessionComponent.java (revision 34442) @@ -3,7 +3,7 @@ * $Id$ *********************************************************************************** * - * Copyright (c) 2005, 2006 The Sakai Foundation. + * Copyright (c) 2005, 2006, 2007 The Sakai Foundation. * * Licensed under the Educational Community License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,6 +70,9 @@ /** Key in the ThreadLocalManager for binding our current tool session. */ protected final static String CURRENT_TOOL_SESSION = "org.sakaiproject.api.kernel.session.current.tool"; + /** Key in the ThreadLocalManager for access to the current servlet context (from tool-util/servlet/RequestFilter). */ + protected final static String CURRENT_SERVLET_CONTEXT = "org.sakaiproject.util.RequestFilter.servlet_context"; + /********************************************************************************************************************************************************************************************************************************************************** * Dependencies *********************************************************************************************************************************************************************************************************************************************************/ @@ -666,7 +669,7 @@ */ public ServletContext getServletContext() { - throw new UnsupportedOperationException(); + return (ServletContext) threadLocalManager().get(CURRENT_SERVLET_CONTEXT); } /** @@ -1071,7 +1074,7 @@ */ public ServletContext getServletContext() { - throw new UnsupportedOperationException(); + return (ServletContext) threadLocalManager().get(CURRENT_SERVLET_CONTEXT); } /**