You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/01/16 15:53:51 UTC
svn commit: r1779048 - in
/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal:
FsResource.java FsResourceProvider.java
Author: sseifert
Date: Mon Jan 16 15:53:51 2017
New Revision: 1779048
URL: http://svn.apache.org/viewvc?rev=1779048&view=rev
Log:
SLING-6439 define own property for handling directory references instead of the deprecated ResourceMetadata.INTERNAL_CONTINUE_RESOLVING
Modified:
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
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=1779048&r1=1779047&r2=1779048&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 Mon Jan 16 15:53:51 2017
@@ -111,7 +111,7 @@ public class FsResource extends Abstract
metaData.setModificationTime(file.lastModified());
metaData.setResolutionPath(resourcePath);
if ( this.file.isDirectory() ) {
- metaData.put(ResourceMetadata.INTERNAL_CONTINUE_RESOLVING, Boolean.TRUE);
+ metaData.put(FsResourceProvider.RESOURCE_METADATA_FILE_DIRECTORY, Boolean.TRUE);
}
}
return metaData;
Modified: sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?rev=1779048&r1=1779047&r2=1779048&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java (original)
+++ sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java Mon Jan 16 15:53:51 2017
@@ -26,7 +26,6 @@ import java.util.NoSuchElementException;
import java.util.Set;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.spi.resource.provider.ObservationReporter;
import org.apache.sling.spi.resource.provider.ProviderContext;
@@ -63,7 +62,12 @@ import org.osgi.service.metatype.annotat
})
@Designate(ocd=FsResourceProvider.Config.class, factory=true)
public class FsResourceProvider extends ResourceProvider<Object> {
-
+
+ /**
+ * Resource metadata property set by {@link FsResource} if the underlying file reference is a directory.
+ */
+ static final String RESOURCE_METADATA_FILE_DIRECTORY = ":org.apache.sling.fsprovider.file.directory";
+
@ObjectClassDefinition(name = "Apache Sling Filesystem Resource Provider",
description = "Configure an instance of the filesystem " +
"resource provider in terms of provider root and filesystem location")
@@ -132,7 +136,7 @@ public class FsResourceProvider extends
Resource rsrc = getResource(ctx.getResourceResolver(), path, getFile(path));
// make sure directory resources from parent resource provider have higher precedence than from this provider
// this allows properties like sling:resourceSuperType to take effect
- if ( rsrc == null || rsrc.getResourceMetadata().containsKey(ResourceMetadata.INTERNAL_CONTINUE_RESOLVING) ) {
+ if ( rsrc == null || rsrc.getResourceMetadata().containsKey(RESOURCE_METADATA_FILE_DIRECTORY) ) {
// get resource from shadowed provider
final ResourceProvider rp = ctx.getParentResourceProvider();
if ( rp != null ) {