You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2003/07/24 12:25:57 UTC

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ac FileGroup.java

michi       2003/07/24 03:25:57

  Modified:    src/java/org/apache/lenya/cms/ac FileGroup.java
  Log:
  Roles removed from group
  
  Revision  Changes    Path
  1.11      +1 -33     cocoon-lenya/src/java/org/apache/lenya/cms/ac/FileGroup.java
  
  Index: FileGroup.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/FileGroup.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- FileGroup.java	23 Jul 2003 13:21:15 -0000	1.10
  +++ FileGroup.java	24 Jul 2003 10:25:57 -0000	1.11
  @@ -73,9 +73,6 @@
   public class FileGroup extends Group implements Item {
       private static Category log = Category.getInstance(FileGroup.class);
   
  -    public static final String ROLES = "roles";
  -    public static final String ROLE = "role";
  -
       /**
        * @see org.apache.lenya.cms.ac.Group#delete()
        */
  @@ -107,29 +104,6 @@
        */
       public void configure(Configuration config) throws ConfigurationException {
           new ItemConfiguration().configure(this, config);
  -
  -        Configuration[] rolesConfig = config.getChildren(ROLES);
  -
  -        if (rolesConfig.length == 1) {
  -            Configuration[] roles = rolesConfig[0].getChildren(ROLE);
  -
  -            for (int i = 0; i < roles.length; i++) {
  -                String roleName = roles[i].getValue();
  -                RoleManager manager = null;
  -
  -                try {
  -                    manager = RoleManager.instance(getConfigurationDirectory());
  -                } catch (AccessControlException e) {
  -                    throw new ConfigurationException(
  -                        "Exception when trying to fetch RoleManager for publication: " +
  -                        getConfigurationDirectory(), e);
  -                }
  -            }
  -        } else {
  -            // the Group should have a Roles node
  -            log.error("The group " + getId() +
  -                "doesn't appear to have the mandatory roles node");
  -        }
       }
       
       /**
  @@ -169,12 +143,6 @@
       private Configuration createConfiguration() {
           DefaultConfiguration config = new DefaultConfiguration(GROUP);
           new ItemConfiguration().save(this, config);
  -
  -        DefaultConfiguration child = null;
  -
  -        // add roles node
  -        child = new DefaultConfiguration(ROLES);
  -        config.addChild(child);
   
           return config;
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org