[jboss-cvs] Picketbox SVN: r58 - in trunk: picketbox/src/test/java/org/picketbox/test/annotations and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2010-03-07 14:58:20 -0500 (Sun, 07 Mar 2010)
New Revision: 58

Modified:
   trunk/picketbox/src/main/java/org/picketbox/plugins/PicketBoxProcessor.java
   trunk/picketbox/src/test/java/org/picketbox/test/annotations/PicketBoxProcessorUnitTestCase.java
   trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthAuthorizationAnnotatedPOJO.java
   trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthPlusMappingAnnotatedPOJO.java
   trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthenticationAnnotatedPOJO.java
   trunk/security-spi/spi/src/main/java/org/jboss/security/annotation/Module.java
Log:
SECURITY-469: @Module takes a Class

Modified: trunk/picketbox/src/main/java/org/picketbox/plugins/PicketBoxProcessor.java
===================================================================
--- trunk/picketbox/src/main/java/org/picketbox/plugins/PicketBoxProcessor.java	2010-03-04 22:08:23 UTC (rev 57)
+++ trunk/picketbox/src/main/java/org/picketbox/plugins/PicketBoxProcessor.java	2010-03-07 19:58:20 UTC (rev 58)
@@ -311,7 +311,7 @@
       {
          for(Module module: modules)
          {
-            String code = module.code(); 
+            String code = module.code().getCanonicalName(); 
             String type = module.type();
              
             Map<String,Object> map = new HashMap<String,Object>();
@@ -359,7 +359,7 @@
       {
          for(Module module: modules)
          {
-            String code = module.code(); 
+            String code = module.code().getCanonicalName(); 
              
             Map<String,Object> map = new HashMap<String,Object>();
             
@@ -393,7 +393,7 @@
       {
          for(Module module: modules)
          {
-            String code = module.code();
+            String code = module.code().getCanonicalName();
             String flag = module.flag();
              
             Map<String,Object> map = new HashMap<String,Object>();
@@ -429,7 +429,7 @@
       {
          for(Module module: modules)
          {
-            String code = module.code();
+            String code = module.code().getCanonicalName();
             String flag = module.flag();
              
             Map<String,Object> map = new HashMap<String,Object>();

Modified: trunk/picketbox/src/test/java/org/picketbox/test/annotations/PicketBoxProcessorUnitTestCase.java
===================================================================
--- trunk/picketbox/src/test/java/org/picketbox/test/annotations/PicketBoxProcessorUnitTestCase.java	2010-03-04 22:08:23 UTC (rev 57)
+++ trunk/picketbox/src/test/java/org/picketbox/test/annotations/PicketBoxProcessorUnitTestCase.java	2010-03-07 19:58:20 UTC (rev 58)
@@ -116,5 +116,6 @@
       assertNotNull("Subject is not null", callerSubject);
       assertTrue("Subject contains principal anil", callerSubject.getPrincipals().contains(anil));
       RoleGroup callerRoles = processor.getCallerRoles();
+      assertNotNull("Roles are not null", callerRoles);
    }
 }
\ No newline at end of file

Modified: trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthAuthorizationAnnotatedPOJO.java
===================================================================
--- trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthAuthorizationAnnotatedPOJO.java	2010-03-04 22:08:23 UTC (rev 57)
+++ trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthAuthorizationAnnotatedPOJO.java	2010-03-07 19:58:20 UTC (rev 58)
@@ -25,6 +25,8 @@
 import org.jboss.security.annotation.Authorization;
 import org.jboss.security.annotation.Module;
 import org.jboss.security.annotation.ModuleOption;
+import org.jboss.security.auth.spi.UsersRolesLoginModule;
+import org.picketbox.plugins.authorization.PicketBoxAuthorizationModule;
 
 /**
  * POJO with both Authentication and Authorization
@@ -32,9 +34,9 @@
  * @author Anil.Saldhana at redhat.com
  * @since Mar 4, 2010
  */
- at Authentication(modules={@Module(code = "org.jboss.security.auth.spi.UsersRolesLoginModule", options =
+ at Authentication(modules={@Module(code = UsersRolesLoginModule.class, options =
 {@ModuleOption})})
- at Authorization(modules ={@Module(code = "org.picketbox.plugins.authorization.PicketBoxAuthorizationModule", options =
+ at Authorization(modules ={@Module(code = PicketBoxAuthorizationModule.class, options =
 {@ModuleOption(key="roles",value="validuser")})})
 public class AuthAuthorizationAnnotatedPOJO
 {

Modified: trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthPlusMappingAnnotatedPOJO.java
===================================================================
--- trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthPlusMappingAnnotatedPOJO.java	2010-03-04 22:08:23 UTC (rev 57)
+++ trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthPlusMappingAnnotatedPOJO.java	2010-03-07 19:58:20 UTC (rev 58)
@@ -26,17 +26,19 @@
 import org.jboss.security.annotation.ModuleOption;
 import org.jboss.security.annotation.SecurityMapping;
 import org.jboss.security.annotation.ModuleOption.VALUE_TYPE;
+import org.jboss.security.auth.spi.UsersRolesLoginModule;
+import org.jboss.security.mapping.providers.OptionsRoleMappingProvider;
 
 /**
+ * POJO with Authentication and SecurityMapping annotations
  * @author Anil.Saldhana at redhat.com
  * @since Mar 2, 2010
  */
- at Authentication(modules =
-{@Module(code = "org.jboss.security.auth.spi.UsersRolesLoginModule", options =
+ at Authentication(modules={@Module(code = UsersRolesLoginModule.class, options =
 {@ModuleOption})})
 
 @SecurityMapping(modules =
-{@Module(code = "org.jboss.security.mapping.providers.OptionsRoleMappingProvider", type="role", options =
+{@Module(code = OptionsRoleMappingProvider.class, type="role", options =
 {@ModuleOption(key="rolesMap",value="validuser=AuthorizedUser,InternalUser", valueType=VALUE_TYPE.JAVA_PROPERTIES),
       @ModuleOption(key="replaceRoles", value="false")})})
 public class AuthPlusMappingAnnotatedPOJO

Modified: trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthenticationAnnotatedPOJO.java
===================================================================
--- trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthenticationAnnotatedPOJO.java	2010-03-04 22:08:23 UTC (rev 57)
+++ trunk/picketbox/src/test/java/org/picketbox/test/pojos/AuthenticationAnnotatedPOJO.java	2010-03-07 19:58:20 UTC (rev 58)
@@ -24,13 +24,14 @@
 import org.jboss.security.annotation.Authentication;
 import org.jboss.security.annotation.Module;
 import org.jboss.security.annotation.ModuleOption;
+import org.jboss.security.auth.spi.UsersRolesLoginModule;
 
 /**
  * Pojo with the <code>Authentication</code> annotation
  * @author Anil.Saldhana at redhat.com
  * @since Mar 2, 2010
  */
- at Authentication(modules={@Module(code = "org.jboss.security.auth.spi.UsersRolesLoginModule", options =
+ at Authentication(modules={@Module(code = UsersRolesLoginModule.class, options =
 {@ModuleOption})})
 public class AuthenticationAnnotatedPOJO
 { 

Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/annotation/Module.java
===================================================================
--- trunk/security-spi/spi/src/main/java/org/jboss/security/annotation/Module.java	2010-03-04 22:08:23 UTC (rev 57)
+++ trunk/security-spi/spi/src/main/java/org/jboss/security/annotation/Module.java	2010-03-07 19:58:20 UTC (rev 58)
@@ -43,7 +43,7 @@
     * The FQN of the module
     * @return
     */
-   String code(); 
+   Class<?> code(); 
    
    /**
     * Get the FLAG (REQUIRED, REQUISITE, SUFFICIENT or OPTIONAL)