[Sunxacml-commit] sunxacml/com/sun/xacml AbstractPolicy.java,1.1.1.1,1.2

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

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

Modified Files:
	AbstractPolicy.java 
Log Message:
AbstractPolicy and CombiningFactory updates

Index: AbstractPolicy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/AbstractPolicy.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AbstractPolicy.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- AbstractPolicy.java	9 May 2003 20:50:23 -0000	1.2
***************
*** 120,128 ****
                               String description, Target target,
                               String defaultVersion) {
!         idAttr = id;
!         combiningAlg = combiningAlg;
!         this.description = description;
!         this.target = target;
!         this.defaultVersion = defaultVersion;
      }
  
--- 120,124 ----
                               String description, Target target,
                               String defaultVersion) {
!         this(id, combiningAlg, description, target, defaultVersion, null);
      }
  
***************
*** 141,145 ****
                               String defaultVersion, Set obligations) {
          idAttr = id;
!         combiningAlg = combiningAlg;
          this.description = description;
          this.target = target;
--- 137,141 ----
                               String defaultVersion, Set obligations) {
          idAttr = id;
!         this.combiningAlg = combiningAlg;
          this.description = description;
          this.target = target;
***************
*** 232,236 ****
              Node node = nodes.item(i);
              if (node.getNodeName().equals("XPathVersion")) {
!                 defaultVersion = node.getNodeValue();
                  if (! defaultVersion.equals(XPATH_1_0_VERSION)) {
                      throw new ParsingException("Unknown XPath version");
--- 228,232 ----
              Node node = nodes.item(i);
              if (node.getNodeName().equals("XPathVersion")) {
!                 defaultVersion = node.getFirstChild().getNodeValue();
                  if (! defaultVersion.equals(XPATH_1_0_VERSION)) {
                      throw new ParsingException("Unknown XPath version");