mpoeschl 02/03/15 04:50:17
Modified: src/java/org/apache/turbine/util/parser
DefaultParameterParser.java
src/java/org/apache/jserv JServUtils.java
Log:
replace JServUtils by java.net.URLDecoder and deprecate it
Revision Changes Path
1.3 +9 -10
jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
Index: DefaultParameterParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultParameterParser.java 9 Sep 2001 01:31:29 -0000 1.2
+++ DefaultParameterParser.java 15 Mar 2002 12:50:17 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,13 +54,12 @@
* <http://www.apache.org/>.
*/
+import java.net.URLDecoder;
import java.util.Enumeration;
import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
-import org.apache.jserv.JServUtils;
-
import org.apache.turbine.util.Log;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.TurbineException;
@@ -90,7 +89,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: DefaultParameterParser.java,v 1.2 2001/09/09 01:31:29 fedor Exp $
+ * @version $Id: DefaultParameterParser.java,v 1.3 2002/03/15 12:50:17 mpoeschl Exp
$
*/
public class DefaultParameterParser
extends BaseValueParser
@@ -216,12 +215,12 @@
{
if ( name == true )
{
- tmp = JServUtils.URLDecode(st.nextToken());
+ tmp = URLDecoder.decode(st.nextToken());
name = false;
}
else
{
- pathPart = JServUtils.URLDecode(st.nextToken());
+ pathPart = URLDecoder.decode(st.nextToken());
if ( tmp.length() != 0 )
{
add (convert(tmp), pathPart);
1.2 +6 -5 jakarta-turbine-2/src/java/org/apache/jserv/JServUtils.java
Index: JServUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/jserv/JServUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JServUtils.java 16 Aug 2001 05:08:27 -0000 1.1
+++ JServUtils.java 15 Mar 2002 12:50:17 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -70,7 +70,8 @@
*
* @author <a href="mailto:unknown";>Francis J. Lacoste</a>
* @author <a href="mailto:unknown";>Ian Kluft</a>
- * @version $Id: JServUtils.java,v 1.1 2001/08/16 05:08:27 jvanzyl Exp $
+ * @version $Id: JServUtils.java,v 1.2 2002/03/15 12:50:17 mpoeschl Exp $
+ * @deprecated
*/
public final class JServUtils
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
