You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/07/09 13:53:15 UTC
[sling-whiteboard] branch master updated: Initial whitelist runtime
handling implementation
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new b479488 Initial whitelist runtime handling implementation
b479488 is described below
commit b4794884a19daef5ee3244a1f055e99f4acf72c9
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Mon Jul 9 14:52:52 2018 +0100
Initial whitelist runtime handling implementation
---
featuremodel/feature-whitelist/pom.xml | 2 +-
.../java/org/apache/sling/feature/whitelist/impl/Activator.java | 6 +++---
.../org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java | 8 ++++----
.../apache/sling/feature/whitelist/impl/WhitelistEnforcer.java | 6 +++---
.../apache/sling/feature/whitelist/impl/ResolverHookImplTest.java | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/featuremodel/feature-whitelist/pom.xml b/featuremodel/feature-whitelist/pom.xml
index 0aa23b9..05648d9 100644
--- a/featuremodel/feature-whitelist/pom.xml
+++ b/featuremodel/feature-whitelist/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>0.1.2</version>
+ <version>0.1.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/Activator.java b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/Activator.java
index 92ba241..27caf1e 100644
--- a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/Activator.java
+++ b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/Activator.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.feature.whitelist.impl;
-import org.apache.sling.feature.service.FeatureService;
+import org.apache.sling.feature.service.Features;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -31,12 +31,12 @@ import java.util.Dictionary;
import java.util.Hashtable;
public class Activator implements BundleActivator {
- private ServiceTracker<FeatureService, FeatureService> tracker;
+ private ServiceTracker<Features, Features> tracker;
private ServiceRegistration<?> resolverHookServiceRegistration;
@Override
public synchronized void start(BundleContext context) throws Exception {
- tracker = new ServiceTracker<>(context, FeatureService.class, null);
+ tracker = new ServiceTracker<>(context, Features.class, null);
tracker.open();
WhitelistEnforcer whitelistEnforcer = new WhitelistEnforcer(tracker);
diff --git a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java
index 46ce493..97da602 100644
--- a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java
+++ b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java
@@ -19,7 +19,7 @@
package org.apache.sling.feature.whitelist.impl;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.service.FeatureService;
+import org.apache.sling.feature.service.Features;
import org.apache.sling.feature.whitelist.WhitelistService;
import org.osgi.framework.hooks.resolver.ResolverHook;
import org.osgi.framework.namespace.PackageNamespace;
@@ -35,10 +35,10 @@ import java.util.Set;
class ResolverHookImpl implements ResolverHook {
private static final long SERVICE_WAIT_TIMEOUT = 60000;
- private final ServiceTracker<FeatureService, FeatureService> featureServiceTracker;
+ private final ServiceTracker<Features, Features> featureServiceTracker;
private final WhitelistService whitelistService;
- public ResolverHookImpl(ServiceTracker<FeatureService, FeatureService> tracker,
+ public ResolverHookImpl(ServiceTracker<Features, Features> tracker,
WhitelistService wls) {
featureServiceTracker = tracker;
whitelistService = wls;
@@ -63,7 +63,7 @@ class ResolverHookImpl implements ResolverHook {
long reqBundleID = requirement.getRevision().getBundle().getBundleId();
try {
- FeatureService fs = featureServiceTracker.waitForService(SERVICE_WAIT_TIMEOUT);
+ Features fs = featureServiceTracker.waitForService(SERVICE_WAIT_TIMEOUT);
// The Feature Service could not be found, skip candidate pruning
if (fs == null) {
diff --git a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/WhitelistEnforcer.java b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/WhitelistEnforcer.java
index 95e25d2..26b68c2 100644
--- a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/WhitelistEnforcer.java
+++ b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/WhitelistEnforcer.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.feature.whitelist.impl;
-import org.apache.sling.feature.service.FeatureService;
+import org.apache.sling.feature.service.Features;
import org.apache.sling.feature.whitelist.WhitelistService;
import org.osgi.framework.hooks.resolver.ResolverHook;
import org.osgi.framework.hooks.resolver.ResolverHookFactory;
@@ -45,10 +45,10 @@ class WhitelistEnforcer implements ResolverHookFactory, ManagedService {
private static final String CONFIG_FEATURE_MAPPING_PREFIX = "whitelist.feature.";
static final Logger LOG = LoggerFactory.getLogger(WhitelistEnforcer.class);
- final ServiceTracker<FeatureService, FeatureService> featureServiceTracker;
+ final ServiceTracker<Features, Features> featureServiceTracker;
volatile WhitelistService whitelistService = new NullWhitelistService();
- WhitelistEnforcer(ServiceTracker<FeatureService, FeatureService> tracker) {
+ WhitelistEnforcer(ServiceTracker<Features, Features> tracker) {
featureServiceTracker = tracker;
}
diff --git a/featuremodel/feature-whitelist/src/test/java/org/apache/sling/feature/whitelist/impl/ResolverHookImplTest.java b/featuremodel/feature-whitelist/src/test/java/org/apache/sling/feature/whitelist/impl/ResolverHookImplTest.java
index fbfbbe0..7ef0489 100644
--- a/featuremodel/feature-whitelist/src/test/java/org/apache/sling/feature/whitelist/impl/ResolverHookImplTest.java
+++ b/featuremodel/feature-whitelist/src/test/java/org/apache/sling/feature/whitelist/impl/ResolverHookImplTest.java
@@ -20,7 +20,7 @@ package org.apache.sling.feature.whitelist.impl;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.service.FeatureService;
+import org.apache.sling.feature.service.Features;
import org.apache.sling.feature.whitelist.WhitelistService;
import org.junit.Test;
import org.mockito.Mockito;
@@ -54,7 +54,7 @@ public class ResolverHookImplTest {
ArtifactId fid2 = new ArtifactId("gid2", "aid2", "1.0.0-SNAPSHOT", null, null);
Feature f2 = new Feature(fid2);
- FeatureService fs = Mockito.mock(FeatureService.class);
+ Features fs = Mockito.mock(Features.class);
Mockito.when(fs.getFeatureForBundle(7)).thenReturn(f);
Mockito.when(fs.getFeatureForBundle(9)).thenReturn(f2);
Mockito.when(fs.getFeatureForBundle(10)).thenReturn(f2);