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]);