[Sunxacml-commit] sunxacml/com/sun/xacml Rule.java,1.6,1.7

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17448/com/sun/xacml

Modified Files:
	Rule.java 
Log Message:
introduced support for variable referencing and definition, one of the major
new features in XACML 2.0


Index: Rule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/Rule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Rule.java	23 Mar 2004 23:38:51 -0000	1.6
--- Rule.java	7 Jan 2005 23:49:31 -0000	1.7
***************
*** 41,44 ****
--- 41,45 ----
  import com.sun.xacml.cond.Apply;
  import com.sun.xacml.cond.EvaluationResult;
+ import com.sun.xacml.cond.VariableManager;
  
  import com.sun.xacml.ctx.Result;
***************
*** 108,115 ****
       *                     functions, or null if this is unspecified (ie, not
       *                     supplied in the defaults section of the policy)
       *
       * @throws ParsingException if the RuleType is invalid
       */
!     public static Rule getInstance(Node root, String xpathVersion)
          throws ParsingException
      {
--- 109,120 ----
       *                     functions, or null if this is unspecified (ie, not
       *                     supplied in the defaults section of the policy)
+      * @param manager the <code>VariableManager</code> used to connect
+      *                <code>VariableReference</code>s to their cooresponding
+      *                <code>VariableDefinition<code>s
       *
       * @throws ParsingException if the RuleType is invalid
       */
!     public static Rule getInstance(Node root, String xpathVersion,
!                                    VariableManager manager)
          throws ParsingException
      {
***************
*** 152,156 ****
                  target = Target.getInstance(child, xpathVersion);
              } else if (cname.equals("Condition")) {
!                 condition = Apply.getConditionInstance(child, xpathVersion);
              }
          }
--- 157,162 ----
                  target = Target.getInstance(child, xpathVersion);
              } else if (cname.equals("Condition")) {
!                 condition = Apply.getConditionInstance(child, xpathVersion,
!                                                        manager);
              }
          }