This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.contentloader-2.0.2-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git
commit 1a9cb5369399785d1108930b9dabedabb925b9d6 Author: Carsten Ziegeler <[email protected]> AuthorDate: Fri May 16 10:17:37 2008 +0000 #SLING-414: Move generation and managing of the sling id to own service in the engine. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/contentloader@657002 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 5 +++++ .../sling/jcr/contentloader/internal/ContentLoaderService.java | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 21cc719..7d0dd59 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,11 @@ <version>2.0.0-incubator-SNAPSHOT</version> </dependency> <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.engine</artifactId> + <version>2.0.0-incubator-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java b/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java index b3c05c6..af3c267 100644 --- a/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java +++ b/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java @@ -31,6 +31,7 @@ import javax.jcr.Session; import javax.jcr.lock.LockException; import org.apache.sling.commons.mime.MimeTypeService; +import org.apache.sling.engine.SlingSettingsService; import org.apache.sling.jcr.api.SlingRepository; import org.osgi.framework.Bundle; import org.osgi.framework.BundleEvent; @@ -97,6 +98,10 @@ public class ContentLoaderService implements SynchronousBundleListener { */ private final Set<String> updatedBundles = new HashSet<String>(); + /** @scr.reference + * Sling settings service. */ + protected SlingSettingsService settingsService; + // ---------- BundleListener ----------------------------------------------- /** @@ -188,7 +193,7 @@ public class ContentLoaderService implements SynchronousBundleListener { /** Activates this component, called by SCR before registering as a service */ protected void activate(ComponentContext componentContext) { - this.slingId = componentContext.getBundleContext().getProperty("sling.id"); + this.slingId = this.settingsService.getSlingId(); this.initialContentLoader = new Loader(this); componentContext.getBundleContext().addBundleListener(this); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
