[Join-cvs] join1/src/main/org/figure8/join/control/config AccessControlRuleSet.java, 1.1, 1.2
Brought to you by:
lbroudoux
Menu
▾
▴
[Join-cvs] join1/src/main/org/figure8/join/control/config AccessControlRuleSet.java, 1.1, 1.2
|
From: Laurent B. <lbr...@us...> - 2007-04-08 18:42:44
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/control/config In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22735/control/config Modified Files: AccessControlRuleSet.java Log Message: Fix filter object for security constraints Index: AccessControlRuleSet.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/config/AccessControlRuleSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AccessControlRuleSet.java 27 Feb 2007 21:06:41 -0000 1.1 --- AccessControlRuleSet.java 8 Apr 2007 18:42:40 -0000 1.2 *************** *** 18,23 **** import org.apache.commons.digester.RuleSetBase; /** ! * The set of Digester rules required to parse a Join security control ! * configuration file (<code>join-security-control.xml</code>). * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a> * @version $Revision$ --- 18,23 ---- import org.apache.commons.digester.RuleSetBase; /** ! * The set of Digester rules required to parse a Join access control ! * configuration file (<code>join-access-control.xml</code>). * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a> * @version $Revision$ *************** *** 31,35 **** * specified <code>Digester</code> instance. This method should only * be called by a Digester instance. These rules assume that an instance of ! * <code>org.figure8.join.security.AccessControlConfig</code> is pushed * onto the evaluation stack before parsing begins. * @param digester Digester instance to which the new Rule instances should be added. --- 31,35 ---- * specified <code>Digester</code> instance. This method should only * be called by a Digester instance. These rules assume that an instance of ! * {@link org.figure8.join.control.config.AccessControlConfig} is pushed * onto the evaluation stack before parsing begins. * @param digester Digester instance to which the new Rule instances should be added. *************** *** 39,47 **** // Create, set and add and ActionConstraintConfig. digester.addObjectCreate( ! "join-security-control/action-constraints/action", "org.figure8.join.control.config.ActionConstraintConfig"); ! digester.addSetProperties("join-security-control/action-constraints/action"); digester.addSetNext( ! "join-security-control/action-constraints/action", "addActionConstraint", "org.figure8.join.control.config.ActionConstraintConfig"); --- 39,47 ---- // Create, set and add and ActionConstraintConfig. digester.addObjectCreate( ! "join-access-control/action-constraints/action", "org.figure8.join.control.config.ActionConstraintConfig"); ! digester.addSetProperties("join-access-control/action-constraints/action"); digester.addSetNext( ! "join-access-control/action-constraints/action", "addActionConstraint", "org.figure8.join.control.config.ActionConstraintConfig"); *************** *** 49,57 **** // Create, set and add RoleConfig to current ActionConstraintConfig. digester.addObjectCreate( ! "join-security-control/action-constraints/action/role", "org.figure8.join.control.config.RoleConfig"); ! digester.addSetProperties("join-security-control/action-constraints/action/role"); digester.addSetNext( ! "join-security-control/action-constraints/action/role", "addRole", "org.figure8.join.control.config.RoleConfig"); --- 49,57 ---- // Create, set and add RoleConfig to current ActionConstraintConfig. digester.addObjectCreate( ! "join-access-control/action-constraints/action/role", "org.figure8.join.control.config.RoleConfig"); ! digester.addSetProperties("join-access-control/action-constraints/action/role"); digester.addSetNext( ! "join-access-control/action-constraints/action/role", "addRole", "org.figure8.join.control.config.RoleConfig"); *************** *** 59,67 **** // Create, set and add OperationConstraintConfig to current ActionConstraintConfig. digester.addObjectCreate( ! "join-security-control/action-constraints/action/operation", "org.figure8.join.control.config.OperationConstraintConfig"); ! digester.addSetProperties("join-security-control/action-constraints/action/operation"); digester.addSetNext( ! "join-security-control/action-constraints/action/operation", "addOperationConstraint", "org.figure8.join.control.config.OperationConstraintConfig"); --- 59,67 ---- // Create, set and add OperationConstraintConfig to current ActionConstraintConfig. digester.addObjectCreate( ! "join-access-control/action-constraints/action/operation", "org.figure8.join.control.config.OperationConstraintConfig"); ! digester.addSetProperties("join-access-control/action-constraints/action/operation"); digester.addSetNext( ! "join-access-control/action-constraints/action/operation", "addOperationConstraint", "org.figure8.join.control.config.OperationConstraintConfig"); *************** *** 69,77 **** // Create, set and add RoleConfig to current OperationConstraintConfig. digester.addObjectCreate( ! "join-security-control/action-constraints/action/operation/role", "org.figure8.join.control.config.RoleConfig"); ! digester.addSetProperties("join-security-control/action-constraints/action/operation/role"); digester.addSetNext( ! "join-security-control/action-constraints/action/operation/role", "addRole", "org.figure8.join.control.config.RoleConfig"); --- 69,77 ---- // Create, set and add RoleConfig to current OperationConstraintConfig. digester.addObjectCreate( ! "join-access-control/action-constraints/action/operation/role", "org.figure8.join.control.config.RoleConfig"); ! digester.addSetProperties("join-access-control/action-constraints/action/operation/role"); digester.addSetNext( ! "join-access-control/action-constraints/action/operation/role", "addRole", "org.figure8.join.control.config.RoleConfig"); |
