Author: alexsmirnov Date: 2007-08-31 20:14:42 -0400 (Fri, 31 Aug 2007) New Revision: 2678 Added: trunk/samples/richfaces-ear-demo/webapp/src/main/java/ Modified: trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml trunk/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/FaceletPortletViewHandler.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/AbstractExternalContext.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ServletContextImpl.java trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js trunk/markRelease.sh trunk/ui/tree/src/main/config/component/treeNode.xml Log: prepare release candidate 4 Modified: trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-09-01 00:14:42 UTC (rev 2678) @@ -3,7 +3,8 @@ <modelVersion>4.0.0</modelVersion> <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <name>${artifactId}</name> + <name>${artifactId}</name> + <version>${version}</version> <build> <plugins> <plugin> Modified: trunk/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2007-09-01 00:14:42 UTC (rev 2678) @@ -3,7 +3,8 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> <packaging>war</packaging> - <name>${artifactId} Maven Webapp</name> + <name>${artifactId} Maven Webapp</name> + <version>${version}</version> <build> <finalName>${artifactId}</finalName> </build> Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/FaceletPortletViewHandler.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/FaceletPortletViewHandler.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/FaceletPortletViewHandler.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -46,11 +46,11 @@ RenderResponse response = (RenderResponse) extContext.getResponse(); String contenttype = request.getResponseContentType(); if (contenttype == null) { - contenttype = "text/html"; + contenttype = "text/html"; } String encoding = response.getCharacterEncoding(); if (encoding == null) { - encoding = "UTF-8"; + encoding = "UTF-8"; } writer = renderKit.createResponseWriter(nullWriter, contenttype, encoding); Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -58,6 +58,7 @@ windowStates.setViewId(viewId); PortletViewState viewState = windowStates.getState(viewId); viewState.save(context); + serializedView=new SerializedView(viewId,null); } return serializedView; } Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/AbstractExternalContext.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/AbstractExternalContext.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/AbstractExternalContext.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -105,6 +105,8 @@ public static final String NAMESPACE_PARAMETER ="org.ajax4jsf.portlet.NAMESPACE"; public static final String ACTION__PARAMETER = "org.ajax4jsf.portlet.ACTION_URL"; public static final Object PORTLET_MODE_PARAMETER = "org.ajax4jsf.portlet.MODE"; + + protected static final String[] EMPTY_STRING_ARRAY = new String[0]; // TODO - optimization. private Map applicationMap; @@ -323,7 +325,7 @@ return this.requestHeaderValues; } - protected abstract Object[] getRequestHeaderValues(String name); + protected abstract String[] getRequestHeaderValues(String name); public Map getRequestMap() { if (this.requestMap == null) { Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -173,14 +173,14 @@ return getPortletRequest().getPropertyNames(); } - protected Object[] getRequestHeaderValues(String name) { + protected String[] getRequestHeaderValues(String name) { Enumeration properties = getPortletRequest().getProperties(name); List values = new ArrayList(); while (properties.hasMoreElements()) { Object value = (Object) properties.nextElement(); values.add(value); } - return values.toArray(); + return (String[]) values.toArray(EMPTY_STRING_ARRAY); } protected Object getRequestParameter(String name) { Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ServletContextImpl.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ServletContextImpl.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ServletContextImpl.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -201,13 +201,13 @@ return getHttpRequest().getHeaderNames(); } - protected Object[] getRequestHeaderValues(String name) { + protected String[] getRequestHeaderValues(String name) { Enumeration values = getHttpRequest().getHeaders(name); ArrayList valuesList = new ArrayList(); while (values.hasMoreElements()) { valuesList.add(values.nextElement()); } - return valuesList.toArray(); + return (String[]) valuesList.toArray(EMPTY_STRING_ARRAY); } protected Object getRequestParameter(String name) { Modified: trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -131,6 +131,17 @@ return _handler; } + /* (non-Javadoc) + * @see javax.faces.application.ViewHandler#initView(javax.faces.context.FacesContext) + */ + public void initView(FacesContext context) throws FacesException { + _handler.initView(context); + } + + public String calculateCharacterEncoding(FacesContext context) { + // TODO Auto-generated method stub + return _handler.calculateCharacterEncoding(context); + } /** * Fill view-handlers chain for alternate handlers. * @param context Modified: trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -27,6 +27,10 @@ public abstract Object getResponseData(); + public abstract void setOncomplete(Object oncompleteFunction); + + public abstract Object getOncomplete(); + public abstract void setViewIdHolder(ViewIdHolder viewIdHolder); public abstract ViewIdHolder getViewIdHolder(); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -81,6 +81,7 @@ } ajaxContext.getResponseDataMap().put(FOCUS_DATA_ID, focus); } + ajaxContext.setOncomplete(getOncomplete()); } } Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -107,6 +107,8 @@ Map responseDataMap = new HashMap(); Map commonAjaxParameters = new HashMap(); + + Object oncomplete = null; static { try { @@ -803,4 +805,18 @@ return commonAjaxParameters; } + /** + * @return the oncomplete + */ + public Object getOncomplete() { + return oncomplete; + } + + /** + * @param oncomplete the oncomplete to set + */ + public void setOncomplete(Object oncomplete) { + this.oncomplete = oncomplete; + } + } \ No newline at end of file Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2007-09-01 00:14:42 UTC (rev 2678) @@ -54,6 +54,7 @@ import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.javascript.JSFunctionDefinition; import org.ajax4jsf.javascript.JSReference; +import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.ajax4jsf.util.ServicesUtils; import org.apache.commons.logging.Log; @@ -83,6 +84,12 @@ public static final String ONCOMPLETE_ATTR_NAME = "oncomplete"; /** + * Attribute for keep JavaScript function name for call after complete + * request. + */ + public static final String ONCOMPLETE_CONTENT_ID = "org.ajax4jsf.oncomplete"; + + /** * Attribute for keep JavaScript function name for call before updating * DOM tree. */ @@ -802,6 +809,14 @@ out.write(dataString); out.endElement(HTML.SPAN_ELEM); } + // Include active 'oncomplete' function content : + Object oncomplete = ajaxContext.getOncomplete(); + if(null != oncomplete){ + out.startElement(HTML.SPAN_ELEM, component); + out.writeAttribute(HTML.id_ATTRIBUTE, ONCOMPLETE_CONTENT_ID, null); + out.writeText(oncomplete,null); + out.endElement(HTML.SPAN_ELEM); + } // For self-rendered case, we use own methods for replace stateKey by // real value // in XML filter. Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-09-01 00:14:42 UTC (rev 2678) @@ -872,21 +872,40 @@ /** * */ -A4J.AJAX.finishRequest = function(req){ - var options = req.options; +A4J.AJAX.finishRequest = function(request){ + var options = request.options; // we can set listener for complete request - for example, // it can shedule next request for update page. - if(options.oncomplete){ + var oncomplete = request.getElementById('org.ajax4jsf.oncomplete'); + if(oncomplete) { LOG.debug( "Call request oncomplete function after processing updates" ); window.setTimeout(function(){ - options.oncomplete(req,req.domEvt,req.getJSON('_ajax:data')); + var event = request.domEvt; + var data = request.getJSON('_ajax:data'); + try { + var newscript = Sarissa.getText(oncomplete,true); + if (window.execScript) { + window.execScript( newscript ); + } else { + window.eval(newscript); + } + } catch(e){ + LOG.error('Error evaluate oncomplete function '+e.Message); + } +// mark status object ( if any ) for complete request ; + A4J.AJAX.status(request.containerId,options.status,false);}, + 50); + } else if(options.oncomplete){ + LOG.debug( "Call component oncomplete function after processing updates" ); + window.setTimeout(function(){ + options.oncomplete(request,request.domEvt,request.getJSON('_ajax:data')); // mark status object ( if any ) for complete request ; - A4J.AJAX.status(req.containerId,options.status,false);}, + A4J.AJAX.status(request.containerId,options.status,false);}, 50); } else { // mark status object ( if any ) for complete request ; - A4J.AJAX.status(req.containerId,options.status,false); + A4J.AJAX.status(request.containerId,options.status,false); } // If we have events in queue - send next request. if(options.eventsQueue){ Modified: trunk/markRelease.sh =================================================================== --- trunk/markRelease.sh 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/markRelease.sh 2007-09-01 00:14:42 UTC (rev 2678) @@ -7,3 +7,6 @@ -DupdateWorkingCopyVersions=false \ -DtagBase=https://svn.jboss.org/repos/richfaces/tags find . -name pom.xml.branch -execdir mv pom.xml.branch pom.xml ';' +mvn install +cd .. +svn copy checkout https://svn.jboss.org/repos/richfaces/tags/$1 -m " create tag for a release $1" \ No newline at end of file Modified: trunk/ui/tree/src/main/config/component/treeNode.xml =================================================================== --- trunk/ui/tree/src/main/config/component/treeNode.xml 2007-08-31 22:48:16 UTC (rev 2677) +++ trunk/ui/tree/src/main/config/component/treeNode.xml 2007-09-01 00:14:42 UTC (rev 2678) @@ -142,5 +142,4 @@ &html_events; </component> - &listeners; </components>