[richfaces-svn-commits] JBoss Rich Faces SVN: r9832 - in trunk/framework/impl/src/main/java/org/ajax4jsf: webapp and 1 other directory.
Author: nbelaevski
Date: 2008-07-30 12:26:35 -0400 (Wed, 30 Jul 2008)
New Revision: 9832
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/util/base64/URL64Codec.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
Log:
https://jira.jboss.org/jira/browse/RF-3586
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/util/base64/URL64Codec.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/util/base64/URL64Codec.java 2008-07-30
14:04:05 UTC (rev 9831)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/util/base64/URL64Codec.java 2008-07-30
16:26:35 UTC (rev 9832)
@@ -42,7 +42,7 @@
/**
* Provides Base64 encoding and decoding like defined by RFC 2045, but with little
difference :
- * chars '=' '+' and '/' , incorrectly processed in URL by any
browsers, replaced by '_' '-' '.',
+ * chars '=' '+' and '/' , incorrectly processed in URL by any
browsers, replaced by '_' '-' '!',
*
*
* @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
@@ -131,7 +131,7 @@
// To compatible with URL format, change '+' and '/' to :
base64Alphabet['-'] = 62;
- base64Alphabet['.'] = 63;
+ base64Alphabet['!'] = 63;
for (int i = 0; i <= 25; i++) {
lookUpBase64Alphabet[i] = (byte) ('A' + i);
@@ -147,7 +147,7 @@
// To compatible with URL format, change '+' and '/' to :
lookUpBase64Alphabet[62] = (byte) '-';
- lookUpBase64Alphabet[63] = (byte) '.';
+ lookUpBase64Alphabet[63] = (byte) '!';
}
private static boolean isBase64(byte octect) {
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2008-07-30 14:04:05
UTC (rev 9831)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2008-07-30 16:26:35
UTC (rev 9832)
@@ -68,6 +68,8 @@
static final String WEB_XML = "/WEB-INF/web.xml";
+ public static final String RESOURCE_URI_PREFIX_START = "a4j";
+
public static final String RESOURCE_URI_PREFIX;
static {
@@ -75,7 +77,7 @@
Version version = versionBean.getVersion();
//that's to prevent static compile-time linkage to constant values
- RESOURCE_URI_PREFIX = "a4j_"
+ RESOURCE_URI_PREFIX = RESOURCE_URI_PREFIX_START + "/" +
+ version.getMajor() + "_" + version.getMinor() + "_"
+ version.getRevision();
}