svn commit: r997682 - /karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java

[io...@apache.org]

Author: iocanel
Date: Thu Sep 16 10:23:28 2010
New Revision: 997682

URL: http://svn.apache.org/viewvc?rev=997682&view=rev
Log:
[KARAF-172] The option names for roleDiscriminator and rolePolicy have been changed to  role.policy and role.discriminator to be coherent with the rest option names inside the login modules.

Modified:
    karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java

Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java?rev=997682&r1=997681&r2=997682&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java Thu Sep 16 10:23:28 2010
@@ -79,8 +79,8 @@ public abstract class AbstractKarafLogin
         this.subject = sub;
         this.callbackHandler = handler;
         this.options = options;
-        this.rolePolicy = (String) options.get("rolePolicy");
-        this.roleDiscriminator = (String) options.get("roleDiscriminator");
+        this.rolePolicy = (String) options.get("role.policy");
+        this.roleDiscriminator = (String) options.get("role.discriminator");
         this.debug = Boolean.parseBoolean((String) options.get("debug"));
         // the bundle context is set in the Config JaasRealm by default
         this.bundleContext = (BundleContext) options.get(BundleContext.class.getName());