Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 90933 invoked from network); 10 Dec 2007 20:55:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Dec 2007 20:55:56 -0000 Received: (qmail 84713 invoked by uid 500); 10 Dec 2007 20:55:45 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 84683 invoked by uid 500); 10 Dec 2007 20:55:45 -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 84674 invoked by uid 99); 10 Dec 2007 20:55:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Dec 2007 12:55:45 -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; Mon, 10 Dec 2007 20:55:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B10D01A9832; Mon, 10 Dec 2007 12:55:35 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r603045 - /incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java Date: Mon, 10 Dec 2007 20:55:35 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071210205535.B10D01A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Mon Dec 10 12:55:34 2007 New Revision: 603045 URL: http://svn.apache.org/viewvc?rev=603045&view=rev Log: SLING-117 - workaround for resources resolved up the path removed from DefaultSlingServlet Modified: incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java Modified: incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java?rev=603045&r1=603044&r2=603045&view=diff ============================================================================== --- incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java (original) +++ incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java Mon Dec 10 12:55:34 2007 @@ -101,22 +101,6 @@ } } else if(r.adaptTo(Node.class) != null || r.adaptTo(SyntheticResourceData.class) != null) { - if(r.adaptTo(Node.class) != null) { - // When rendering Nodes, - // make sure we have an Item, and render it via one of our renderingServlets - final String suffix = req.getRequestPathInfo().getSuffix(); - if(suffix != null && suffix.length() > 0) { - // accept exact addressing only for default rendering: - // a non-empty suffix means there was extra stuff after the path - // of the resource - throw new HttpStatusCodeException( - HttpServletResponse.SC_NOT_FOUND, - "Ancestor resource found (" + r.getResourceMetadata().get(ResourceMetadata.RESOLUTION_PATH) + ")" - + " but URL suffix must be empty for default rendering (suffix=" + suffix + ")" - ); - } - } - final String contentType = req.getResponseContentType(); final Servlet s = renderingServlets.get(contentType); if(s!=null) {