This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit b1093673f7a9288fb75e68a8932f9fd6fa087ca6 Author: Ian Boston <[email protected]> AuthorDate: Tue May 4 05:49:09 2010 +0000 SLING-1516 A much better fix provided by Felix. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@940732 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/fsprovider/internal/FsResourceProvider.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java index 857d523..93add5b 100644 --- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java +++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java @@ -49,6 +49,7 @@ import org.osgi.service.event.EventAdmin; * label="%resource.resolver.name" * description="%resource.resolver.description" * configurationFactory="true" + * policy="require" * @scr.service interface="ResourceProvider" * @scr.property name="service.description" value="Sling Filesystem Resource * Provider" @@ -200,14 +201,6 @@ public class FsResourceProvider implements ResourceProvider { // ---------- SCR Integration protected void activate(BundleContext bundleContext, Map<?, ?> props) { - - String serviceFactoryPid = (String) props.get("service.factoryPid"); - if ( serviceFactoryPid == null ) { - // this is the activate for the Alias PID and not the configured service, therefore we should not - // do anything here, see OSGi 4.2 compendium v1.1 section 115.3.1 for more details. - return; - } - String providerRoot = (String) props.get(ROOTS); if (providerRoot == null || providerRoot.length() == 0) { throw new IllegalArgumentException(ROOTS + " property must be set"); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
