[Sunxacml-commit] sunxacml/com/sun/xacml/finder AttributeFinder.java,1.3,1.4 AttributeFinderModule.java,1.3,1.4

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

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

Modified Files:
	AttributeFinder.java AttributeFinderModule.java 
Log Message:
changed XPath interface to accept a DOM node for namespace definitions


Index: AttributeFinder.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/AttributeFinder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AttributeFinder.java	17 Mar 2004 18:03:39 -0000	1.3
--- AttributeFinder.java	12 May 2004 21:26:23 -0000	1.4
***************
*** 50,53 ****
--- 50,55 ----
  import java.util.Set;
  
+ import org.w3c.dom.Node;
+ 
  
  /**
***************
*** 188,191 ****
--- 190,195 ----
       *
       * @param contextPath the XPath expression to search against
+      * @param namespaceNode the DOM node defining namespace mappings to use,
+      *                      or null if mappings come from the context root
       * @param attributeType the datatype of the attributes to find
       * @param context the representation of the request data
***************
*** 196,199 ****
--- 200,204 ----
       */
      public EvaluationResult findAttribute(String contextPath,
+                                           Node namespaceNode,
                                            URI attributeType,
                                            EvaluationCtx context,
***************
*** 207,212 ****
              // see if the module can find an attribute value
              EvaluationResult result =
!                 module.findAttribute(contextPath, attributeType, context,
!                                      xpathVersion);
  
              // if there was an error, we stop right away
--- 212,217 ----
              // see if the module can find an attribute value
              EvaluationResult result =
!                 module.findAttribute(contextPath, namespaceNode, attributeType,
!                                      context, xpathVersion);
  
              // if there was an error, we stop right away

Index: AttributeFinderModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/AttributeFinderModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AttributeFinderModule.java	17 Mar 2004 18:03:39 -0000	1.3
--- AttributeFinderModule.java	12 May 2004 21:26:23 -0000	1.4
***************
*** 47,50 ****
--- 47,52 ----
  import java.util.Set;
  
+ import org.w3c.dom.Node;
+ 
  
  /**
***************
*** 148,151 ****
--- 150,155 ----
       *
       * @param contextPath the XPath expression to search against
+      * @param namespaceNode the DOM node defining namespace mappings to use,
+      *                      or null if mappings come from the context root
       * @param attributeType the datatype of the attributes to find
       * @param context the representation of the request data
***************
*** 156,159 ****
--- 160,164 ----
       */
      public EvaluationResult findAttribute(String contextPath,
+                                           Node namespaceNode,
                                            URI attributeType,
                                            EvaluationCtx context,