[jboss-cvs] JBossAS SVN: r72072 - in projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml: finder/impl and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Apr 12 00:21:36 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-04-12 00:21:36 -0400 (Sat, 12 Apr 2008)
New Revision: 72072
Modified:
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/AbstractPolicy.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ConfigurationStore.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Obligation.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Policy.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/PolicyReference.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/PolicySet.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Rule.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Target.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetMatch.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetMatchGroup.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetSection.java
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/finder/impl/SelectorModule.java
Log:
SECURITY-168: getNodeName
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/AbstractPolicy.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/AbstractPolicy.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/AbstractPolicy.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -251,7 +251,7 @@
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- if (child.getNodeName().equals(policyPrefix + "Defaults"))
+ if (SunxacmlUtil.getNodeName(child).equals(policyPrefix + "Defaults"))
handleDefaults(child);
}
@@ -265,7 +265,7 @@
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String cname = child.getNodeName();
+ String cname = SunxacmlUtil.getNodeName(child);
if (cname.equals("Description")) {
description = child.getFirstChild().getNodeValue();
@@ -291,7 +291,7 @@
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (node.getNodeName().equals("Obligation"))
+ if (SunxacmlUtil.getNodeName(node).equals("Obligation"))
obligations.add(Obligation.getInstance(node));
}
}
@@ -308,7 +308,7 @@
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (node.getNodeName().equals("XPathVersion"))
+ if (SunxacmlUtil.getNodeName(node).equals("XPathVersion"))
defaultVersion = node.getFirstChild().getNodeValue();
}
}
@@ -321,7 +321,7 @@
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (node.getNodeName().equals("CombinerParameter"))
+ if (SunxacmlUtil.getNodeName(node).equals("CombinerParameter"))
parameters.add(CombinerParameter.getInstance(node));
}
}
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ConfigurationStore.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ConfigurationStore.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/ConfigurationStore.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -234,7 +234,7 @@
NodeList children = root.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String childName = child.getNodeName();
+ String childName = SunxacmlUtil.getNodeName(child);
String elementName = null;
// get the element's name
@@ -379,7 +379,7 @@
NodeList children = root.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String name = child.getNodeName();
+ String name = SunxacmlUtil.getNodeName(child);
if (name.equals("policyFinderModule")) {
policyModules.add(loadClass("module", child));
@@ -428,7 +428,7 @@
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- if (child.getNodeName().equals("datatype")) {
+ if (SunxacmlUtil.getNodeName(child).equals("datatype")) {
// a datatype is a class with an identifier
String identifier = child.getAttributes().
getNamedItem("identifier").getNodeValue();
@@ -470,7 +470,7 @@
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- if (child.getNodeName().equals("algorithm")) {
+ if (SunxacmlUtil.getNodeName(child).equals("algorithm")) {
// an algorithm is a simple class element
CombiningAlgorithm alg =
(CombiningAlgorithm)(loadClass("algorithm", child));
@@ -526,7 +526,7 @@
NodeList children = root.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String name = child.getNodeName();
+ String name = SunxacmlUtil.getNodeName(child);
if (name.equals("target")) {
logger.config("Loading [TARGET] functions");
@@ -554,7 +554,7 @@
NodeList children = root.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String name = child.getNodeName();
+ String name = SunxacmlUtil.getNodeName(child);
if (name.equals("function")) {
// a function section is a simple class element
@@ -721,7 +721,7 @@
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String name = child.getNodeName();
+ String name = SunxacmlUtil.getNodeName(child);
if (child.getNodeType() == Node.ELEMENT_NODE) {
if (name.equals("string")) {
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Obligation.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Obligation.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Obligation.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -139,7 +139,7 @@
NodeList nodes = root.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (node.getNodeName().equals("AttributeAssignment")) {
+ if (SunxacmlUtil.getNodeName(node).equals("AttributeAssignment")) {
try {
URI attrId =
new URI(node.getAttributes().
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Policy.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Policy.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Policy.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -315,7 +315,7 @@
NodeList children = root.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- if (child.getNodeName().equals("VariableDefinition")) {
+ if (SunxacmlUtil.getNodeName(child).equals("VariableDefinition")) {
String id = child.getAttributes().
getNamedItem("VariableId").getNodeValue();
@@ -336,7 +336,7 @@
// next, collect the Policy-specific elements
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String name = child.getNodeName();
+ String name = SunxacmlUtil.getNodeName(child);
if (name.equals("Rule")) {
rules.add(Rule.getInstance(child, metaData, manager));
@@ -403,7 +403,7 @@
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (node.getNodeName().equals("CombinerParameter"))
+ if (SunxacmlUtil.getNodeName(node).equals("CombinerParameter"))
parameters.add(CombinerParameter.getInstance(node));
}
}
@@ -419,9 +419,9 @@
*/
public static Policy getInstance(Node root) throws ParsingException {
// first off, check that it's the right kind of node
- if (! root.getNodeName().equals("Policy")) {
+ if (! SunxacmlUtil.getNodeName(root).equals("Policy")) {
throw new ParsingException("Cannot create Policy from root of " +
- "type " + root.getNodeName());
+ "type " + SunxacmlUtil.getNodeName(root));
}
return new Policy(root);
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/PolicyReference.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/PolicyReference.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/PolicyReference.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -203,7 +203,7 @@
int policyType;
// see what type of reference we are
- String name = root.getNodeName();
+ String name = SunxacmlUtil.getNodeName(root);
if (name.equals("PolicyIdReference")) {
policyType = POLICY_REFERENCE;
} else if (name.equals("PolicySetIdReference")) {
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/PolicySet.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/PolicySet.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/PolicySet.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -262,7 +262,7 @@
NodeList children = root.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String name = child.getNodeName();
+ String name = SunxacmlUtil.getNodeName(child);
if (name.equals("PolicySet")) {
policies.add(PolicySet.getInstance(child, finder));
@@ -353,7 +353,7 @@
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- if (node.getNodeName().equals("CombinerParameter"))
+ if (SunxacmlUtil.getNodeName(node).equals("CombinerParameter"))
parameters.add(CombinerParameter.getInstance(node));
}
}
@@ -387,9 +387,9 @@
throws ParsingException
{
// first off, check that it's the right kind of node
- if (! root.getNodeName().equals("PolicySet")) {
+ if (! SunxacmlUtil.getNodeName(root).equals("PolicySet")) {
throw new ParsingException("Cannot create PolicySet from root of" +
- " type " + root.getNodeName());
+ " type " + SunxacmlUtil.getNodeName(root));
}
return new PolicySet(root, finder);
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Rule.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Rule.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Rule.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -198,7 +198,7 @@
NodeList children = root.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String cname = child.getNodeName();
+ String cname = SunxacmlUtil.getNodeName(child);
if (cname.equals("Description")) {
description = child.getFirstChild().getNodeValue();
@@ -343,9 +343,9 @@
// if it was INDETERMINATE, then that's what we return
return new Result(Result.DECISION_INDETERMINATE,
result.getStatus(),
- context.getResourceId().encode());
+ context.getResourceId().encode());
} else {
- // otherwise we return the effect on tue, and NA on false
+ // otherwise we return the effect on true, and NA on false
BooleanAttribute bool =
(BooleanAttribute)(result.getAttributeValue());
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Target.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Target.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Target.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -175,7 +175,7 @@
NodeList children = root.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String name = child.getNodeName();
+ String name = SunxacmlUtil.getNodeName(child);
if (name.equals("Subjects")) {
subjects =
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetMatch.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetMatch.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetMatch.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -237,7 +237,7 @@
NodeList nodes = root.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
- String name = node.getNodeName();
+ String name = SunxacmlUtil.getNodeName(node);
if (name.equals(NAMES[matchType] + "AttributeDesignator")) {
eval = AttributeDesignator.getInstance(node, matchType,
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetMatchGroup.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetMatchGroup.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetMatchGroup.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -105,7 +105,7 @@
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String name = child.getNodeName();
+ String name = SunxacmlUtil.getNodeName(child);
if (name.equals(TargetMatch.NAMES[matchType] + "Match")) {
matches.add(TargetMatch.getInstance(child, matchType,
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetSection.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetSection.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/TargetSection.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -109,7 +109,7 @@
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
- String name = child.getNodeName();
+ String name = SunxacmlUtil.getNodeName(child);
String typeName = TargetMatch.NAMES[matchType];
if (name.equals(typeName)) {
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/finder/impl/SelectorModule.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/finder/impl/SelectorModule.java 2008-04-12 04:21:16 UTC (rev 72071)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/finder/impl/SelectorModule.java 2008-04-12 04:21:36 UTC (rev 72072)
@@ -49,6 +49,7 @@
import org.jboss.security.xacml.sunxacml.EvaluationCtx;
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.AttributeFactory;
import org.jboss.security.xacml.sunxacml.attr.BagAttribute;
@@ -160,7 +161,7 @@
if (n.getNodeValue().equals(namespace)) {
// we found the matching namespace, so get the prefix
// and then break out
- String name = n.getNodeName();
+ String name = SunxacmlUtil.getNodeName(n);
int pos = name.indexOf(':');
if (pos == -1) {
More information about the jboss-cvs-commits
mailing list