[sling-org-apache-sling-resourcemerger] 08/23: SLING-3423 - ResourceMergerService API must allow custom merge paths

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.2.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit ddecb4cc0dd0524f4db730a2b9c422bd377873a0
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Sep 4 08:43:48 2014 +0000

    SLING-3423 - ResourceMergerService API must allow custom merge paths
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1622419
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../impl/MergedResourcePickerWhiteboard.java       | 51 ++++++++++++++--------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
index 7449047..b6bd79e 100644
--- 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
+++ 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
@@ -20,6 +20,8 @@ package org.apache.sling.resourcemerger.impl;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
@@ -29,6 +31,7 @@ import org.apache.sling.api.resource.ResourceProviderFactory;
 import org.apache.sling.commons.osgi.PropertiesUtil;
 import org.apache.sling.resourcemerger.spi.MergedResourcePicker;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.util.tracker.ServiceTracker;
@@ -41,8 +44,10 @@ public class MergedResourcePickerWhiteboard implements 
ServiceTrackerCustomizer
 
     private BundleContext bundleContext;
 
+    private final Map<Long, ServiceRegistration> serviceRegistrations = new 
ConcurrentHashMap<Long, ServiceRegistration>();
+
     @Activate
-    protected void activate(BundleContext bundleContext) {
+    protected void activate(final BundleContext bundleContext) {
         this.bundleContext = bundleContext;
         tracker = new ServiceTracker(bundleContext, 
MergedResourcePicker.class.getName(), this);
         tracker.open();
@@ -53,28 +58,38 @@ public class MergedResourcePickerWhiteboard implements 
ServiceTrackerCustomizer
         tracker.close();
     }
 
-    public Object addingService(ServiceReference reference) {
-        MergedResourcePicker picker = (MergedResourcePicker) 
bundleContext.getService(reference);
-        String mergeRoot = 
PropertiesUtil.toString(reference.getProperty(MergedResourcePicker.MERGE_ROOT), 
null);
-        if (mergeRoot != null) {
-            ResourceProviderFactory providerFactory = new 
MergingResourceProviderFactory(mergeRoot, picker);
-            Dictionary<Object, Object> props = new Hashtable<Object, Object>();
-            props.put(ResourceProvider.ROOTS, mergeRoot);
-            props.put(ResourceProvider.OWNS_ROOTS, true);
-            return 
bundleContext.registerService(ResourceProviderFactory.class.getName(), 
providerFactory, props);
-        } else {
-            return null;
+    public Object addingService(final ServiceReference reference) {
+        final MergedResourcePicker picker = (MergedResourcePicker) 
bundleContext.getService(reference);
+        if ( picker != null ) {
+            final String mergeRoot = 
PropertiesUtil.toString(reference.getProperty(MergedResourcePicker.MERGE_ROOT), 
null);
+            if (mergeRoot != null) {
+                final ResourceProviderFactory providerFactory = new 
MergingResourceProviderFactory(mergeRoot, picker);
+                final Dictionary<Object, Object> props = new Hashtable<Object, 
Object>();
+                props.put(ResourceProvider.ROOTS, mergeRoot);
+                props.put(ResourceProvider.OWNS_ROOTS, true);
+
+                final Long key = (Long) 
reference.getProperty(Constants.SERVICE_ID);
+                final ServiceRegistration reg = 
bundleContext.registerService(ResourceProviderFactory.class.getName(), 
providerFactory, props);
+
+                serviceRegistrations.put(key, reg);
+
+            }
+            return picker;
         }
+        return null;
     }
 
-    public void modifiedService(ServiceReference reference, Object service) {
-        // TODO Auto-generated method stub
-
+    public void modifiedService(final ServiceReference reference, final Object 
service) {
+        removedService(reference, service);
+        addingService(reference);
     }
 
-    public void removedService(ServiceReference reference, Object service) {
-        if (service instanceof ServiceRegistration) {
-            ((ServiceRegistration) service).unregister();
+    public void removedService(final ServiceReference reference, final Object 
service) {
+        final Long key = (Long) reference.getProperty(Constants.SERVICE_ID);
+        final ServiceRegistration reg = serviceRegistrations.get(key);
+        if ( reg != null ) {
+            reg.unregister();
+            this.bundleContext.ungetService(reference);
         }
     }
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.