[sling-org-apache-sling-feature-apiregions] branch master updated: SLING-8976: use the regionOrigins and bundleOrigin properties files

[pauls]

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

pauls pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-apiregions.git


The following commit(s) were added to refs/heads/master by this push:
     new 79d1bf5  SLING-8976: use the regionOrigins and bundleOrigin properties 
files
79d1bf5 is described below

commit 79d1bf527fefd4e14f9f4a7c2634a41fd5cfb4be
Author: Karl Pauls <kpa...@adobe.com>
AuthorDate: Thu Jan 9 17:38:56 2020 +0100

    SLING-8976: use the regionOrigins and bundleOrigin properties files
---
 .../java/org/apache/sling/feature/apiregions/impl/RegionEnforcer.java | 4 ++--
 .../{props3/bundles.properties => props1/bundleOrigins.properties}    | 0
 .../{props3/features.properties => props1/regionOrigins.properties}   | 0
 .../resources/props2/{bundles.properties => bundleOrigins.properties} | 0
 .../props2/{features.properties => regionOrigins.properties}          | 0
 .../{props1/bundles.properties => props3/bundleOrigins.properties}    | 0
 .../{props1/features.properties => props3/regionOrigins.properties}   | 0
 7 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/apiregions/impl/RegionEnforcer.java 
b/src/main/java/org/apache/sling/feature/apiregions/impl/RegionEnforcer.java
index a2dd9f8..5c2310e 100644
--- a/src/main/java/org/apache/sling/feature/apiregions/impl/RegionEnforcer.java
+++ b/src/main/java/org/apache/sling/feature/apiregions/impl/RegionEnforcer.java
@@ -54,8 +54,8 @@ class RegionEnforcer implements ResolverHookFactory {
     static final String PROPERTIES_FILE_LOCATION = 
"sling.feature.apiregions.location";
 
     static final String IDBSNVER_FILENAME = "idbsnver.properties";
-    static final String BUNDLE_FEATURE_FILENAME = "bundles.properties";
-    static final String FEATURE_REGION_FILENAME = "features.properties";
+    static final String BUNDLE_FEATURE_FILENAME = "bundleOrigins.properties";
+    static final String FEATURE_REGION_FILENAME = "regionOrigins.properties";
     static final String REGION_PACKAGE_FILENAME = "regions.properties";
 
     static final Logger LOG = 
Logger.getLogger(ResolverHookImpl.class.getName());
diff --git a/src/test/resources/props3/bundles.properties 
b/src/test/resources/props1/bundleOrigins.properties
similarity index 100%
rename from src/test/resources/props3/bundles.properties
rename to src/test/resources/props1/bundleOrigins.properties
diff --git a/src/test/resources/props3/features.properties 
b/src/test/resources/props1/regionOrigins.properties
similarity index 100%
rename from src/test/resources/props3/features.properties
rename to src/test/resources/props1/regionOrigins.properties
diff --git a/src/test/resources/props2/bundles.properties 
b/src/test/resources/props2/bundleOrigins.properties
similarity index 100%
rename from src/test/resources/props2/bundles.properties
rename to src/test/resources/props2/bundleOrigins.properties
diff --git a/src/test/resources/props2/features.properties 
b/src/test/resources/props2/regionOrigins.properties
similarity index 100%
rename from src/test/resources/props2/features.properties
rename to src/test/resources/props2/regionOrigins.properties
diff --git a/src/test/resources/props1/bundles.properties 
b/src/test/resources/props3/bundleOrigins.properties
similarity index 100%
rename from src/test/resources/props1/bundles.properties
rename to src/test/resources/props3/bundleOrigins.properties
diff --git a/src/test/resources/props1/features.properties 
b/src/test/resources/props3/regionOrigins.properties
similarity index 100%
rename from src/test/resources/props1/features.properties
rename to src/test/resources/props3/regionOrigins.properties