Author: cziegeler
Date: Sun Sep 22 18:22:22 2013
New Revision: 1525409
URL: http://svn.apache.org/r1525409
Log:
SLING-2944 Implement Service User Mapper; create copy of authentication map
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java?rev=1525409&r1=1525408&r2=1525409&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
Sun Sep 22 18:22:22 2013
@@ -117,6 +117,12 @@ public interface ResourceProvider {
* the resource provider cannot find it. The path should have one of the
{@link #ROOTS}
* strings as its prefix.
*
+ * The resource provider must not return cached instances for a resource as
+ * the resource resolver will update the resource metadata of the resource
+ * at the end of the resolution process and this metadata might be
different
+ * depending on the full path of resource resolution passed into the
+ * resource resolver.
+ *
* @param resourceResolver
* The {@link ResourceResolver} to which the returned {@link
Resource} is attached.
* @return <code>null</code> If this provider does not have a resource for
@@ -143,6 +149,9 @@ public interface ResourceProvider {
* tree. Such resources SHOULD be {@link SyntheticResource} objects whose
resource type MUST be set to
* {@link #RESOURCE_TYPE_SYNTHETIC}.
*
+ * As with {@link #getResource(ResourceResolver, String)} the returned
Resource objects must
+ * not be cached objects.
+ *
* @param parent
* The {@link Resource Resource} whose children are requested.
* @return An <code>Iterator</code> of {@link Resource} objects or
<code>null</code> if the resource
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java?rev=1525409&r1=1525408&r2=1525409&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
Sun Sep 22 18:22:22 2013
@@ -47,7 +47,7 @@ public interface ResourceProviderFactory
String PROPERTY_REQUIRED = "required";
/**
- * The authentication information property referrring to the bundle
+ * The authentication information property referring to the bundle
* providing a service for which a resource provider is to be retrieved. If
* this property is provided, the
* {@link ResourceResolverFactory#SUBSERVICE} property may also be
@@ -128,7 +128,7 @@ public interface ResourceProviderFactory
* issues. Implementations may implement this method at their
* discretion but must support the new service based resource
* provider generation in the {@link #getResourceProvider(Map)}
- * method honouring the {@link #SERVICE_BUNDLE} and
+ * method honoring the {@link #SERVICE_BUNDLE} and
* {@link ResourceResolverFactory#SUBSERVICE} properties.
*/
@Deprecated
