Author: cziegeler
Date: Tue May 29 07:30:45 2012
New Revision: 1343577
URL: http://svn.apache.org/viewvc?rev=1343577&view=rev
Log:
SLING-2396 : Add new resource provider interfaces (WiP)
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
sling/whiteboard/SLING-2396/resourceresolver/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java?rev=1343577&r1=1343576&r2=1343577&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
(original)
+++
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
Tue May 29 07:30:45 2012
@@ -58,18 +58,21 @@ import org.slf4j.LoggerFactory;
* providing the following
* functionality:
* <ul>
- * <li><code>JcrResourceResolverFactory</code> service
- * <li>Bundle listener to load initial content and manage OCM mapping
descriptors provided by
- * bundles.
+ * <li><code>ResourceResolverFactory</code> service
* <li>Fires OSGi EventAdmin events on behalf of internal helper objects
* </ul>
- *
+ *
*/
-@Component(immediate = true, label = "%resource.resolver.name", description =
"%resource.resolver.description", specVersion = "1.1", metatype = true)
+@Component(
+ name =
"org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl",
+ label = "%resource.resolver.name",
+ description = "%resource.resolver.description",
+ specVersion = "1.1",
+ metatype = true)
@Service(value = ResourceResolverFactory.class)
-@Properties({ @Property(name = Constants.SERVICE_DESCRIPTION, value = "Sling
JcrResourceResolverFactory Implementation"),
+@Properties({
+ @Property(name = Constants.SERVICE_DESCRIPTION, value = "Apache Sling
ResourceResolverFactory Implementation"),
@Property(name = Constants.SERVICE_VENDOR, value = "The Apache Software
Foundation")
-
})
@References({
@Reference(name = "ResourceProvider", referenceInterface =
ResourceProvider.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
policy = ReferencePolicy.DYNAMIC),
@@ -106,7 +109,7 @@ public class ResourceResolverFactoryImpl
* of URI references with a scheme.
* <p>
* The default value of this property if no configuration is provided is
<code>true</code>.
- *
+ *
*/
@Property(boolValue = true)
private static final String PROP_MANGLE_NAMESPACES =
"resource.resolver.manglenamespaces";
@@ -238,7 +241,7 @@ public class ResourceResolverFactoryImpl
* Getter for rootProviderEntry, making it easier to extend
* JcrResourceResolverFactoryImpl. See <a
* href="https://issues.apache.org/jira/browse/SLING-730";>SLING-730</a>
- *
+ *
* @return Our rootProviderEntry
*/
protected RootResourceProviderEntry getRootProviderEntry() {
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1343577&r1=1343576&r2=1343577&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/resourceresolver/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
sling/whiteboard/SLING-2396/resourceresolver/src/main/resources/OSGI-INF/metatype/metatype.properties
Tue May 29 07:30:45 2012
@@ -24,9 +24,9 @@
# the SCR plugin
#
-# Localizations for JcrResourceResolverFactoryImpl configuration
-resource.resolver.name = Apache Sling JCR Resource Resolver
-resource.resolver.description = Configures the JCR Resource Resolver for
request \
+# Localizations for Resource Resolver Factory configuration
+resource.resolver.name = Apache Sling Resource Resolver Factory
+resource.resolver.description = Configures the Resource Resolver for request \
URL and resource path rewriting.
resource.resolver.map.location.name = Mapping Location
@@ -71,8 +71,3 @@ resource.resolver.manglenamespaces.descr
containing colons, even though they are perfectly valid characters in the \
path part of URI references with a scheme. The default value of this property
\
if no configuration is provided is "true".
-
-resource.resolver.multiworkspace.name=Enable Multi Workspaces
-resource.resolver.multiworkspace.description=If this is enabled, multiple
workspaces are supported \
- This includes registering observation listeners for all workspaces and allows
to \
- resolve resources from other workspaces than the default one.
