You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/03/12 23:29:59 UTC
svn commit: r636543 - in /incubator/sling/trunk:
launchpad/webapp/src/test/resources/integration-test/dump-resource.ecma
scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java
Author: fmeschbe
Date: Wed Mar 12 15:29:55 2008
New Revision: 636543
URL: http://svn.apache.org/viewvc?rev=636543&view=rev
Log:
SLING-240 Remove ScriptResource.listChildren method again and
rewrite test to use ResourceResolver.listChildren(Resource) instead.
Modified:
incubator/sling/trunk/launchpad/webapp/src/test/resources/integration-test/dump-resource.ecma
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java
Modified: incubator/sling/trunk/launchpad/webapp/src/test/resources/integration-test/dump-resource.ecma
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/resources/integration-test/dump-resource.ecma?rev=636543&r1=636542&r2=636543&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/resources/integration-test/dump-resource.ecma (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/resources/integration-test/dump-resource.ecma Wed Mar 12 15:29:55 2008
@@ -3,9 +3,7 @@
function dumpResource(r, level) {
out.print(level + " " + r + '\n');
- // TODO for now, "children" returns a Java
- // iterator, need a javascript wrapper
- var iterator = r.children;
+ var iterator = r.resourceResolver.listChildren(r);
while(iterator.hasNext()) {
dumpResource(iterator.next(), level + 1);
}
Modified: incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java?rev=636543&r1=636542&r2=636543&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java (original)
+++ incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java Wed Mar 12 15:29:55 2008
@@ -88,14 +88,6 @@
return jsFunction_getMetadata();
}
- // TODO a wrapper would be more convenient than an Iterator,
- // but in my tests ScriptableItemMap didn't seem to allow
- // proper wrapping of its elements: javascript constructor
- // not found when scope = ScriptableItemMap
- public Iterator<Resource> jsGet_children() {
- return resource.getResourceResolver().listChildren(resource);
- }
-
public Object jsFunction_getResourceResolver() {
return toJS(resource.getResourceResolver());
}