[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security/config ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/07 21:55:41

  Modified:    src/main/org/jboss/seam/security/config 
                        SecurityConfiguration.java
  Log:
  changed the role of the Identity class
  
  Revision  Changes    Path
  1.10      +28 -21    jboss-seam/src/main/org/jboss/seam/security/config/SecurityConfiguration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SecurityConfiguration.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/config/SecurityConfiguration.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- SecurityConfiguration.java	2 Jan 2007 07:42:57 -0000	1.9
  +++ SecurityConfiguration.java	8 Jan 2007 02:55:41 -0000	1.10
  @@ -162,8 +162,13 @@
            Document doc = xmlReader.read(config);
            Element env = doc.getRootElement();
   
  +         if (env.elements(SECURITY_CONSTRAINT) != null)
            loadSecurityConstraints(env.elements(SECURITY_CONSTRAINT));
  +         
  +         if (env.element(SECURITY_ROLES) != null)
            loadSecurityRoles(env.element(SECURITY_ROLES));
  +         
  +         if (env.element(LOGIN_MODULES) != null)
            loadLoginModules(env.element(LOGIN_MODULES));
   
            // loadLoginConfig(env.element(LOGIN_CONFIG));
  @@ -385,8 +390,10 @@
         loginModuleConfig = new LoginModuleConfiguration();
         List<AppConfigurationEntry> entries = new ArrayList<AppConfigurationEntry>();
   
  -      for (Element loginModule : (List<Element>) loginModulesElement
  -            .elements(LOGIN_MODULE))
  +      List<Element> moduleElements = loginModulesElement.elements(LOGIN_MODULE);
  +      if (moduleElements != null)
  +      {
  +         for (Element loginModule : moduleElements)
         {
            Map<String, String> options = new HashMap<String, String>();
   
  @@ -406,7 +413,7 @@
         entries.toArray(e);
         
         loginModuleConfig.addEntry(LOGIN_MODULE_NAME, e);
  -      
  +      }      
      }
   
      private AppConfigurationEntry.LoginModuleControlFlag getControlFlag(