From sling-commits-return-652-apmail-incubator-sling-commits-archive=incubator.apache.org@incubator.apache.org Fri Dec 07 10:15:00 2007 Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 33446 invoked from network); 7 Dec 2007 10:15:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Dec 2007 10:15:00 -0000 Received: (qmail 40063 invoked by uid 500); 7 Dec 2007 10:14:48 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 40012 invoked by uid 500); 7 Dec 2007 10:14: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 40003 invoked by uid 99); 7 Dec 2007 10:14:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2007 02:14:48 -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; Fri, 07 Dec 2007 10:14:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 20BC81A983A; Fri, 7 Dec 2007 02:14:36 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r602057 - in /incubator/sling/trunk/microsling/microsling-core/src: main/java/org/apache/sling/microsling/slingservlets/renderers/ test/java/org/apache/sling/microsling/integration/ test/java/org/apache/sling/microsling/integration/microjax/ Date: Fri, 07 Dec 2007 10:14:34 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071207101436.20BC81A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Fri Dec 7 02:14:33 2007 New Revision: 602057 URL: http://svn.apache.org/viewvc?rev=602057&view=rev Log: SLING-123 : slingItemDumpRecursionLevel renamed to maxlevels Modified: incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/renderers/JsonRendererServlet.java incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/JsonRenderingTest.java incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/microjax/PostServletOrderTest.java Modified: incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/renderers/JsonRendererServlet.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/renderers/JsonRendererServlet.java?rev=602057&r1=602056&r2=602057&view=diff ============================================================================== --- incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/renderers/JsonRendererServlet.java (original) +++ incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/renderers/JsonRendererServlet.java Fri Dec 7 02:14:33 2007 @@ -47,7 +47,7 @@ /** This optional request parameter sets the recursion level * (into chldren) when dumping a node */ - public static final String PARAM_RECURSION_LEVEL = "slingItemDumpRecursionLevel"; + public static final String PARAM_RECURSION_LEVEL = "maxlevels"; public JsonRendererServlet(String responseContentTypeHeaderValue) { this.responseContentType = responseContentTypeHeaderValue; Modified: incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/JsonRenderingTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/JsonRenderingTest.java?rev=602057&r1=602056&r2=602057&view=diff ============================================================================== --- incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/JsonRenderingTest.java (original) +++ incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/JsonRenderingTest.java Fri Dec 7 02:14:33 2007 @@ -64,7 +64,7 @@ testClient.createNode(parentNodeUrl + "/" + child, props); } - final String json = getContent(parentNodeUrl + ".json?slingItemDumpRecursionLevel=1", CONTENT_TYPE_JSON); + final String json = getContent(parentNodeUrl + ".json?maxlevels=1", CONTENT_TYPE_JSON); assertJavascript(testText, json, "out.print(data.text)"); for(String child : children) { assertJavascript(child, json, "out.print(data['" + child + "'].child)"); @@ -85,7 +85,7 @@ testClient.createNode(parentNodeUrl + "/" + child, props); } - final String json = getContent(parentNodeUrl + ".json?slingItemDumpRecursionLevel=0", CONTENT_TYPE_JSON); + final String json = getContent(parentNodeUrl + ".json?maxlevels=0", CONTENT_TYPE_JSON); assertJavascript(testText, json, "out.print(data.text)"); for(String child : children) { assertJavascript("undefined", json, "out.print(typeof data['" + child + "'])"); Modified: incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/microjax/PostServletOrderTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/microjax/PostServletOrderTest.java?rev=602057&r1=602056&r2=602057&view=diff ============================================================================== --- incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/microjax/PostServletOrderTest.java (original) +++ incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/integration/microjax/PostServletOrderTest.java Fri Dec 7 02:14:33 2007 @@ -54,7 +54,7 @@ } // check that nodes appear in creation order in their parent's list of children - final String json = getContent(postUrl + ".json?slingItemDumpRecursionLevel=2", CONTENT_TYPE_JSON); + final String json = getContent(postUrl + ".json?maxlevels=1", CONTENT_TYPE_JSON); for(int i = 0; i < nodeUrl.length - 1; i++) { final int posA = json.indexOf(nodeName[i]); final int posB = json.indexOf(nodeName[i + 1]); @@ -81,7 +81,7 @@ } // check that nodes appear in reverse creation order in their parent's list of children - final String json = getContent(postUrl + ".json?slingItemDumpRecursionLevel=2", CONTENT_TYPE_JSON); + final String json = getContent(postUrl + ".json?maxlevels=1", CONTENT_TYPE_JSON); for(int i = 0; i < nodeUrl.length - 1; i++) { final int posA = json.indexOf(nodeName[i]); final int posB = json.indexOf(nodeName[i + 1]);