Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 80442 invoked from network); 7 Feb 2008 11:33:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Feb 2008 11:33:21 -0000 Received: (qmail 14714 invoked by uid 500); 7 Feb 2008 11:33:14 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 14690 invoked by uid 500); 7 Feb 2008 11:33:14 -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 14681 invoked by uid 99); 7 Feb 2008 11:33:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 03:33:14 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 11:33:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4BD4D1A9832; Thu, 7 Feb 2008 03:32:58 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r619366 - in /incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request: SlingRequestDispatcher.java SlingRequestPathInfo.java Date: Thu, 07 Feb 2008 11:32:56 -0000 To: sling-commits@incubator.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080207113258.4BD4D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Thu Feb 7 03:32:47 2008 New Revision: 619366 URL: http://svn.apache.org/viewvc?rev=619366&view=rev Log: SLING-234 use new getter methods on RequestDispatcherOptions Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java?rev=619366&r1=619365&r2=619366&view=diff ============================================================================== --- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java (original) +++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java Thu Feb 7 03:32:47 2008 @@ -109,7 +109,7 @@ info = info.merge(options); // ensure overwritten resource type - String rtOverwrite = options.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE); + String rtOverwrite = options.getForceResourceType(); if (rtOverwrite != null && !rtOverwrite.equals(resource.getResourceType())) { resource = new ResourceWrapper(resource, rtOverwrite); Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java?rev=619366&r1=619365&r2=619366&view=diff ============================================================================== --- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java (original) +++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java Thu Feb 7 03:32:47 2008 @@ -146,7 +146,7 @@ boolean needCreate = false; // replacement selectors - String selectors = options.get(RequestDispatcherOptions.OPT_REPLACE_SELECTORS); + String selectors = options.getReplaceSelectors(); if (selectors != null) { needCreate = true; } else { @@ -154,7 +154,7 @@ } // additional selectors - String selectorsAdd = options.get(RequestDispatcherOptions.OPT_ADD_SELECTORS); + String selectorsAdd = options.getAddSelectors(); if (selectorsAdd != null) { if (selectors != null) { selectors += "." + selectorsAdd; @@ -165,7 +165,7 @@ } // suffix replacement - String suffix = options.get(RequestDispatcherOptions.REPLACE_SUFFIX); + String suffix = options.getReplaceSuffix(); if (suffix != null) { needCreate = true; } else {