Author: bpapez
Date: Mon Nov 26 13:14:36 2007
New Revision: 19292
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19292&repname=
=3Djahia
Log:
Remove deprecated the parseStringParameters and removeStringParameters meth=
od, which do not container the encoding String, as getting the default enco=
ding was a Sun specific method
Modified:
trunk/core/src/java/org/jahia/services/applications/ServletIncludeReque=
stWrapper.java
Modified: trunk/core/src/java/org/jahia/services/applications/ServletInclud=
eRequestWrapper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/applications/ServletIncludeRequestWrapper.java&rev=3D1929=
2&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/applications/ServletIncludeReque=
stWrapper.java (original)
+++ trunk/core/src/java/org/jahia/services/applications/ServletIncludeReque=
stWrapper.java Mon Nov 26 13:14:36 2007
@@ -65,7 +65,6 @@
private static Logger logger =3D Logger
.getLogger(ServletIncludeRequestWrapper.class);
=
- static String dfltEncName =3D null;
private String emulatedContextPath;
private URL emulatedURL;
private String emulatedMethod;
@@ -85,11 +84,6 @@
private boolean inheritJahiaSessionAttributes =3D false;
private boolean hideRequestParameter =3D false;
=
- static {
- dfltEncName =3D (String) AccessController
- .doPrivileged(new GetPropertyAction("file.encoding"));
- }
-
/**
* This constructor creates a new emulated request object by substitut=
ing Jahia's URL with the application's URL. This way the
* application will have the impression it is executing itself normall=
y within it's context. It remains to be seen if it seems
@@ -653,29 +647,6 @@
* true if we're parsing parameters on the URL
* @exception IllegalArgumentException
* if the data is malformed
- * @deprecated The processing may vary depending on the platform's def=
ault encoding. Instead, use the
- * removeStringParameters(Map,String,String,boolean) metho=
d to specify the encoding.
- */
- public static void removeStringParameters(Map map, String data,
- boolean urlParameters) {
- removeStringParameters(map, data, dfltEncName, urlParameters);
- }
-
- /**
- * Removes all the attributes specified in the data string for the map=
passed in parameter.
- * <p>
- * <strong>IMPLEMENTATION NOTE</strong>: URL decoding is performed ind=
ividually on the parsed name and value elements, rather than on
- * the entire query string ahead of time, to properly deal with the ca=
se where the name or value includes an encoded "=3D" or "&"
- * character that would otherwise be interpreted as a delimiter.
- * =
- * @param map
- * Map that accumulates the resulting parameters
- * @param data
- * Input string containing request parameters
- * @param urlParameters
- * true if we're parsing parameters on the URL
- * @exception IllegalArgumentException
- * if the data is malformed
*/
public static void removeStringParameters(Map map, String data,
String encoding, boolean urlParameters) {
@@ -737,30 +708,6 @@
* Map that accumulates the resulting parameters
* @param data
* Input string containing request parameters
- * @param urlParameters
- * true if we're parsing parameters on the URL
- * @exception IllegalArgumentException
- * if the data is malformed
- * @deprecated The processing may vary depending on the platform's def=
ault encoding. Instead, use the
- * parseStringParameters(Map,String,String,boolean) method=
to specify the encoding.
- */
- public static void parseStringParameters(Map map, String data,
- boolean urlParameters) {
- parseStringParameters(map, data, dfltEncName, urlParameters);
- }
-
- /**
- * Append request parameters from the specified String to the specifie=
d Map. It is presumed that the specified Map is not accessed from
- * any other thread, so no synchronization is performed.
- * <p>
- * <strong>IMPLEMENTATION NOTE</strong>: URL decoding is performed ind=
ividually on the parsed name and value elements, rather than on
- * the entire query string ahead of time, to properly deal with the ca=
se where the name or value includes an encoded "=3D" or "&"
- * character that would otherwise be interpreted as a delimiter.
- * =
- * @param map
- * Map that accumulates the resulting parameters
- * @param data
- * Input string containing request parameters
* @param encoding
* character encoding of the request parameter string
* @param urlParameters
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
