Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 20706 invoked from network); 2 Nov 2007 10:17:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Nov 2007 10:17:09 -0000 Received: (qmail 8644 invoked by uid 500); 2 Nov 2007 10:16:57 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 8629 invoked by uid 500); 2 Nov 2007 10:16:56 -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 8610 invoked by uid 99); 2 Nov 2007 10:16:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2007 03:16:56 -0700 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; Fri, 02 Nov 2007 10:17:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0F0961A9832; Fri, 2 Nov 2007 03:16:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r591291 - in /incubator/sling/trunk/microsling/microsling-core/src: main/java/org/apache/sling/microsling/slingservlets/ test/java/org/apache/sling/microsling/integration/ Date: Fri, 02 Nov 2007 10:16:41 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071102101645.0F0961A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Fri Nov 2 03:16:40 2007 New Revision: 591291 URL: http://svn.apache.org/viewvc?rev=591291&view=rev Log: SLING-93 - preparing for JSON renderer, DefaultSlingServlet selects renderer based on response content-type, not extension Modified: incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/CreateNodeTest.java incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/NodetypeRenderingTest.java incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/SlingResourceTypeRenderingTest.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=591291&r1=591290&r2=591291&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 Fri Nov 2 03:16:40 2007 @@ -54,8 +54,8 @@ private Map renderingServlets = new HashMap (); public DefaultSlingServlet() { - renderingServlets.put("txt", new PlainTextRendererServlet()); - renderingServlets.put("html", new DefaultHtmlRendererServlet()); + renderingServlets.put("text/plain", new PlainTextRendererServlet()); + renderingServlets.put("text/html", new DefaultHtmlRendererServlet()); } @Override @@ -83,17 +83,14 @@ // make sure we have an Item, and render it via one of our renderingServlets final Object data = r.getRawData(); if(data!=null && (data instanceof Item)) { - String ext = req.getRequestPathInfo().getExtension(); - if (ext == null) { - ext = "txt"; - } - final Servlet s = renderingServlets.get(ext); + final String contentType = req.getResponseContentType(); + final Servlet s = renderingServlets.get(contentType); if(s!=null) { s.service(req, resp); } else { throw new HttpStatusCodeException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, - "No default renderer found for extension='" + ext + "'" + "No default renderer found for Content-Type='" + contentType + "'" + ", use one of these extensions: " + renderingServlets.keySet() ); } Modified: incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/CreateNodeTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/CreateNodeTest.java?rev=591291&r1=591290&r2=591291&view=diff ============================================================================== --- incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/CreateNodeTest.java (original) +++ incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/CreateNodeTest.java Fri Nov 2 03:16:40 2007 @@ -53,6 +53,12 @@ getContent(urlOfNewNode, "text/plain"); getContent(urlOfNewNode + ".txt", "text/plain"); getContent(urlOfNewNode + ".html", "text/html"); - assertHttpStatus(urlOfNewNode + ".noRendererForThisExtension", 500); + + // funny extensions are rendered as text/plain + getContent(urlOfNewNode + ".someWeirdExtension", "text/plain"); + + // but well-known extensions for which we have no renderer fail + assertHttpStatus(urlOfNewNode + ".xml", 500); + assertHttpStatus(urlOfNewNode + ".pdf", 500); } } Modified: incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/NodetypeRenderingTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/NodetypeRenderingTest.java?rev=591291&r1=591290&r2=591291&view=diff ============================================================================== --- incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/NodetypeRenderingTest.java (original) +++ incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/NodetypeRenderingTest.java Fri Nov 2 03:16:40 2007 @@ -33,8 +33,8 @@ // set test values testText = "This is a test " + System.currentTimeMillis(); - // create the test node - final String url = HTTP_BASE_URL + TEST_PATH + ".sling"; + // create the test node, under a path that's specific to this class to allow collisions + final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "." + System.currentTimeMillis() + ".sling"; final Map props = new HashMap(); props.put("text", testText); displayUrl = testClient.createNode(url, props); Modified: incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/SlingResourceTypeRenderingTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/SlingResourceTypeRenderingTest.java?rev=591291&r1=591290&r2=591291&view=diff ============================================================================== --- incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/SlingResourceTypeRenderingTest.java (original) +++ incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/SlingResourceTypeRenderingTest.java Fri Nov 2 03:16:40 2007 @@ -36,8 +36,8 @@ slingResourceType = "integration-test/srt." + System.currentTimeMillis(); testText = "This is a test " + System.currentTimeMillis(); - // create the test node - final String url = HTTP_BASE_URL + TEST_PATH + ".sling"; + // create the test node, under a path that's specific to this class to allow collisions + final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "." + System.currentTimeMillis() + ".sling"; final Map props = new HashMap(); props.put("slingResourceType", slingResourceType); props.put("text", testText);