[jboss-cvs] JBossAS SVN: r72069 - projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Apr 12 00:20:29 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-04-12 00:20:29 -0400 (Sat, 12 Apr 2008)
New Revision: 72069
Modified:
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Attribute.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/RequestCtx.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/ResponseCtx.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Result.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Status.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/StatusDetail.java
Log:
SECURITY-168: getNodeName
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Attribute.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Attribute.java 2008-04-12 04:19:54 UTC (rev 72068)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Attribute.java 2008-04-12 04:20:29 UTC (rev 72069)
@@ -47,6 +47,7 @@
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.UnknownIdentifierException;
import org.jboss.security.xacml.sunxacml.attr.AttributeFactory;
import org.jboss.security.xacml.sunxacml.attr.AttributeValue;
@@ -157,10 +158,10 @@
AttributeFactory attrFactory = AttributeFactory.getInstance();
// First check that we're really parsing an Attribute
- if (! getNodeName(root).equals("Attribute")) {
+ if (! SunxacmlUtil.getNodeName(root).equals("Attribute")) {
throw new ParsingException("Attribute object cannot be created " +
"with root node of type: " +
- root.getNodeName());
+ SunxacmlUtil.getNodeName(root));
}
NamedNodeMap attrs = root.getAttributes();
@@ -198,7 +199,7 @@
NodeList nodes = root.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (getNodeName(node).equals("AttributeValue")) {
+ if (SunxacmlUtil.getNodeName(node).equals("AttributeValue")) {
// only one value can be in an Attribute
/*
@@ -342,14 +343,4 @@
return encoded;
}
-
-
- private static String getNodeName(Node node)
- {
- String name = node.getLocalName();
- if(name == null)
- name = node.getNodeName();
- return name;
- }
-
}
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/RequestCtx.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/RequestCtx.java 2008-04-12 04:19:54 UTC (rev 72068)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/RequestCtx.java 2008-04-12 04:20:29 UTC (rev 72069)
@@ -50,6 +50,7 @@
import org.jboss.security.xacml.sunxacml.Indenter;
import org.jboss.security.xacml.sunxacml.ParsingException;
+import org.jboss.security.xacml.sunxacml.SunxacmlUtil;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -205,10 +206,10 @@
String resourceContent;
// First check to be sure the node passed is indeed a Request node.
- String tagName = getNodeName(root);
+ String tagName = SunxacmlUtil.getNodeName(root);
if (! tagName.equals("Request")) {
throw new ParsingException("Request cannot be constructed using " +
- "type: " + root.getNodeName());
+ "type: " + SunxacmlUtil.getNodeName(root));
}
// Now go through its child nodes, finding Subject,
@@ -217,7 +218,7 @@
for (int i = 0; i < children.getLength(); i++) {
Node node = children.item(i);
- String tag = getNodeName(node);
+ String tag = SunxacmlUtil.getNodeName(node);
if (tag.equals("Subject")) {
// see if there is a category
@@ -275,7 +276,7 @@
NodeList nodes = root.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (getNodeName(node).equals("Attribute"))
+ if (SunxacmlUtil.getNodeName(node).equals("Attribute"))
set.add(Attribute.getInstance(node));
}
@@ -537,15 +538,5 @@
Attribute attr = (Attribute)(it.next());
attr.encode(out, indenter);
}
- }
-
- private static String getNodeName(Node node)
- {
- if(node == null)
- throw new IllegalArgumentException("Node is null");
- String name = node.getLocalName();
- if(name == null)
- name = node.getNodeName();
- return name;
}
}
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/ResponseCtx.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/ResponseCtx.java 2008-04-12 04:19:54 UTC (rev 72068)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/ResponseCtx.java 2008-04-12 04:20:29 UTC (rev 72069)
@@ -47,6 +47,7 @@
import org.jboss.security.xacml.sunxacml.Indenter;
import org.jboss.security.xacml.sunxacml.ParsingException;
+import org.jboss.security.xacml.sunxacml.SunxacmlUtil;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -103,7 +104,7 @@
NodeList nodes = root.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (getNodeName(node).equals("Result")) {
+ if (SunxacmlUtil.getNodeName(node).equals("Result")) {
results.add(Result.getInstance(node));
}
}
@@ -218,16 +219,5 @@
// Finish the XML for a response
out.println(topIndent + "</Response>");
- }
-
-
-
- private static String getNodeName(Node node)
- {
- String name = node.getLocalName();
- if(name == null)
- name = node.getNodeName();
- return name;
- }
-
+ }
}
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Result.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Result.java 2008-04-12 04:19:54 UTC (rev 72068)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Result.java 2008-04-12 04:20:29 UTC (rev 72069)
@@ -47,6 +47,7 @@
import org.jboss.security.xacml.sunxacml.Indenter;
import org.jboss.security.xacml.sunxacml.Obligation;
import org.jboss.security.xacml.sunxacml.ParsingException;
+import org.jboss.security.xacml.sunxacml.SunxacmlUtil;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -278,7 +279,7 @@
NodeList nodes = root.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- String name = getNodeName(node);
+ String name = SunxacmlUtil.getNodeName(node);
if (name.equals("Decision")) {
String type = node.getFirstChild().getNodeValue();
@@ -310,7 +311,7 @@
NodeList nodes = root.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (getNodeName(node).equals("Obligation"))
+ if (SunxacmlUtil.getNodeName(node).equals("Obligation"))
set.add(Obligation.getInstance(node));
}
@@ -448,14 +449,5 @@
// finish it off
out.println(indent + "</Result>");
- }
-
- private static String getNodeName(Node node)
- {
- String name = node.getLocalName();
- if(name == null)
- name = node.getNodeName();
- return name;
}
-
}
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Status.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Status.java 2008-04-12 04:19:54 UTC (rev 72068)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/Status.java 2008-04-12 04:20:29 UTC (rev 72069)
@@ -46,6 +46,7 @@
import org.jboss.security.xacml.sunxacml.Indenter;
import org.jboss.security.xacml.sunxacml.ParsingException;
+import org.jboss.security.xacml.sunxacml.SunxacmlUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -224,7 +225,7 @@
NodeList nodes = root.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- String name = getNodeName(node);
+ String name = SunxacmlUtil.getNodeName(node);
if (name.equals("StatusCode")) {
code = parseStatusCode(node);
@@ -316,14 +317,5 @@
} else {
out.println(in + "<StatusCode Value=\"" + code + "\"/>");
}
- }
-
- private static String getNodeName(Node node)
- {
- String name = node.getLocalName();
- if(name == null)
- name = node.getNodeName();
- return name;
}
-
}
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/StatusDetail.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/StatusDetail.java 2008-04-12 04:19:54 UTC (rev 72068)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ctx/StatusDetail.java 2008-04-12 04:20:29 UTC (rev 72069)
@@ -46,6 +46,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.jboss.security.xacml.sunxacml.ParsingException;
+import org.jboss.security.xacml.sunxacml.SunxacmlUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -156,7 +157,7 @@
*/
public static StatusDetail getInstance(Node root) throws ParsingException {
// check that it's really a StatusDetailType root
- if (! getNodeName(root).equals("StatusDetail"))
+ if (! SunxacmlUtil.getNodeName(root).equals("StatusDetail"))
throw new ParsingException("not a StatusDetail node");
return new StatusDetail(root);
@@ -193,14 +194,5 @@
throw new IllegalStateException("no encoded form available");
return detailText;
- }
-
- private static String getNodeName(Node node)
- {
- String name = node.getLocalName();
- if(name == null)
- name = node.getNodeName();
- return name;
}
-
}
More information about the jboss-cvs-commits
mailing list