Author: alexsmirnov
Date: 2007-08-02 20:03:30 -0400 (Thu, 02 Aug 2007)
New Revision: 2039
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java
trunk/ui/assembly/pom.xml
Log:
Resolve issues :
http://jira.jboss.com/jira/browse/RF-401
http://jira.jboss.com/jira/browse/AJSF-65
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-02
23:02:15 UTC (rev 2038)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2007-08-03
00:03:30 UTC (rev 2039)
@@ -729,8 +729,8 @@
// for different environment ( portal, cocoon etc )
if (response instanceof HttpServletResponse) {
HttpServletResponse httpResponse = (HttpServletResponse) response;
- httpResponse.setHeader(AjaxContainerRenderer.AJAX_UPDATE_HEADER,
- senderString.toString());
+// httpResponse.setHeader(AjaxContainerRenderer.AJAX_UPDATE_HEADER,
+// senderString.toString());
httpResponse.setHeader(AjaxContainerRenderer.AJAX_FLAG_HEADER,
"true");
} else {
@@ -738,10 +738,10 @@
Method setHeadergMethod = response.getClass()
.getMethod("setHeader",
new Class[] { String.class, String.class });
+// setHeadergMethod.invoke(response, new Object[] {
+// AjaxContainerRenderer.AJAX_UPDATE_HEADER,
+// senderString.toString() });
setHeadergMethod.invoke(response, new Object[] {
- AjaxContainerRenderer.AJAX_UPDATE_HEADER,
- senderString.toString() });
- setHeadergMethod.invoke(response, new Object[] {
AjaxContainerRenderer.AJAX_FLAG_HEADER, "true" });
} catch (Exception e) {
log
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2007-08-02 23:02:15
UTC (rev 2038)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2007-08-03 00:03:30
UTC (rev 2039)
@@ -39,6 +39,7 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.richfaces.VersionBean;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -66,7 +67,7 @@
static final String WEB_XML = "/WEB-INF/web.xml";
- public static final String RESOURCE_URI_PREFIX = "a4j.res/";
+ public static final String RESOURCE_URI_PREFIX =
"a4j_"+VersionBean.MAJOR_VERSION+"_"+VersionBean.MINOR_VERSION+"_"+VersionBean.REVISION;
static final String RESOURCE_URI_PREFIX_WITH_SLASH = "/"
+ RESOURCE_URI_PREFIX;
Modified: trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-08-02 23:02:15
UTC (rev 2038)
+++ trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-08-03 00:03:30
UTC (rev 2039)
@@ -37,7 +37,8 @@
* Revision version, must be auto modified by CVS
*/
- public static final String REVISION = ".0-rc1 , SVN $Revision$
$Date$";//$Revision$ $Date$";
+ public static final String REVISION = "0-SNAPSHOT"
+ public static final String SCM_REVISION = " SVN $Revision$
$Date$";//$Revision$ $Date$";
public static final Version _version = new Version();
public String getVendor() {
@@ -60,7 +61,7 @@
*/
private static class Version {
- public static final String _versionInfo =
"v."+MAJOR_VERSION+"."+MINOR_VERSION+"."+REVISION;
+ public static final String _versionInfo =
"v."+MAJOR_VERSION+"."+MINOR_VERSION+"."+REVISION+SCM_REVISION;
public int getMajor() {
return MAJOR_VERSION;
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2007-08-02 23:02:15 UTC (rev 2038)
+++ trunk/ui/assembly/pom.xml 2007-08-03 00:03:30 UTC (rev 2039)
@@ -26,7 +26,7 @@
<uri>
http://richfaces.ajax4jsf.org/rich
</uri>
- <displayName>RichFaces</displayName>
+ <displayName>RichFaces ( Legacy URL )</displayName>
<excludeModules>core</excludeModules>
</taglib>
<taglib>
@@ -53,7 +53,7 @@
<uri>
https://ajax4jsf.dev.java.net/ajax
</uri>
- <displayName>RichFaces</displayName>
+ <displayName>Ajax4jsf ( Legacy URL )</displayName>
<includeModules>core</includeModules>
</taglib>
</taglibs>