[sling-org-apache-sling-app-cms] branch master updated: Updating the readability configuration to be in the correct naming convention to fix SLING-8089

[dk...@apache.org]

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

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git


The following commit(s) were added to refs/heads/master by this push:
     new 1b9993f  Updating the readability configuration to be in the correct naming convention to fix SLING-8089
1b9993f is described below

commit 1b9993f158e5e88b0cf3a687de97a80616808a1a
Author: Dan Klco <dk...@apache.org>
AuthorDate: Sat Nov 10 14:29:26 2018 -0500

    Updating the readability configuration to be in the correct naming
    convention to fix SLING-8089
---
 .../apache/sling/cms/core/readability/impl/ReadabilityServiceImpl.java | 3 ++-
 ...e.sling.cms.core.readability.impl.ReadabilityServiceImpl-en.config} | 0
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceImpl.java b/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceImpl.java
index 032800f..f6833df 100644
--- a/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceImpl.java
@@ -30,12 +30,13 @@ import org.apache.sling.cms.readability.Text;
 import org.apache.sling.cms.readability.Word;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
 import org.osgi.service.metatype.annotations.Designate;
 
 /**
  * Implementation of the ReadabilityService service
  */
-@Component(service = ReadabilityService.class)
+@Component(service = ReadabilityService.class, configurationPolicy = ConfigurationPolicy.REQUIRE, immediate = true)
 @Designate(ocd = ReadabilityConfig.class, factory = true)
 public class ReadabilityServiceImpl implements ReadabilityService {
 
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.cms.core.readability.impl.ReadabilityServiceImpl.en.config b/ui/src/main/resources/jcr_root/libs/sling-cms/config/org.apache.sling.cms.core.readability.impl.ReadabilityServiceImpl-en.config
similarity index 100%
rename from ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.cms.core.readability.impl.ReadabilityServiceImpl.en.config
rename to ui/src/main/resources/jcr_root/libs/sling-cms/config/org.apache.sling.cms.core.readability.impl.ReadabilityServiceImpl-en.config