Author: chetanm
Date: Mon Nov 30 06:00:57 2015
New Revision: 1717190
URL: http://svn.apache.org/viewvc?rev=1717190&view=rev
Log:
FELIX-5083 - Set webconsole.configurationFactory.nameHint for JAAS
configurations
Applying patch from Robert Munteanu. Thanks!
Modified:
felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/JaasConfigFactory.java
Modified:
felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/JaasConfigFactory.java
URL:
http://svn.apache.org/viewvc/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/JaasConfigFactory.java?rev=1717190&r1=1717189&r2=1717190&view=diff
==============================================================================
---
felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/JaasConfigFactory.java
(original)
+++
felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/JaasConfigFactory.java
Mon Nov 30 06:00:57 2015
@@ -19,8 +19,6 @@
package org.apache.felix.jaas.internal;
-import static org.apache.felix.jaas.internal.Util.trimToNull;
-
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.HashMap;
@@ -43,6 +41,8 @@ import org.osgi.service.cm.Configuration
import org.osgi.service.cm.ManagedServiceFactory;
import org.osgi.service.log.LogService;
+import static org.apache.felix.jaas.internal.Util.trimToNull;
+
@Component(label = "%jaas.name",
description = "%jaas.description",
metatype = true,
@@ -57,7 +57,10 @@ import org.osgi.service.log.LogService;
@PropertyOption(name = "optional", value = "%jaas.flag.optional")
}),
@Property(name = LoginModuleFactory.JAAS_RANKING, intValue = 0),
- @Property(name = LoginModuleFactory.JAAS_REALM_NAME)
+ @Property(name = LoginModuleFactory.JAAS_REALM_NAME),
+ @Property(name = "webconsole.configurationFactory.nameHint",
+ value = "{" + LoginModuleFactory.JAAS_RANKING + "} : {" +
JaasConfigFactory.JAAS_CLASS_NAME + "}"
+ + " ({" + LoginModuleFactory.JAAS_CONTROL_FLAG + "})")
})
public class JaasConfigFactory implements ManagedServiceFactory
{
