Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 20740 invoked from network); 8 May 2008 09:18:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 May 2008 09:18:46 -0000 Received: (qmail 85571 invoked by uid 500); 8 May 2008 09:18:48 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 85529 invoked by uid 500); 8 May 2008 09:18:48 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 85520 invoked by uid 99); 8 May 2008 09:18:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 May 2008 02:18:48 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 May 2008 09:18:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5B9532388A04; Thu, 8 May 2008 02:18:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r654454 - in /incubator/sling/trunk: launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/ sling/core/src/main/java/org/apache/sling/core/impl/parameters/ sling/servlets-post/src/main/java/org/apache/slin... Date: Thu, 08 May 2008 09:18:23 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080508091823.5B9532388A04@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Thu May 8 02:18:22 2008 New Revision: 654454 URL: http://svn.apache.org/viewvc?rev=654454&view=rev Log: SLING-298: Rename request parameter FormEncoding to _charset_. Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java?rev=654454&r1=654453&r2=654454&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java Thu May 8 02:18:22 2008 @@ -129,7 +129,7 @@ // force form encoding to UTF-8, which is what we use to convert the // string parts into stream data - nodeProperties.put("FormEncoding", "UTF-8"); + nodeProperties.put("_charset_", "UTF-8"); if( nodeProperties.size() > 0) { if(multiPart) { Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java?rev=654454&r1=654453&r2=654454&view=diff ============================================================================== --- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java (original) +++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java Thu May 8 02:18:22 2008 @@ -108,7 +108,7 @@ } } - // apply any FormEncoding in the parameter map + // apply any form encoding (from '_charset_') in the parameter map Util.fixEncoding(parameters); this.postParameterMap = parameters; Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java?rev=654454&r1=654453&r2=654454&view=diff ============================================================================== --- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java (original) +++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java Thu May 8 02:18:22 2008 @@ -32,8 +32,8 @@ */ class Util { - /** The name of the FormEncoding parameter */ - public final static String PARAMETER_FORMENCODING = "FormEncoding"; + /** The name of the form encoding parameter */ + public final static String PARAMETER_FORMENCODING = "_charset_"; // ISO-8859-1 mapps all characters 0..255 to \u0000..\u00ff directly public static final String ENCODING_DIRECT = "ISO-8859-1"; @@ -78,7 +78,7 @@ // default the encoding to ISO-8859-1 (aka direct, 1:1 encoding) String formEncoding = ENCODING_DIRECT; - // check whether a FormEncoding parameter overwrites this default + // check whether a form encoding parameter overwrites this default RequestParameter[] feParm = parameterMap.get(PARAMETER_FORMENCODING); if (feParm != null) { // get and check form encoding Modified: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java?rev=654454&r1=654453&r2=654454&view=diff ============================================================================== --- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java (original) +++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java Thu May 8 02:18:22 2008 @@ -577,8 +577,8 @@ if (paramName.endsWith(SlingPostServlet.DEFAULT_VALUE_SUFFIX)) { continue; } - // SLING-298: skip FormEncoding parameter - if (paramName.equals("FormEncoding")) { + // SLING-298: skip form encoding parameter + if (paramName.equals("_charset_")) { continue; } // skip parameters that do not start with the save prefix