Author: ieb
Date: Thu Jul 29 11:09:57 2010
New Revision: 980400
URL: http://svn.apache.org/viewvc?rev=980400&view=rev
Log:
SLING-1193 Fsresoruce and bundle resource implement the 2.0.8 API which means
they cant be used with ResourceUtil, updated.
Modified:
sling/trunk/bundles/extensions/bundleresource/pom.xml
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
sling/trunk/bundles/extensions/fsresource/pom.xml
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
Modified: sling/trunk/bundles/extensions/bundleresource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/pom.xml?rev=980400&r1=980399&r2=980400&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/bundleresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/bundleresource/pom.xml Thu Jul 29 11:09:57
2010
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.8</version>
+ <version>2.0.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java?rev=980400&r1=980399&r2=980400&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
(original)
+++
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
Thu Jul 29 11:09:57 2010
@@ -28,7 +28,7 @@ import java.util.Iterator;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.adapter.SlingAdaptable;
+import org.apache.sling.api.resource.AbstractResource;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
@@ -36,7 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** A Resource that wraps a Bundle entry */
-public class BundleResource extends SlingAdaptable implements Resource {
+public class BundleResource extends AbstractResource implements Resource {
/** default log */
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -208,7 +208,7 @@ public class BundleResource extends Slin
return url;
}
- Iterator<Resource> listChildren() {
+ public Iterator<Resource> listChildren() {
return new BundleResourceIterator(this);
}
Modified: sling/trunk/bundles/extensions/fsresource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=980400&r1=980399&r2=980400&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/fsresource/pom.xml Thu Jul 29 11:09:57 2010
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.8</version>
+ <version>2.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
Modified:
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java?rev=980400&r1=980399&r2=980400&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
(original)
+++
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
Thu Jul 29 11:09:57 2010
@@ -25,7 +25,7 @@ import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.sling.adapter.SlingAdaptable;
+import org.apache.sling.api.resource.AbstractResource;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
* The <code>FsResource</code> represents a file system file or folder as
* a Sling Resource.
*/
-public class FsResource extends SlingAdaptable implements Resource {
+public class FsResource extends AbstractResource implements Resource {
/**
* The resource type for file system files mapped into the resource tree by
