svn commit: r1882325 - in /jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication: CustomLoginModule.java CustomLoginModuleFactory.java

[an...@apache.org]

Author: angela
Date: Thu Oct  8 16:38:44 2020
New Revision: 1882325

URL: http://svn.apache.org/viewvc?rev=1882325&view=rev
Log:
OAK-6764 : Convert oak-exercise to OSGi R6 annotations (fix method names for the jaas properties)

Modified:
    jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModule.java
    jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModuleFactory.java

Modified: jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModule.java?rev=1882325&r1=1882324&r2=1882325&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModule.java (original)
+++ jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModule.java Thu Oct  8 16:38:44 2020
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.spi.sec
 /**
  * A custom login module for test purposes.
  *
- * EXERCISE: complete the implemenation
+ * EXERCISE: complete the implementation
  */
 public class CustomLoginModule implements LoginModule {
 

Modified: jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModuleFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModuleFactory.java?rev=1882325&r1=1882324&r2=1882325&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModuleFactory.java (original)
+++ jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/CustomLoginModuleFactory.java Thu Oct  8 16:38:44 2020
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.exerci
 
 import org.apache.felix.jaas.LoginModuleFactory;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
-import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -46,7 +45,7 @@ public class CustomLoginModuleFactory im
                 description = "Specifying the ranking (i.e. sort order) of this login module entry. The entries are sorted " +
                         "in a descending order (i.e. higher value ranked configurations come first)."
         )
-        int jaasRanking() default 500;
+        int jaas_ranking() default 500;
 
         @AttributeDefinition(
                 name = "JAAS Control Flag",
@@ -54,7 +53,7 @@ public class CustomLoginModuleFactory im
                         "OPTIONAL. Refer to the JAAS configuration documentation for more details around the meaning of " +
                         "these flags."
         )
-        String jaasControlFlag() default "OPTIONAL";
+        String jaas_controlFlag() default "OPTIONAL";
 
         @AttributeDefinition(
                 name = "JAAS Realm",
@@ -62,7 +61,7 @@ public class CustomLoginModuleFactory im
                         "realm name is provided then LoginModule is registered with a default realm as configured in " +
                         "the Felix JAAS configuration."
         )
-        String jaasRealmName();
+        String jaas_realmName();
     }
 
     // configuration parameters for the login module instances
@@ -85,9 +84,7 @@ public class CustomLoginModuleFactory im
     }
 
     /**
-     * {@inheritDoc}
-     *
-     * @return a new {@link ExternalLoginModule} instance.
+     * @return a new {@link CustomLoginModule} instance.
      */
     @Override
     public LoginModule createLoginModule() {