[sling-org-apache-sling-extensions-webconsolesecurityprovider] branch master updated: SLING-8636 Set webconsole.security.provider.id property on the Sling Web Console Security Provider

[da...@apache.org]

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-org-apache-sling-extensions-webconsolesecurityprovider.git


The following commit(s) were added to refs/heads/master by this push:
     new 4d6c6b1  SLING-8636 Set webconsole.security.provider.id property on the Sling Web Console Security Provider
     new c30ae54  Merge pull request #1 from bosschaert/SLING-8636
4d6c6b1 is described below

commit 4d6c6b1c48f5c70af61c66b6248a51e832277b15
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Thu Aug 15 16:12:36 2019 +0100

    SLING-8636 Set webconsole.security.provider.id property on the Sling Web Console Security Provider
---
 .../webconsolesecurityprovider/internal/ServicesListener.java           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/ServicesListener.java b/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/ServicesListener.java
index 801b3e5..e52daad 100644
--- a/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/ServicesListener.java
+++ b/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/ServicesListener.java
@@ -136,6 +136,7 @@ public class ServicesListener {
         props.put(Constants.SERVICE_PID, SlingWebConsoleSecurityProvider.class.getName());
         props.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Web Console Security Provider 2");
         props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
+        props.put("webconsole.security.provider.id", "org.apache.sling.extensions.webconsolesecurityprovider2");
         this.provider2Reg = this.bundleContext.registerService(
             new String[] {ManagedService.class.getName(), WebConsoleSecurityProvider.class.getName()},
                           new SlingWebConsoleSecurityProvider2(authSupport, authenticator), props);
@@ -147,6 +148,7 @@ public class ServicesListener {
         props.put(Constants.SERVICE_PID, SlingWebConsoleSecurityProvider.class.getName());
         props.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Web Console Security Provider");
         props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
+        props.put("webconsole.security.provider.id", "org.apache.sling.extensions.webconsolesecurityprovider");
         this.providerReg = this.bundleContext.registerService(
             new String[] {ManagedService.class.getName(), WebConsoleSecurityProvider.class.getName()}, new SlingWebConsoleSecurityProvider(repository), props);
         this.registrationState = State.PROVIDER;