You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ug...@apache.org on 2004/08/11 22:03:28 UTC

svn commit: rev 36246 - in cocoon/branches/butterfly: . src/java/org/apache/butterfly/servlet/multipart src/java/org/apache/butterfly/util

Author: ugo
Date: Wed Aug 11 13:03:27 2004
New Revision: 36246

Modified:
   cocoon/branches/butterfly/.classpath
   cocoon/branches/butterfly/src/java/org/apache/butterfly/servlet/multipart/MultipartHttpServletRequest.java
   cocoon/branches/butterfly/src/java/org/apache/butterfly/util/NetUtils.java
Log:
Fixed deprecations

Modified: cocoon/branches/butterfly/.classpath
==============================================================================
--- cocoon/branches/butterfly/.classpath	(original)
+++ cocoon/branches/butterfly/.classpath	Wed Aug 11 13:03:27 2004
@@ -5,7 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/>
-	<classpathentry kind="lib" path="lib/aopalliance.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="tools/lib/xmlunit1.0.jar"/>
 	<classpathentry kind="lib" path="lib/endorsed/xml-apis.jar"/>
@@ -13,7 +12,6 @@
 	<classpathentry kind="lib" path="lib/commons-lang-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/spring-core.jar"/>
 	<classpathentry kind="lib" path="lib/spring-context.jar"/>
-	<classpathentry kind="lib" path="lib/spring-aop.jar"/>
 	<classpathentry kind="lib" path="tools/lib/jmock-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/groovy-1.0-beta-6.jar"/>
 	<classpathentry kind="lib" path="lib/asm-util-1.4.3.jar"/>

Modified: cocoon/branches/butterfly/src/java/org/apache/butterfly/servlet/multipart/MultipartHttpServletRequest.java
==============================================================================
--- cocoon/branches/butterfly/src/java/org/apache/butterfly/servlet/multipart/MultipartHttpServletRequest.java	(original)
+++ cocoon/branches/butterfly/src/java/org/apache/butterfly/servlet/multipart/MultipartHttpServletRequest.java	Wed Aug 11 13:03:27 2004
@@ -34,9 +34,7 @@
 /**
  * Servlet request wrapper for multipart parser.
  *
- * @author <a href="mailto:j.tervoorde@home.nl">Jeroen ter Voorde</a>
- * @author Stefano Mazzocchi
- * @version CVS $Id: MultipartHttpServletRequest.java,v 1.7 2004/03/05 13:02:58 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class MultipartHttpServletRequest implements HttpServletRequest {
 

Modified: cocoon/branches/butterfly/src/java/org/apache/butterfly/util/NetUtils.java
==============================================================================
--- cocoon/branches/butterfly/src/java/org/apache/butterfly/util/NetUtils.java	(original)
+++ cocoon/branches/butterfly/src/java/org/apache/butterfly/util/NetUtils.java	Wed Aug 11 13:03:27 2004
@@ -37,7 +37,7 @@
  * utility methods
  *
  * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Id: NetUtils.java,v 1.17 2004/07/11 17:18:37 antonio Exp $
+ * @version CVS $Id$
  */
 public class NetUtils {
 
@@ -518,7 +518,7 @@
                 }
             }
         }
-        return URLEncoder.encode(s);
+        return URLEncoder.encode(s, "UTF-8");
     }
 
     /**
@@ -539,6 +539,6 @@
                 }
             }
         }
-        return URLDecoder.decode(s);
+        return URLDecoder.decode(s, "UTF-8");
     }
 }