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

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

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder
In directory sc8-pr-cvs1:/tmp/cvs-serv11479/com/sun/xacml/finder

Modified Files:
	AttributeFinder.java AttributeFinderModule.java 
Log Message:
added support for enforcing XPathVersion and updated SelectorModule to
correctly handle nodes of different types


Index: AttributeFinder.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/AttributeFinder.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AttributeFinder.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- AttributeFinder.java	29 Aug 2003 18:58:33 -0000	1.2
***************
*** 189,192 ****
--- 189,193 ----
       * @param attributeType the datatype of the attributes to find
       * @param context the representation of the request data
+      * @param xpathVersion the XPath version to use
       *
       * @return the result of attribute retrieval, which will be a bag of
***************
*** 195,199 ****
      public EvaluationResult findAttribute(String contextPath,
                                            URI attributeType,
!                                           EvaluationCtx context) {
          Iterator it = selectorModules.iterator();
  
--- 196,201 ----
      public EvaluationResult findAttribute(String contextPath,
                                            URI attributeType,
!                                           EvaluationCtx context,
!                                           String xpathVersion) {
          Iterator it = selectorModules.iterator();
  
***************
*** 204,208 ****
              // see if the module can find an attribute value
              EvaluationResult result =
!                 module.findAttribute(contextPath, attributeType, context);
  
              // if there was an error, we stop right away
--- 206,211 ----
              // 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

Index: AttributeFinderModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/AttributeFinderModule.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AttributeFinderModule.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- AttributeFinderModule.java	29 Aug 2003 18:58:33 -0000	1.2
***************
*** 149,152 ****
--- 149,153 ----
       * @param attributeType the datatype of the attributes to find
       * @param context the representation of the request data
+      * @param xpathVersion the XPath version to use
       *
       * @return the result of attribute retrieval, which will be a bag of
***************
*** 155,159 ****
      public EvaluationResult findAttribute(String contextPath,
                                            URI attributeType,
!                                           EvaluationCtx context) {
          return new EvaluationResult(BagAttribute.
                                      createEmptyBag(attributeType));
--- 156,161 ----
      public EvaluationResult findAttribute(String contextPath,
                                            URI attributeType,
!                                           EvaluationCtx context,
!                                           String xpathVersion) {
          return new EvaluationResult(BagAttribute.
                                      createEmptyBag(attributeType));