[ajax4jsf-svn-commits] JBoss Ajax4JSF SVN: r102 - in trunk: a4j-portlet and 7 other directories.

Author: alexsmirnov Date: 2007-04-19 20:33:47 -0400 (Thu, 19 Apr 2007) New Revision: 102 Added: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/FaceletPortletViewHandler.java Modified: trunk/a4j-portlet/pom.xml trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletRequestWrapper.java trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java trunk/framework/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/AjaxContext.java trunk/framework/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java trunk/framework/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java trunk/pom.xml Log: fix site reports generation Modified: trunk/a4j-portlet/pom.xml =================================================================== --- trunk/a4j-portlet/pom.xml 2007-04-19 14:35:03 UTC (rev 101) +++ trunk/a4j-portlet/pom.xml 2007-04-20 00:33:47 UTC (rev 102) @@ -2,63 +2,69 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>a4j-portlet</artifactId> - <name>ajax4jsf portlet brige</name> - <url>http://maven.apache.org</url> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>portlet-api</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_04-b10-p01</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_04-b10-p01</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>test</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <parent> + <artifactId>master</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>a4j-portlet</artifactId> + <name>ajax4jsf portlet brige</name> + <url>http://maven.apache.org</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>portlet-api</groupId> + <artifactId>portlet-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_04-b10-p01</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_04-b10-p01</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.11</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>test</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java 2007-04-19 14:35:03 UTC (rev 101) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java 2007-04-20 00:33:47 UTC (rev 102) @@ -10,6 +10,7 @@ import javax.faces.FactoryFinder; import javax.faces.application.FacesMessage; import javax.faces.component.UIViewRoot; +import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.context.FacesContextFactory; import javax.faces.lifecycle.Lifecycle; @@ -36,8 +37,8 @@ private static final Log log = LogFactory.getLog(AjaxFacesPortlet.class); /** - * Stored portlet config. - */ + * Stored portlet config. + */ private Lifecycle lifecycle; @@ -232,13 +233,21 @@ } protected void setViewId(FacesContext context) { - String viewId = (String) context.getExternalContext().getRequestParameterMap().get(AbstractExternalContext.VIEW_ID_PARAMETER); + Map requestParameterMap = context.getExternalContext().getRequestParameterMap(); + String viewId = (String) requestParameterMap.get(AbstractExternalContext.VIEW_ID_PARAMETER); if(null == viewId){ viewId = getInitParameter("default-view"); + if (log.isDebugEnabled()) { + log.debug("Set viewId to default value from portlet parameter "+viewId); + } + } else if (log.isDebugEnabled()) { + log.debug("Detect viewId from request parameter as "+viewId); } if(null == viewId){ throw new IllegalArgumentException("Initial view id must be set as portlet parameter"); } + // Store for simulate servlet environment compability. + context.getExternalContext().getRequestMap().put(AbstractExternalContext.VIEW_ID_PARAMETER, viewId); UIViewRoot viewRoot = context.getViewRoot(); if(null == viewRoot){ viewRoot = context.getApplication().getViewHandler().createView(context, viewId); @@ -247,4 +256,24 @@ viewRoot.setViewId(viewId); } + /** + * @param facesContext + * @return + */ + public static String getPortletID(FacesContext facesContext) { + ExternalContext externalContext = facesContext + .getExternalContext(); + Object response = externalContext.getResponse(); + String namespace = null; + if (response instanceof RenderResponse) { + namespace = ((RenderResponse) response).getNamespace(); + } else if (null != externalContext.getRequestParameterMap().get( + AbstractExternalContext.NAMESPACE_PARAMETER)) { + namespace = (String) externalContext.getRequestParameterMap().get( + AbstractExternalContext.NAMESPACE_PARAMETER); + } + return namespace; + } + + } Added: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java (rev 0) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java 2007-04-20 00:33:47 UTC (rev 102) @@ -0,0 +1,85 @@ +/** + * + */ +package org.ajax4jsf.portlet; + +import java.util.Map; +import javax.faces.component.UIViewRoot; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.portlet.PortletContext; +import javax.portlet.RenderResponse; +import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.framework.util.config.WebXml; +import org.ajax4jsf.portlet.context.AbstractExternalContext; + +/** + * @author asmirnov + * + */ +public class PortletAjaxContext extends AjaxContext { + public String getAjaxActionURL(FacesContext context) { + // Check arguments + if (null == context) { + throw new NullPointerException( + "Faces context for build AJAX Action URL is null"); + } +// if (context.getExternalContext().getContext() instanceof PortletContext) { + UIViewRoot viewRoot = context.getViewRoot(); + if (null == viewRoot) { + throw new NullPointerException( + "Faces view tree for build AJAX Action URL is null"); + } + String viewId = viewRoot.getViewId(); + if (null == viewId) { + throw new NullPointerException( + "View id for build AJAX Action URL is null"); + } + if (!viewId.startsWith("/")) { + throw new IllegalArgumentException( + "Illegal view Id for build AJAX Action URL: " + viewId); + } + ExternalContext externalContext = context.getExternalContext(); + WebXml webXml = (WebXml) externalContext.getApplicationMap().get( + WebXml.CONTEXT_ATTRIBUTE); + if (null == webXml) { + throw new NullPointerException( + "Ajax Filter not properly configured for web application"); + } + StringBuffer actionUrl = new StringBuffer(externalContext + .getRequestContextPath()); + if (webXml.isPrefixMapping()) { + String facesFilterPrefix = webXml.getFacesFilterPrefix(); + if (facesFilterPrefix.endsWith("/")) { + facesFilterPrefix = facesFilterPrefix.substring(0,facesFilterPrefix.length()-1); + } + actionUrl.append(facesFilterPrefix).append(viewId); + } else { + int dot = viewId.lastIndexOf('.'); + if (dot < 0) { + actionUrl.append(viewId).append( + webXml.getFacesFilterSuffix()); + } else { + actionUrl.append(viewId.substring(0, dot)).append( + webXml.getFacesFilterSuffix()); + } + } + // ViewHandler viewHandler = + // context.getApplication().getViewHandler(); + // TODO - append optional seam/portlet.. parameters + return externalContext.encodeActionURL(actionUrl.toString()); +// } else { +// return super.getAjaxActionURL(context); +// } + } + + public Map getCommonAjaxParameters() { + Map map = super.getCommonAjaxParameters(); + FacesContext facesContext = FacesContext.getCurrentInstance(); + String namespace = AjaxFacesPortlet.getPortletID(facesContext); + if (null != namespace) { + map.put(AbstractExternalContext.NAMESPACE_PARAMETER, namespace); + } + return map; + } +} Modified: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletRequestWrapper.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletRequestWrapper.java 2007-04-19 14:35:03 UTC (rev 101) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletRequestWrapper.java 2007-04-20 00:33:47 UTC (rev 102) @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.security.Principal; +import java.util.Collections; import java.util.Enumeration; import java.util.Locale; import java.util.Map; @@ -31,48 +32,40 @@ } public String getAuthType() { - // TODO Auto-generated method stub - return null; + return wrapped.getAuthType(); } public String getContextPath() { - // TODO Auto-generated method stub return null; } + private static final Cookie[] noCookies = {}; public Cookie[] getCookies() { - // TODO Auto-generated method stub - return null; + return noCookies; } public long getDateHeader(String arg0) { - // TODO Auto-generated method stub return 0; } public String getHeader(String arg0) { - // TODO Auto-generated method stub return null; } public Enumeration getHeaderNames() { - // TODO Auto-generated method stub - return null; + return Collections.enumeration(Collections.EMPTY_LIST); } public Enumeration getHeaders(String arg0) { - // TODO Auto-generated method stub - return null; + return Collections.enumeration(Collections.EMPTY_LIST); } public int getIntHeader(String arg0) { - // TODO Auto-generated method stub return 0; } public String getMethod() { - // TODO Auto-generated method stub - return null; + return "GET"; } public String getPathInfo() { Added: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/FaceletPortletViewHandler.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/FaceletPortletViewHandler.java (rev 0) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/FaceletPortletViewHandler.java 2007-04-20 00:33:47 UTC (rev 102) @@ -0,0 +1,67 @@ +package org.ajax4jsf.portlet.application; + +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; +import javax.faces.FacesException; +import javax.faces.application.ViewHandler; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import javax.faces.render.RenderKit; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import com.sun.facelets.FaceletViewHandler; + +/** + * ViewHandler implementation for Facelets used in Portlets + * + */ +public class FaceletPortletViewHandler extends FaceletViewHandler { + private static final Writer nullWriter = new Writer() { + public void close() throws IOException { + // Do nothing + } + + public void flush() throws IOException { + // Do nothing + } + + public void write(char[] cbuf, int off, int len) throws IOException { + // Do nothing + } + }; + + public FaceletPortletViewHandler(ViewHandler parent) { + super(parent); + } + + protected ResponseWriter createResponseWriter(FacesContext context) + throws IOException, FacesException { + ResponseWriter writer; + ExternalContext extContext = context.getExternalContext(); + if (extContext.getResponse() instanceof RenderResponse) { + RenderKit renderKit = context.getRenderKit(); + RenderRequest request = (RenderRequest) extContext.getRequest(); + RenderResponse response = (RenderResponse) extContext.getResponse(); + String contenttype = request.getResponseContentType(); + if (contenttype == null) { + contenttype = "text/html"; + } + String encoding = response.getCharacterEncoding(); + if (encoding == null) { + encoding = "UTF-8"; + } + writer = renderKit.createResponseWriter(nullWriter, contenttype, + encoding); + contenttype = writer.getContentType(); + // apply them to the response + response.setContentType(contenttype); + // Now, clone with the real writer + writer = writer.cloneWithWriter(response.getWriter()); + } else { + writer = super.createResponseWriter(context); + } + return writer; + } +} \ No newline at end of file Modified: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java 2007-04-19 14:35:03 UTC (rev 101) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java 2007-04-20 00:33:47 UTC (rev 102) @@ -8,10 +8,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.security.Principal; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.Iterator; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -114,15 +116,21 @@ } protected Object getRequestHeader(String name) { - return null; + return getPortletRequest().getProperty(name); } protected Enumeration getRequestHeaderNames() { - return Collections.enumeration(Collections.EMPTY_LIST); + return getPortletRequest().getPropertyNames(); } protected Object[] getRequestHeaderValues(String name) { - return null; + Enumeration properties = getPortletRequest().getProperties(name); + List values = new ArrayList(); + while (properties.hasMoreElements()) { + Object value = (Object) properties.nextElement(); + values.add(value); + } + return values.toArray(); } protected Object getRequestParameter(String name) { @@ -215,7 +223,8 @@ } public String getRequestPathInfo() { - return null; + String pathInfo = (String) getRequestParameter(VIEW_ID_PARAMETER); + return pathInfo; } public String getRequestServletPath() { Modified: trunk/framework/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java 2007-04-19 14:35:03 UTC (rev 101) +++ trunk/framework/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java 2007-04-20 00:33:47 UTC (rev 102) @@ -62,24 +62,34 @@ * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext) */ public void encodeBegin(FacesContext context) throws IOException { - UIViewRoot viewRoot = context.getViewRoot(); - Locale locale = viewRoot.getLocale(); - if (locale == null) { - locale = context.getApplication().getDefaultLocale(); - } + loadBundle(context); - ResourceBundle bundle; - try { - bundle = ResourceBundle.getBundle(getBasename(), locale, Thread - .currentThread().getContextClassLoader()); - } catch (MissingResourceException e) { - _log.error(Messages.getMessage(Messages.COULD_NOT_LOAD_RESOURCE_BUNDLE, getBasename())); - return; - } + } - context.getExternalContext().getRequestMap().put(getVar(), - new ResourceBundleMap(bundle)); + public void decode(FacesContext context) { + loadBundle(context); + } + /** + * @param context + */ + public void loadBundle(FacesContext context) { + UIViewRoot viewRoot = context.getViewRoot(); + Locale locale = viewRoot.getLocale(); + if (locale == null) { + locale = context.getApplication().getDefaultLocale(); + } + ResourceBundle bundle; + try { + bundle = ResourceBundle.getBundle(getBasename(), locale, Thread + .currentThread().getContextClassLoader()); + } catch (MissingResourceException e) { + _log.error(Messages.getMessage(Messages.COULD_NOT_LOAD_RESOURCE_BUNDLE, getBasename())); + return; + } + + context.getExternalContext().getRequestMap().put(getVar(), + new ResourceBundleMap(bundle)); } /* Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/AjaxContext.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/AjaxContext.java 2007-04-19 14:35:03 UTC (rev 101) +++ trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/AjaxContext.java 2007-04-20 00:33:47 UTC (rev 102) @@ -37,6 +37,7 @@ import javax.faces.FactoryFinder; import javax.faces.application.Application; import javax.faces.application.StateManager; +import javax.faces.application.ViewHandler; import javax.faces.application.StateManager.SerializedView; import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; @@ -62,6 +63,7 @@ import org.ajax4jsf.framework.skin.Skin; import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.skin.SkinNotFoundException; +import org.ajax4jsf.framework.util.config.WebXml; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -74,638 +76,682 @@ * */ public class AjaxContext { - /** - * Key for keep request state information in request-scope attributes. - */ - public static final String AJAX_CONTEXT_KEY = "ajaxContext"; + /** + * Key for keep request state information in request-scope attributes. + */ + public static final String AJAX_CONTEXT_KEY = "ajaxContext"; - public static final String SCRIPTS_PARAMETER = "org.ajax4jsf.framework.HEADER_SCRIPTS"; + public static final String SCRIPTS_PARAMETER = "org.ajax4jsf.framework.HEADER_SCRIPTS"; - public static final String STYLES_PARAMETER = "org.ajax4jsf.framework.HEADER_STYLES"; + public static final String STYLES_PARAMETER = "org.ajax4jsf.framework.HEADER_STYLES"; - public static final String RESOURCES_PROCESSED = "org.ajax4jsf.framework.HEADER_PROCESSED"; + public static final String RESOURCES_PROCESSED = "org.ajax4jsf.framework.HEADER_PROCESSED"; - public static final String RESPONSE_DATA_KEY = "_ajax:data"; + public static final String RESPONSE_DATA_KEY = "_ajax:data"; - private static final Log log = LogFactory.getLog(AjaxContext.class); - - private static ComponentInvoker invoker; + private static final Log log = LogFactory.getLog(AjaxContext.class); - private static Map contextClasses = new HashMap(); + private static ComponentInvoker invoker; - Set ajaxAreasToRender = new HashSet(); + private static Map contextClasses = new HashMap(); - Set ajaxRenderedAreas = new HashSet(); + Set ajaxAreasToRender = new HashSet(); - boolean ajaxRequest = false; + Set ajaxRenderedAreas = new HashSet(); - boolean ajaxRequestSet = false; + boolean ajaxRequest = false; - boolean selfRender = false; + boolean ajaxRequestSet = false; - Integer viewSequence = new Integer(1); + boolean selfRender = false; - String submittedRegionClientId = null; + Integer viewSequence = new Integer(1); - boolean submittedRegionSet = false; - - ViewIdHolder viewIdHolder = null; + String submittedRegionClientId = null; - Map responseDataMap = new HashMap(); + boolean submittedRegionSet = false; - static { - try { - // Attempt to create JSF1.2 specific invoker. - invoker = new JsfOneOneInvoker(); - } catch (Exception e) { - invoker = new JsfOneOneInvoker(); - } - } + ViewIdHolder viewIdHolder = null; - /** - * Get instance of current AJAX Context. Instance get by - * {@link VariableResolver#resolveVariable(FacesContext, String)} for - * variable {@link AjaxContext#AJAX_CONTEXT_KEY} - * - * @return memento instance for current request - */ - public static AjaxContext getCurrentInstance() { - FacesContext context = FacesContext.getCurrentInstance(); - return getCurrentInstance(context); - } + Map responseDataMap = new HashMap(); + + Map commonAjaxParameters = new HashMap(); - /** - * Get instance of current AJAX Context. Instance get by - * {@link VariableResolver#resolveVariable(FacesContext, String)} for - * variable {@link AjaxContext#AJAX_CONTEXT_KEY} - * - * @param context - * current FacesContext - * @return instance of AjaxContext. - */ - public static AjaxContext getCurrentInstance(FacesContext context) { - if (null == context) { - throw new NullPointerException("FacesContext is null"); - } - AjaxContext ajaxContext = (AjaxContext) context.getApplication() - .getVariableResolver().resolveVariable(context, - AJAX_CONTEXT_KEY); - return ajaxContext; + static { + try { + // Attempt to create JSF1.2 specific invoker. + invoker = new JsfOneOneInvoker(); + } catch (Exception e) { + invoker = new JsfOneOneInvoker(); } + } - /** - * @param root - * @param context - * @param callback - * @param regionId - * @return - * @see org.ajax4jsf.framework.ajax.JsfOneOneInvoker#invokeOnComponent(javax.faces.component.UIComponent, javax.faces.context.FacesContext, org.ajax4jsf.framework.ajax.InvokerCallback, java.lang.String) - */ - public static boolean invokeOnComponent(UIComponent root, FacesContext context, InvokerCallback callback, String regionId) { - return invoker.invokeOnComponent(root, context, callback, regionId); - } + /** + * Get instance of current AJAX Context. Instance get by + * {@link VariableResolver#resolveVariable(FacesContext, String)} for + * variable {@link AjaxContext#AJAX_CONTEXT_KEY} + * + * @return memento instance for current request + */ + public static AjaxContext getCurrentInstance() { + FacesContext context = FacesContext.getCurrentInstance(); + return getCurrentInstance(context); + } - /** - * @param viewRoot - * @param context - * @param callback - * @param phase - * @see org.ajax4jsf.framework.ajax.JsfOneOneInvoker#invokeOnRegionOrRoot(org.ajax4jsf.framework.ajax.AjaxViewRoot, javax.faces.context.FacesContext, org.ajax4jsf.framework.ajax.InvokerCallback, javax.faces.event.PhaseId) - */ - public static void invokeOnRegionOrRoot(AjaxViewRoot viewRoot, FacesContext context, InvokerCallback callback, PhaseId phase) { - invoker.invokeOnRegionOrRoot(viewRoot, context, callback, phase); + /** + * Get instance of current AJAX Context. Instance get by + * {@link VariableResolver#resolveVariable(FacesContext, String)} for + * variable {@link AjaxContext#AJAX_CONTEXT_KEY} + * + * @param context + * current FacesContext + * @return instance of AjaxContext. + */ + public static AjaxContext getCurrentInstance(FacesContext context) { + if (null == context) { + throw new NullPointerException("FacesContext is null"); } + AjaxContext ajaxContext = (AjaxContext) context.getApplication() + .getVariableResolver().resolveVariable(context, + AJAX_CONTEXT_KEY); + return ajaxContext; + } - - private InvokerCallback _ajaxInvoker = new InvokerCallback() { + /** + * @param root + * @param context + * @param callback + * @param regionId + * @return + * @see org.ajax4jsf.framework.ajax.JsfOneOneInvoker#invokeOnComponent(javax.faces.component.UIComponent, + * javax.faces.context.FacesContext, + * org.ajax4jsf.framework.ajax.InvokerCallback, java.lang.String) + */ + public static boolean invokeOnComponent(UIComponent root, + FacesContext context, InvokerCallback callback, String regionId) { + return invoker.invokeOnComponent(root, context, callback, regionId); + } - public void invoke(FacesContext context, UIComponent component) { - if (component instanceof AjaxContainer) { - AjaxContainer ajax = (AjaxContainer) component; - renderAjaxRegion(context, component, true); - } else { - // Container not found, use Root for encode. - renderAjaxRegion(context, context.getViewRoot(), true); - } - } + /** + * @param viewRoot + * @param context + * @param callback + * @param phase + * @see org.ajax4jsf.framework.ajax.JsfOneOneInvoker#invokeOnRegionOrRoot(org.ajax4jsf.framework.ajax.AjaxViewRoot, + * javax.faces.context.FacesContext, + * org.ajax4jsf.framework.ajax.InvokerCallback, + * javax.faces.event.PhaseId) + */ + public static void invokeOnRegionOrRoot(AjaxViewRoot viewRoot, + FacesContext context, InvokerCallback callback, PhaseId phase) { + invoker.invokeOnRegionOrRoot(viewRoot, context, callback, phase); + } - public void invokeRoot(FacesContext context) { - renderAjaxRegion(context, context.getViewRoot(), true); - } + private InvokerCallback _ajaxInvoker = new InvokerCallback() { - }; - - public void renderSubmittedAjaxRegion(FacesContext context){ - renderSubmittedAjaxRegion(context, true); + public void invoke(FacesContext context, UIComponent component) { + if (component instanceof AjaxContainer) { + AjaxContainer ajax = (AjaxContainer) component; + renderAjaxRegion(context, component, true); + } else { + // Container not found, use Root for encode. + renderAjaxRegion(context, context.getViewRoot(), true); + } } - - public void renderSubmittedAjaxRegion(FacesContext context,final boolean useFilterWriter) { - InvokerCallback ajaxInvoker = new InvokerCallback() { - public void invoke(FacesContext context, UIComponent component) { - if (component instanceof AjaxContainer) { - renderAjaxRegion(context, component, useFilterWriter); - } else { - // Container not found, use Root for encode. - renderAjaxRegion(context, context.getViewRoot(), useFilterWriter); - } - } + public void invokeRoot(FacesContext context) { + renderAjaxRegion(context, context.getViewRoot(), true); + } - public void invokeRoot(FacesContext context) { - renderAjaxRegion(context, context.getViewRoot(), useFilterWriter); - } + }; - }; - if(!invokeOnComponent(context.getViewRoot(), context, ajaxInvoker, getSubmittedRegionClientId(context))){ - renderAjaxRegion(context, context.getViewRoot(), useFilterWriter); - } + public void renderSubmittedAjaxRegion(FacesContext context) { + renderSubmittedAjaxRegion(context, true); + } - } + public void renderSubmittedAjaxRegion(FacesContext context, + final boolean useFilterWriter) { + InvokerCallback ajaxInvoker = new InvokerCallback() { - /** - * @param context - * @param useFilterWriter - * TODO - * @throws AbortProcessingException - */ - public void renderAjaxRegion(FacesContext context, UIComponent component, - boolean useFilterWriter) throws FacesException { - if (log.isDebugEnabled()) { - log.debug(Messages.getMessage(Messages.RENDER_AJAX_REQUEST, - component.getId())); + public void invoke(FacesContext context, UIComponent component) { + if (component instanceof AjaxContainer) { + renderAjaxRegion(context, component, useFilterWriter); + } else { + // Container not found, use Root for encode. + renderAjaxRegion(context, context.getViewRoot(), + useFilterWriter); } - try { - setSelfRender(true); - // create response writer. - ExternalContext extContext = context.getExternalContext(); - RenderKit renderKit = context.getRenderKit(); - String encoding; - // Depends if we talk about servlets, portlets, ... - if (extContext.getRequest() instanceof ServletRequest) { - ServletRequest request = (ServletRequest) extContext - .getRequest(); - ServletResponse response = (ServletResponse) extContext - .getResponse(); - // HACK - bypass MyFaces ( and other ) extensions filter. + } - // Setup encoding and content type - String contentType = "text/xml"; - // get the encoding - must be setup by faces context or filter. - encoding = request.getCharacterEncoding(); - if (encoding == null) { - encoding = "UTF-8"; - } - response.setContentType(contentType + ";charset=" + encoding); - } else - encoding = "UTF-8"; + public void invokeRoot(FacesContext context) { + renderAjaxRegion(context, context.getViewRoot(), + useFilterWriter); + } - PrintWriter servletWriter; - if (useFilterWriter - && extContext.getRequestMap().containsKey( - BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE)) { - // HACK - Special case for MyFaces, since <f:view don't call - // encode methods, - // encode response as for self-rendered region directly to - // filter response wrpper. - // to avoid exceptions, inform wrapper to ignore illegal states - // for getWriter/Stream. - ServletResponse servletResponse = (ServletResponse) extContext - .getRequestMap().get( - BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE); - servletResponse.resetBuffer(); - servletWriter = servletResponse.getWriter(); - ((FilterServletResponseWrapper) servletResponse) - .setUseNullStream(true); - } else { - servletWriter = getWriter(extContext); - } - ResponseWriter writer = renderKit.createResponseWriter( - servletWriter, null, encoding); - context.setResponseWriter(writer); - // make response - writer.startDocument(); - encodeAjaxBegin(context, component); - component.encodeBegin(context); - ((AjaxContainer) component).encodeAjax(context); - component.encodeEnd(context); - saveViewState(context); - encodeAjaxEnd(context, component); - writer.endDocument(); - writer.flush(); - writer.close(); - servletWriter.close(); - // Save tree state. - } catch (IOException e) { - throw new FacesException(Messages.getMessage( - Messages.RENDERING_AJAX_REGION_ERROR, component - .getClientId(context)), e); - } finally { - context.responseComplete(); - // component.setRendererType(defaultRenderer); - } + }; + if (!invokeOnComponent(context.getViewRoot(), context, ajaxInvoker, + getSubmittedRegionClientId(context))) { + renderAjaxRegion(context, context.getViewRoot(), useFilterWriter); } - /** - * Encode declaration for AJAX response. Render &lt;html&gt;&lt;body&gt; - * - * @param context - * @param component - * @throws IOException - */ - public void encodeAjaxBegin(FacesContext context, - UIComponent component) throws IOException { - // AjaxContainer ajax = (AjaxContainer) component; - ResponseWriter out = context.getResponseWriter(); - // DebugUtils.traceView("ViewRoot in AJAX Page encode begin"); - out.startElement(HTML.HTML_ELEMENT, component); - // TODO - html attributes. lang - from current locale ? - Locale locale = context.getViewRoot().getLocale(); - out.writeAttribute(HTML.lang_ATTRIBUTE, locale.toString(), "lang"); - out.startElement(HTML.BODY_ELEMENT, component); + + } + + /** + * @param context + * @param useFilterWriter + * TODO + * @throws AbortProcessingException + */ + public void renderAjaxRegion(FacesContext context, UIComponent component, + boolean useFilterWriter) throws FacesException { + if (log.isDebugEnabled()) { + log.debug(Messages.getMessage(Messages.RENDER_AJAX_REQUEST, + component.getId())); } + try { + setSelfRender(true); + // create response writer. + ExternalContext extContext = context.getExternalContext(); + RenderKit renderKit = context.getRenderKit(); + String encoding; + // Depends if we talk about servlets, portlets, ... + if (extContext.getRequest() instanceof ServletRequest) { + ServletRequest request = (ServletRequest) extContext + .getRequest(); + ServletResponse response = (ServletResponse) extContext + .getResponse(); + // HACK - bypass MyFaces ( and other ) extensions filter. - /** - * End encoding of AJAX response. Render tag with included areas and close - * &lt;/body&gt;&lt;/html&gt; - * - * @param context - * @param component - * @throws IOException - */ - public void encodeAjaxEnd(FacesContext context, UIComponent component) - throws IOException { - // AjaxContainer ajax = (AjaxContainer) component; - ResponseWriter out = context.getResponseWriter(); - // DebugUtils.traceView("ViewRoot in AJAX Page encode begin"); - out.endElement(HTML.BODY_ELEMENT); - out.endElement(HTML.HTML_ELEMENT); + // Setup encoding and content type + String contentType = "text/xml"; + // get the encoding - must be setup by faces context or filter. + encoding = request.getCharacterEncoding(); + if (encoding == null) { + encoding = "UTF-8"; + } + response.setContentType(contentType + ";charset=" + encoding); + } else + encoding = "UTF-8"; + + PrintWriter servletWriter; + if (useFilterWriter + && extContext.getRequestMap().containsKey( + BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE)) { + // HACK - Special case for MyFaces, since <f:view don't call + // encode methods, + // encode response as for self-rendered region directly to + // filter response wrpper. + // to avoid exceptions, inform wrapper to ignore illegal states + // for getWriter/Stream. + ServletResponse servletResponse = (ServletResponse) extContext + .getRequestMap().get( + BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE); + servletResponse.resetBuffer(); + servletWriter = servletResponse.getWriter(); + ((FilterServletResponseWrapper) servletResponse) + .setUseNullStream(true); + } else { + servletWriter = getWriter(extContext); + } + ResponseWriter writer = renderKit.createResponseWriter( + servletWriter, null, encoding); + context.setResponseWriter(writer); + // make response + writer.startDocument(); + encodeAjaxBegin(context, component); + component.encodeBegin(context); + ((AjaxContainer) component).encodeAjax(context); + component.encodeEnd(context); + saveViewState(context); + encodeAjaxEnd(context, component); + writer.endDocument(); + writer.flush(); + writer.close(); + servletWriter.close(); + // Save tree state. + } catch (IOException e) { + throw new FacesException(Messages.getMessage( + Messages.RENDERING_AJAX_REGION_ERROR, component + .getClientId(context)), e); + } finally { + context.responseComplete(); + // component.setRendererType(defaultRenderer); } + } + /** + * Encode declaration for AJAX response. Render &lt;html&gt;&lt;body&gt; + * + * @param context + * @param component + * @throws IOException + */ + public void encodeAjaxBegin(FacesContext context, UIComponent component) + throws IOException { + // AjaxContainer ajax = (AjaxContainer) component; + ResponseWriter out = context.getResponseWriter(); + // DebugUtils.traceView("ViewRoot in AJAX Page encode begin"); + out.startElement(HTML.HTML_ELEMENT, component); + // TODO - html attributes. lang - from current locale ? + Locale locale = context.getViewRoot().getLocale(); + out.writeAttribute(HTML.lang_ATTRIBUTE, locale.toString(), "lang"); + out.startElement(HTML.BODY_ELEMENT, component); + } - /** - * @param context - * @param root - * @throws FacesException - */ - public void processHeadResources(FacesContext context) - throws FacesException { - ExternalContext externalContext = context.getExternalContext(); - Map requestMap = externalContext.getRequestMap(); - if (!Boolean.TRUE.equals(requestMap.get(RESOURCES_PROCESSED))) { - if (null != requestMap.get(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE)) { - if (log.isDebugEnabled()) { - log - .debug("Process component tree for collect used scripts and styles"); - } - UIViewRoot root = context.getViewRoot(); - Set scripts = new LinkedHashSet(); - Set styles = new LinkedHashSet(); - RenderKitFactory rkFactory = (RenderKitFactory) FactoryFinder - .getFactory(FactoryFinder.RENDER_KIT_FACTORY); - RenderKit renderKit = rkFactory.getRenderKit(context, context - .getViewRoot().getRenderKitId()); - processHeadResources(context, root, scripts, styles, renderKit); - if (scripts.size() > 0) { - if (log.isDebugEnabled()) { - StringBuffer buff = new StringBuffer( - "Scripts for insert into head : \n"); - for (Iterator iter = scripts.iterator(); iter.hasNext();) { - String script = (String) iter.next(); - buff.append(script).append("\n"); - } - log.debug(buff.toString()); - } - requestMap.put(SCRIPTS_PARAMETER, scripts); - } - // Set default style sheet for current skin. - String styleSheetUri = null; - try { - styleSheetUri = (String) SkinFactory.getInstance().getSkin( - context).getParameter(context, - Skin.generalStyleSheet); - } catch (SkinNotFoundException e) { - log.warn("Current Skin is not found", e); - } - if (null != styleSheetUri) { - String resourceURL = context.getApplication() - .getViewHandler().getResourceURL(context, - styleSheetUri); - // TODO - some resources can be non-session aware, we must - // skip encoding for this case ? - // But, in common case - static links not need session info, - // and dynamic resources perform encodings if nessesary - // resourceURL = - // context.getExternalContext().encodeResourceURL(resourceURL); - styles.add(resourceURL); - } - if (styles.size() > 0) { - if (log.isDebugEnabled()) { - StringBuffer buff = new StringBuffer( - "Styles for insert into head : \n"); - for (Iterator iter = styles.iterator(); iter.hasNext();) { - String style = (String) iter.next(); - buff.append(style).append("\n"); - } - log.debug(buff.toString()); - } - requestMap.put(STYLES_PARAMETER, styles); - } - // Mark as processed. - requestMap.put(RESOURCES_PROCESSED, Boolean.TRUE); - } + /** + * End encoding of AJAX response. Render tag with included areas and + * close &lt;/body&gt;&lt;/html&gt; + * + * @param context + * @param component + * @throws IOException + */ + public void encodeAjaxEnd(FacesContext context, UIComponent component) + throws IOException { + // AjaxContainer ajax = (AjaxContainer) component; + ResponseWriter out = context.getResponseWriter(); + // DebugUtils.traceView("ViewRoot in AJAX Page encode begin"); + out.endElement(HTML.BODY_ELEMENT); + out.endElement(HTML.HTML_ELEMENT); + } + /** + * @param context + * @param root + * @throws FacesException + */ + public void processHeadResources(FacesContext context) + throws FacesException { + ExternalContext externalContext = context.getExternalContext(); + Map requestMap = externalContext.getRequestMap(); + if (!Boolean.TRUE.equals(requestMap.get(RESOURCES_PROCESSED))) { + if (null != requestMap.get(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE)) { + if (log.isDebugEnabled()) { + log + .debug("Process component tree for collect used scripts and styles"); } - } - - /** - * Append nessesary scripts and styles from component ( if renderer - * implements {@link HeaderResourceProducer}) and recursive process all - * facets and childrens. - * - * @param context - * TODO - * @param root - * @param scripts - * @param styles - * @param renderKit - * TODO - */ - private void processHeadResources(FacesContext context, UIComponent root, - Set scripts, Set styles, RenderKit renderKit) { - Renderer renderer = getRenderer(context, root, renderKit); - if (null != renderer) { - if (renderer instanceof HeaderResourceProducer) { - HeaderResourceProducer producer = (HeaderResourceProducer) renderer; - Set set = producer.getHeaderScripts(context, root); - if (null != set) { - scripts.addAll(set); - } - set = producer.getHeaderStyles(context, root); - if (null != set) { - styles.addAll(set); - } + UIViewRoot root = context.getViewRoot(); + Set scripts = new LinkedHashSet(); + Set styles = new LinkedHashSet(); + RenderKitFactory rkFactory = (RenderKitFactory) FactoryFinder + .getFactory(FactoryFinder.RENDER_KIT_FACTORY); + RenderKit renderKit = rkFactory.getRenderKit(context, context + .getViewRoot().getRenderKitId()); + processHeadResources(context, root, scripts, styles, renderKit); + if (scripts.size() > 0) { + if (log.isDebugEnabled()) { + StringBuffer buff = new StringBuffer( + "Scripts for insert into head : \n"); + for (Iterator iter = scripts.iterator(); iter.hasNext();) { + String script = (String) iter.next(); + buff.append(script).append("\n"); } + log.debug(buff.toString()); + } + requestMap.put(SCRIPTS_PARAMETER, scripts); } - for (Iterator iter = root.getFacets().values().iterator(); iter - .hasNext();) { - UIComponent child = (UIComponent) iter.next(); - processHeadResources(context, child, scripts, styles, renderKit); + // Set default style sheet for current skin. + String styleSheetUri = null; + try { + styleSheetUri = (String) SkinFactory.getInstance().getSkin( + context).getParameter(context, + Skin.generalStyleSheet); + } catch (SkinNotFoundException e) { + log.warn("Current Skin is not found", e); } - for (Iterator iter = root.getChildren().iterator(); iter.hasNext();) { - UIComponent child = (UIComponent) iter.next(); - processHeadResources(context, child, scripts, styles, renderKit); + if (null != styleSheetUri) { + String resourceURL = context.getApplication() + .getViewHandler().getResourceURL(context, + styleSheetUri); + // TODO - some resources can be non-session aware, we + // must + // skip encoding for this case ? + // But, in common case - static links not need session + // info, + // and dynamic resources perform encodings if nessesary + // resourceURL = + // context.getExternalContext().encodeResourceURL(resourceURL); + styles.add(resourceURL); } - } - - /** - * Find renderer for given component. - * - * @param context - * @param comp - * @param renderKit - * @return - */ - private Renderer getRenderer(FacesContext context, UIComponent comp, - RenderKit renderKit) { - - String rendererType = comp.getRendererType(); - if (rendererType != null) { - return (renderKit.getRenderer(comp.getFamily(), rendererType)); - } else { - return (null); + if (styles.size() > 0) { + if (log.isDebugEnabled()) { + StringBuffer buff = new StringBuffer( + "Styles for insert into head : \n"); + for (Iterator iter = styles.iterator(); iter.hasNext();) { + String style = (String) iter.next(); + buff.append(style).append("\n"); + } + log.debug(buff.toString()); + } + requestMap.put(STYLES_PARAMETER, styles); } + // Mark as processed. + requestMap.put(RESOURCES_PROCESSED, Boolean.TRUE); + } } + } - public void saveViewState(FacesContext context) throws IOException { - // TODO - for facelets environment, we need to remove transient - // components. - try { - Application.class.getMethod("getExpressionFactory", null); - } catch (NoSuchMethodException e) { - // JSF 1.1 ! + /** + * Append nessesary scripts and styles from component ( if renderer + * implements {@link HeaderResourceProducer}) and recursive process all + * facets and childrens. + * + * @param context + * TODO + * @param root + * @param scripts + * @param styles + * @param renderKit + * TODO + */ + private void processHeadResources(FacesContext context, UIComponent root, + Set scripts, Set styles, RenderKit renderKit) { + Renderer renderer = getRenderer(context, root, renderKit); + if (null != renderer) { + if (renderer instanceof HeaderResourceProducer) { + HeaderResourceProducer producer = (HeaderResourceProducer) renderer; + Set set = producer.getHeaderScripts(context, root); + if (null != set) { + scripts.addAll(set); } - ResponseWriter writer = context.getResponseWriter(); - StateManager stateManager = context.getApplication().getStateManager(); - SerializedView serializedView = stateManager - .saveSerializedView(context); - if (null != serializedView) { - StringWriter bufWriter = new StringWriter(); - ResponseWriter cloneWithWriter = writer.cloneWithWriter(bufWriter); - context.setResponseWriter(cloneWithWriter); - stateManager.writeState(context, serializedView); - cloneWithWriter.flush(); - if (bufWriter.getBuffer().length() > 0) { - context.getExternalContext().getRequestMap().put( - AjaxViewHandler.SERIALIZED_STATE_KEY, - bufWriter.toString()); - } - // Restore original writer. - context.setResponseWriter(writer); + set = producer.getHeaderStyles(context, root); + if (null != set) { + styles.addAll(set); } + } } + for (Iterator iter = root.getFacets().values().iterator(); iter + .hasNext();) { + UIComponent child = (UIComponent) iter.next(); + processHeadResources(context, child, scripts, styles, renderKit); + } + for (Iterator iter = root.getChildren().iterator(); iter.hasNext();) { + UIComponent child = (UIComponent) iter.next(); + processHeadResources(context, child, scripts, styles, renderKit); + } + } + /** + * Find renderer for given component. + * + * @param context + * @param comp + * @param renderKit + * @return + */ + private Renderer getRenderer(FacesContext context, UIComponent comp, + RenderKit renderKit) { - /** - * @return Returns the ajaxRequest. - */ - public boolean isAjaxRequest() { - return isAjaxRequest(FacesContext.getCurrentInstance()); + String rendererType = comp.getRendererType(); + if (rendererType != null) { + return (renderKit.getRenderer(comp.getFamily(), rendererType)); + } else { + return (null); } - /** - * @return Returns the ajaxRequest. - */ - public boolean isAjaxRequest(FacesContext context) { - if (!this.ajaxRequestSet) { - ajaxRequest = null != getSubmittedRegionClientId(context); - ajaxRequestSet = true; - } - return ajaxRequest; - } + } - /** - * @param ajaxRequest - * The ajaxRequest to set. - */ - public void setAjaxRequest(boolean ajaxRequest) { - this.ajaxRequest = ajaxRequest; - this.ajaxRequestSet = true; + public void saveViewState(FacesContext context) throws IOException { + // TODO - for facelets environment, we need to remove transient + // components. + try { + Application.class.getMethod("getExpressionFactory", null); + } catch (NoSuchMethodException e) { + // JSF 1.1 ! } - - /** - * @return Returns the ajaxAreasToRender. - */ - public Set getAjaxAreasToRender() { - return this.ajaxAreasToRender; + ResponseWriter writer = context.getResponseWriter(); + StateManager stateManager = context.getApplication().getStateManager(); + SerializedView serializedView = stateManager + .saveSerializedView(context); + if (null != serializedView) { + StringWriter bufWriter = new StringWriter(); + ResponseWriter cloneWithWriter = writer.cloneWithWriter(bufWriter); + context.setResponseWriter(cloneWithWriter); + stateManager.writeState(context, serializedView); + cloneWithWriter.flush(); + if (bufWriter.getBuffer().length() > 0) { + context.getExternalContext().getRequestMap().put( + AjaxViewHandler.SERIALIZED_STATE_KEY, + bufWriter.toString()); + } + // Restore original writer. + context.setResponseWriter(writer); } + } - public void addComponentToAjaxRender(UIComponent component) { - this.ajaxAreasToRender.add(AjaxRendererUtils.getAbsoluteId(component)); - } + /** + * @return Returns the ajaxRequest. + */ + public boolean isAjaxRequest() { + return isAjaxRequest(FacesContext.getCurrentInstance()); + } - public void addComponentToAjaxRender(UIComponent base, String id) { - this.ajaxAreasToRender.add(convertId(base, id)); + /** + * @return Returns the ajaxRequest. + */ + public boolean isAjaxRequest(FacesContext context) { + if (!this.ajaxRequestSet) { + ajaxRequest = null != getSubmittedRegionClientId(context); + ajaxRequestSet = true; } + return ajaxRequest; + } - /** - * @return Returns the ajaxRenderedAreas. - */ - public Set getAjaxRenderedAreas() { - return ajaxRenderedAreas; - } + /** + * @param ajaxRequest + * The ajaxRequest to set. + */ + public void setAjaxRequest(boolean ajaxRequest) { + this.ajaxRequest = ajaxRequest; + this.ajaxRequestSet = true; + } - public void addRenderedArea(String id) { - ajaxRenderedAreas.add(id); - } + /** + * @return Returns the ajaxAreasToRender. + */ + public Set getAjaxAreasToRender() { + return this.ajaxAreasToRender; + } - public boolean removeRenderedArea(String id) { - return ajaxRenderedAreas.remove(id); - } + public void addComponentToAjaxRender(UIComponent component) { + this.ajaxAreasToRender.add(AjaxRendererUtils.getAbsoluteId(component)); + } - /** - * @return Returns the submittedClientId. - */ - public String getSubmittedRegionClientId(FacesContext context) { - if(!this.submittedRegionSet){ - this.submittedRegionClientId = (String) context.getExternalContext().getRequestParameterMap().get(AjaxContainerRenderer.AJAX_PARAMETER_NAME); - this.submittedRegionSet = true; - if (!this.ajaxRequestSet) { - setAjaxRequest(this.submittedRegionClientId!=null); - } - } - return this.submittedRegionClientId; - } + public void addComponentToAjaxRender(UIComponent base, String id) { + this.ajaxAreasToRender.add(convertId(base, id)); + } - /** - * @param submittedClientId - * The submittedClientId to set. - */ - public void setSubmittedRegionClientId(String submittedClientId) { - this.submittedRegionClientId = submittedClientId; - this.submittedRegionSet = true; - } + /** + * @return Returns the ajaxRenderedAreas. + */ + public Set getAjaxRenderedAreas() { + return ajaxRenderedAreas; + } + public void addRenderedArea(String id) { + ajaxRenderedAreas.add(id); + } - /** - * @return Returns the selfRender. - */ - public boolean isSelfRender() { - return selfRender; - } + public boolean removeRenderedArea(String id) { + return ajaxRenderedAreas.remove(id); + } - /** - * @param selfRender - * The selfRender to set. - */ - public void setSelfRender(boolean selfRender) { - this.selfRender = selfRender; + /** + * @return Returns the submittedClientId. + */ + public String getSubmittedRegionClientId(FacesContext context) { + if (!this.submittedRegionSet) { + this.submittedRegionClientId = (String) context + .getExternalContext().getRequestParameterMap().get( + AjaxContainerRenderer.AJAX_PARAMETER_NAME); + this.submittedRegionSet = true; + if (!this.ajaxRequestSet) { + setAjaxRequest(this.submittedRegionClientId != null); + } } + return this.submittedRegionClientId; + } - /** - * @return the vievIdHolder - */ - public ViewIdHolder getViewIdHolder() { - return viewIdHolder; - } + /** + * @param submittedClientId + * The submittedClientId to set. + */ + public void setSubmittedRegionClientId(String submittedClientId) { + this.submittedRegionClientId = submittedClientId; + this.submittedRegionSet = true; + } - /** - * @param viewIdHolder - * the vievIdHolder to set - */ - public void setViewIdHolder(ViewIdHolder viewIdHolder) { - this.viewIdHolder = viewIdHolder; - } + /** + * @return Returns the selfRender. + */ + public boolean isSelfRender() { + return selfRender; + } - /** - * @return the responseData - */ - public Object getResponseData() { - return responseDataMap.get(RESPONSE_DATA_KEY); - } + /** + * @param selfRender + * The selfRender to set. + */ + public void setSelfRender(boolean selfRender) { + this.selfRender = selfRender; + } - /** - * @param responseData - * the responseData to set - */ - public void setResponseData(Object responseData) { - this.responseDataMap.put(RESPONSE_DATA_KEY, responseData); - } + /** + * @return the vievIdHolder + */ + public ViewIdHolder getViewIdHolder() { + return viewIdHolder; + } - /** - * @return the responseDataMap - */ - public Map getResponseDataMap() { - return responseDataMap; + /** + * @param viewIdHolder + * the vievIdHolder to set + */ + public void setViewIdHolder(ViewIdHolder viewIdHolder) { + this.viewIdHolder = viewIdHolder; + } + + /** + * @return the responseData + */ + public Object getResponseData() { + return responseDataMap.get(RESPONSE_DATA_KEY); + } + + /** + * @param responseData + * the responseData to set + */ + public void setResponseData(Object responseData) { + this.responseDataMap.put(RESPONSE_DATA_KEY, responseData); + } + + /** + * @return the responseDataMap + */ + public Map getResponseDataMap() { + return responseDataMap; + } + + /** + * Gives back the writer of a Response object. + * + * @param extContext + * The external context. + * @return The writer of the response. + * @throws FacesException + * If the response object has no getWriter() method. + */ + protected PrintWriter getWriter(ExternalContext extContext) + throws FacesException { + PrintWriter writer = null; + Object response = extContext.getResponse(); + try { + Method gW = response.getClass() + .getMethod("getWriter", new Class[0]); + writer = (PrintWriter) gW.invoke(response, new Object[0]); + } catch (Exception e) { + throw new FacesException(e); } + return writer; + } - /** - * Gives back the writer of a Response object. - * - * @param extContext - * The external context. - * @return The writer of the response. - * @throws FacesException - * If the response object has no getWriter() method. - */ - protected PrintWriter getWriter(ExternalContext extContext) - throws FacesException { - PrintWriter writer = null; - Object response = extContext.getResponse(); - try { - Method gW = response.getClass() - .getMethod("getWriter", new Class[0]); - writer = (PrintWriter) gW.invoke(response, new Object[0]); - } catch (Exception e) { - throw new FacesException(e); - } - return writer; + /** + * Add affected regions's ID to ajaxView component. + * + * @param component + */ + public void addRegionsFromComponent(UIComponent component) { + // First step - find parent ajax view + Set ajaxRegions = AjaxRendererUtils.getAjaxAreas(component); + // if (ajaxRegions == null){ + // FacesContext context = FacesContext.getCurrentInstance(); + // ajaxRegions = AjaxRendererUtils.getAbsoluteId(context,component); + // } + if (log.isDebugEnabled()) { + log.debug(Messages.getMessage(Messages.INVOKE_AJAX_REGION_LISTENER, + component.getId())); } + if (ajaxRegions != null) { + for (Iterator iter = ajaxRegions.iterator(); iter.hasNext();) { + String id = iter.next().toString(); + ajaxAreasToRender.add(convertId(component, id)); + } + } + } - /** - * Add affected regions's ID to ajaxView component. - * @param component - */ - public void addRegionsFromComponent(UIComponent component) { - // First step - find parent ajax view - Set ajaxRegions = AjaxRendererUtils.getAjaxAreas(component); - // if (ajaxRegions == null){ - // FacesContext context = FacesContext.getCurrentInstance(); - // ajaxRegions = AjaxRendererUtils.getAbsoluteId(context,component); - // } - if (log.isDebugEnabled()) { - log.debug(Messages.getMessage(Messages.INVOKE_AJAX_REGION_LISTENER, - component.getId())); - } - if (ajaxRegions != null) { - for (Iterator iter = ajaxRegions.iterator(); iter - .hasNext();) { - String id = iter.next().toString(); - ajaxAreasToRender.add(convertId(component, id)); - } - } + /** + * Test for relative id of target components. Attempt convert to + * absolute. For use as argument for + * {@link UIComponent#findComponent(java.lang.String)} + * + * @param component + * @param id + * @return + */ + private String convertId(UIComponent component, String id) { + if (id.charAt(0) == NamingContainer.SEPARATOR_CHAR) { + return id; } + if (null != component) { + UIComponent target = component.findComponent(id); + if (null != target) { + return AjaxRendererUtils.getAbsoluteId(target); + } + } + return id; + } + + public String getAjaxActionURL() { + return getAjaxActionURL(FacesContext.getCurrentInstance()); + } - /** - * Test for relative id of target components. Attempt convert to absolute. - * For use as argument for - * {@link UIComponent#findComponent(java.lang.String)} - * - * @param component - * @param id - * @return - */ - private String convertId(UIComponent component, String id) { - if (id.charAt(0) == NamingContainer.SEPARATOR_CHAR) { - return id; - } - if (null != component) { - UIComponent target = component.findComponent(id); - if (null != target) { - return AjaxRendererUtils.getAbsoluteId(target); - } - } - return id; + public String getAjaxActionURL(FacesContext context) { + // Check arguments + if(null == context){ + throw new NullPointerException("Faces context for build AJAX Action URL is null"); } + UIViewRoot viewRoot = context.getViewRoot(); + if(null == viewRoot){ + throw new NullPointerException("Faces view tree for build AJAX Action URL is null"); + } + String viewId = viewRoot.getViewId(); + if(null == viewId){ + throw new NullPointerException("View id for build AJAX Action URL is null"); + } + if(!viewId.startsWith("/")){ + throw new IllegalArgumentException("Illegal view Id for build AJAX Action URL: "+viewId); + } + ViewHandler viewHandler = context.getApplication().getViewHandler(); + return context.getExternalContext().encodeActionURL(viewHandler.getActionURL(context, viewId)); + } + /** + * @return the commonAjaxParameters + */ + public Map getCommonAjaxParameters() { + return commonAjaxParameters; + } } \ No newline at end of file Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-04-19 14:35:03 UTC (rev 101) +++ trunk/framework/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-04-20 00:33:47 UTC (rev 102) @@ -233,9 +233,12 @@ if (ajaxSingle) { options.put("single", JSReference.TRUE); } + AjaxContext ajaxContext = AjaxContext.getCurrentInstance(facesContext); // Setup action URL. For portlet environment, it will be different from // page. - options.put("actionUrl", getActionUrl(facesContext)); + options.put("actionUrl", ajaxContext.getAjaxActionURL(facesContext)); + // Add application-wide Ajax parameters + parameters.putAll(ajaxContext.getCommonAjaxParameters()); // add child parameters for (Iterator it = uiComponent.getChildren().iterator(); it.hasNext();) { UIComponent child = (UIComponent) it.next(); @@ -634,12 +637,8 @@ return parent; } - protected static String getActionUrl(FacesContext facesContext) { - ViewHandler viewHandler = facesContext.getApplication() - .getViewHandler(); - String viewId = facesContext.getViewRoot().getViewId(); - return facesContext.getExternalContext().encodeActionURL( - viewHandler.getActionURL(facesContext, viewId)); + protected static String getAjaxActionUrl(FacesContext facesContext) { + return AjaxContext.getCurrentInstance(facesContext).getAjaxActionURL(facesContext); } /** Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java 2007-04-19 14:35:03 UTC (rev 101) +++ trunk/framework/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java 2007-04-20 00:33:47 UTC (rev 102) @@ -302,7 +302,7 @@ /** * @return Returns the facesFilterPrefix. */ - String getFacesFilterPrefix() { + public String getFacesFilterPrefix() { return _facesFilterPrefix; } @@ -317,7 +317,7 @@ /** * @return Returns the facesFilterSuffix. */ - String getFacesFilterSuffix() { + public String getFacesFilterSuffix() { return _facesFilterSuffix; } @@ -332,7 +332,7 @@ /** * @return Returns the resourcePrefix. */ - String getResourcePrefix() { + public String getResourcePrefix() { return _resourcePrefix; } @@ -347,7 +347,7 @@ /** * @return Returns the filterName. */ - String getFilterName() { + public String getFilterName() { return _filterName; } @@ -427,7 +427,7 @@ /** * @return Returns the prefixMapping. */ - boolean isPrefixMapping() { + public boolean isPrefixMapping() { return _prefixMapping; } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-04-19 14:35:03 UTC (rev 101) +++ trunk/pom.xml 2007-04-20 00:33:47 UTC (rev 102) @@ -1,5 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId> @@ -107,7 +107,7 @@ </developerConnection> <url>http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</url> </scm> - <!-- + <!-- --> <reporting> <plugins> @@ -124,28 +124,33 @@ <quiet>true</quiet> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + --><!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> </plugin> + <!-- + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>changelog-maven-plugin</artifactId> + </plugin> + --> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>changelog-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> <xmlOutput>false</xmlOutput> @@ -296,11 +301,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> - <!-- - <configuration> - <licenseLocation>${clover.license.path}</licenseLocation> - <jdk>1.5</jdk> - </configuration> + <!-- + <configuration> + <licenseLocation>${clover.license.path}</licenseLocation> + <jdk>1.5</jdk> + </configuration> --> </plugin> </plugins>