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/11/05 11:02:02 UTC
[sling-whiteboard] branch master updated: Rename whitelisting to
apiregions
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 ff3fdf4 Rename whitelisting to apiregions
ff3fdf4 is described below
commit ff3fdf4968d01cd030a1848e36ee879fafe1cf07
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Mon Nov 5 11:01:44 2018 +0000
Rename whitelisting to apiregions
---
.../apache/sling/feature/extension/apiregions/AbstractHandler.java | 2 +-
.../META-INF/services/org.apache.sling.feature.builder.MergeHandler | 2 +-
.../services/org.apache.sling.feature.builder.PostProcessHandler | 4 ++--
.../extension/apiregions/BundleArtifactFeatureHandlerTest.java | 6 +++---
.../feature/extension/apiregions/BundleMappingHandlerTest.java | 3 +--
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/featuremodel/feature-extension-apiregions/src/main/java/org/apache/sling/feature/extension/apiregions/AbstractHandler.java b/featuremodel/feature-extension-apiregions/src/main/java/org/apache/sling/feature/extension/apiregions/AbstractHandler.java
index 122c22b..32321a2 100644
--- a/featuremodel/feature-extension-apiregions/src/main/java/org/apache/sling/feature/extension/apiregions/AbstractHandler.java
+++ b/featuremodel/feature-extension-apiregions/src/main/java/org/apache/sling/feature/extension/apiregions/AbstractHandler.java
@@ -29,7 +29,7 @@ import java.util.Date;
import java.util.Properties;
class AbstractHandler {
- private static final String FILE_PREFIX = "whitelisting.";
+ private static final String FILE_PREFIX = "apiregions.";
protected File getDataFile(String name) throws IOException {
Path p = Files.createTempFile(FILE_PREFIX, name);
diff --git a/featuremodel/feature-extension-apiregions/src/main/resources/META-INF/services/org.apache.sling.feature.builder.MergeHandler b/featuremodel/feature-extension-apiregions/src/main/resources/META-INF/services/org.apache.sling.feature.builder.MergeHandler
index 359d2fa..ec6db93 100644
--- a/featuremodel/feature-extension-apiregions/src/main/resources/META-INF/services/org.apache.sling.feature.builder.MergeHandler
+++ b/featuremodel/feature-extension-apiregions/src/main/resources/META-INF/services/org.apache.sling.feature.builder.MergeHandler
@@ -1 +1 @@
-org.apache.sling.feature.whitelisting.extensions.APIRegionHandler
+org.apache.sling.feature.extension.apiregions.APIRegionMergeHandler
diff --git a/featuremodel/feature-extension-apiregions/src/main/resources/META-INF/services/org.apache.sling.feature.builder.PostProcessHandler b/featuremodel/feature-extension-apiregions/src/main/resources/META-INF/services/org.apache.sling.feature.builder.PostProcessHandler
index 22b67f7..1bf6138 100644
--- a/featuremodel/feature-extension-apiregions/src/main/resources/META-INF/services/org.apache.sling.feature.builder.PostProcessHandler
+++ b/featuremodel/feature-extension-apiregions/src/main/resources/META-INF/services/org.apache.sling.feature.builder.PostProcessHandler
@@ -1,2 +1,2 @@
-org.apache.sling.feature.whitelisting.extensions.BundleMappingHandler
-org.apache.sling.feature.whitelisting.extensions.BundleArtifactFeatureHandler
+org.apache.sling.feature.extension.apiregions.BundleMappingHandler
+org.apache.sling.feature.extension.apiregions.BundleArtifactFeatureHandler
diff --git a/featuremodel/feature-extension-apiregions/src/test/java/org/apache/sling/feature/extension/apiregions/BundleArtifactFeatureHandlerTest.java b/featuremodel/feature-extension-apiregions/src/test/java/org/apache/sling/feature/extension/apiregions/BundleArtifactFeatureHandlerTest.java
index 3cff17f..e8b5ca9 100644
--- a/featuremodel/feature-extension-apiregions/src/test/java/org/apache/sling/feature/extension/apiregions/BundleArtifactFeatureHandlerTest.java
+++ b/featuremodel/feature-extension-apiregions/src/test/java/org/apache/sling/feature/extension/apiregions/BundleArtifactFeatureHandlerTest.java
@@ -47,7 +47,7 @@ public class BundleArtifactFeatureHandlerTest {
ex.setJSON("[]");
bafh.postProcess(null, f, ex);
- String p = System.getProperty("whitelisting.bundles.properties");
+ String p = System.getProperty("apiregions.bundles.properties");
Properties actual = new Properties();
actual.load(new FileReader(p));
@@ -74,7 +74,7 @@ public class BundleArtifactFeatureHandlerTest {
bafh.postProcess(null, f, ex);
- String p = System.getProperty("whitelisting.features.properties");
+ String p = System.getProperty("apiregions.features.properties");
Properties actual = new Properties();
actual.load(new FileReader(p));
@@ -87,7 +87,7 @@ public class BundleArtifactFeatureHandlerTest {
assertEquals(new HashSet<>(Arrays.asList(el)), new HashSet<>(Arrays.asList(al)));
assertEquals(expected, actual);
- String p2 = System.getProperty("whitelisting.regions.properties");
+ String p2 = System.getProperty("apiregions.regions.properties");
Properties actual2 = new Properties();
actual2.load(new FileReader(p2));
diff --git a/featuremodel/feature-extension-apiregions/src/test/java/org/apache/sling/feature/extension/apiregions/BundleMappingHandlerTest.java b/featuremodel/feature-extension-apiregions/src/test/java/org/apache/sling/feature/extension/apiregions/BundleMappingHandlerTest.java
index b65764f..899302a 100644
--- a/featuremodel/feature-extension-apiregions/src/test/java/org/apache/sling/feature/extension/apiregions/BundleMappingHandlerTest.java
+++ b/featuremodel/feature-extension-apiregions/src/test/java/org/apache/sling/feature/extension/apiregions/BundleMappingHandlerTest.java
@@ -22,7 +22,6 @@ import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.builder.ArtifactProvider;
-import org.apache.sling.feature.extension.apiregions.BundleMappingHandler;
import org.junit.Test;
import java.io.File;
@@ -62,7 +61,7 @@ public class BundleMappingHandlerTest {
f.getBundles().add(b3);
bmh.postProcess(() -> ap, f, ex);
- String p = System.getProperty("whitelisting.idbsnver.properties");
+ String p = System.getProperty("apiregions.idbsnver.properties");
Properties actual = new Properties();
actual.load(new FileReader(p));