[jboss-cvs] JBossAS SVN: r72068 - projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-04-12 00:19:54 -0400 (Sat, 12 Apr 2008)
New Revision: 72068

Modified:
   projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/ExpressionHandler.java
   projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/MapFunction.java
   projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/VariableManager.java
Log:
SECURITY-168: getNodeName

Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/ExpressionHandler.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/ExpressionHandler.java	2008-04-12 04:19:25 UTC (rev 72067)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/ExpressionHandler.java	2008-04-12 04:19:54 UTC (rev 72068)
@@ -15,6 +15,7 @@
 
 import org.jboss.security.xacml.sunxacml.ParsingException;
 import org.jboss.security.xacml.sunxacml.PolicyMetaData;
+import org.jboss.security.xacml.sunxacml.SunxacmlUtil;
 import org.jboss.security.xacml.sunxacml.UnknownIdentifierException;
 import org.jboss.security.xacml.sunxacml.attr.AttributeDesignator;
 import org.jboss.security.xacml.sunxacml.attr.AttributeFactory;
@@ -54,7 +55,7 @@
                                              VariableManager manager)
         throws ParsingException
     {
-        String name = root.getNodeName();
+        String name = SunxacmlUtil.getNodeName(root);
 
         if (name.equals("Apply")) {
             return Apply.getInstance(root, metaData, manager);

Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/MapFunction.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/MapFunction.java	2008-04-12 04:19:25 UTC (rev 72067)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/MapFunction.java	2008-04-12 04:19:54 UTC (rev 72068)
@@ -51,6 +51,7 @@
 import org.jboss.security.xacml.sunxacml.EvaluationCtx;
 import org.jboss.security.xacml.sunxacml.Indenter;
 import org.jboss.security.xacml.sunxacml.ParsingException;
+import org.jboss.security.xacml.sunxacml.SunxacmlUtil;
 import org.jboss.security.xacml.sunxacml.attr.BagAttribute;
 import org.jboss.security.xacml.sunxacml.ctx.Status;
 import org.w3c.dom.Node;
@@ -130,7 +131,7 @@
         for (int i = 0; i < nodes.getLength(); i++) {
             Node node = nodes.item(i);
 
-            if (node.getNodeName().equals("Function")) {
+            if (SunxacmlUtil.getNodeName(node).equals("Function")) {
                 String funcName = node.getAttributes().
                     getNamedItem("FunctionId").getNodeValue();
                 FunctionFactory factory = FunctionFactory.getGeneralInstance();

Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/VariableManager.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/VariableManager.java	2008-04-12 04:19:25 UTC (rev 72067)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/cond/VariableManager.java	2008-04-12 04:19:54 UTC (rev 72068)
@@ -45,6 +45,7 @@
 import org.jboss.security.xacml.sunxacml.ParsingException;
 import org.jboss.security.xacml.sunxacml.PolicyMetaData;
 import org.jboss.security.xacml.sunxacml.ProcessingException;
+import org.jboss.security.xacml.sunxacml.SunxacmlUtil;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -196,7 +197,7 @@
             xprNode = nodes.item(i++);
 
         // now see if the node is an Apply
-        if (xprNode.getNodeName().equals("Apply")) {
+        if (SunxacmlUtil.getNodeName(xprNode).equals("Apply")) {
             try {
                 // get the function in the Apply...
                 Function function = ExpressionHandler.