[Sunxacml-commit] sunxacml/com/sun/xacml/finder/impl FilePolicyModule.java,1.6,1.7 SelectorModule.java,1.9,1.10

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

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

Modified Files:
	FilePolicyModule.java SelectorModule.java 
Log Message:
substantial update to align 2.0 features (Target and Condition) and code
re-factoring to better handle Expression/Evaluatable, versions, Target, etc.


Index: SelectorModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/impl/SelectorModule.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SelectorModule.java	9 Jun 2004 20:12:21 -0000	1.9
--- SelectorModule.java	5 Dec 2005 23:34:51 -0000	1.10
***************
*** 37,43 ****
  package com.sun.xacml.finder.impl;
  
- import com.sun.xacml.AbstractPolicy;
  import com.sun.xacml.EvaluationCtx;
  import com.sun.xacml.ParsingException;
  import com.sun.xacml.UnknownIdentifierException;
  
--- 37,43 ----
  package com.sun.xacml.finder.impl;
  
  import com.sun.xacml.EvaluationCtx;
  import com.sun.xacml.ParsingException;
+ import com.sun.xacml.PolicyMetaData;
  import com.sun.xacml.UnknownIdentifierException;
  
***************
*** 127,131 ****
                                            String xpathVersion) {
          // we only support 1.0
!         if (! xpathVersion.equals(AbstractPolicy.XPATH_1_0_VERSION))
              return new EvaluationResult(BagAttribute.createEmptyBag(type));
  
--- 127,131 ----
                                            String xpathVersion) {
          // we only support 1.0
!         if (! xpathVersion.equals(PolicyMetaData.XPATH_1_0_IDENTIFIER))
              return new EvaluationResult(BagAttribute.createEmptyBag(type));
  

Index: FilePolicyModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/impl/FilePolicyModule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FilePolicyModule.java	4 Jun 2004 17:50:40 -0000	1.6
--- FilePolicyModule.java	5 Dec 2005 23:34:51 -0000	1.7
***************
*** 294,298 ****
                  throw new Exception("Unknown root document type: " + name);
              }
- 
          } catch (Exception e) {
              if (logger.isLoggable(Level.WARNING))
--- 294,297 ----