Commit 237209e4 authored by cdanger's avatar cdanger

- Updated project description

- Updated java comment to XACML 3.0 for XACML Resource Scope
- Changed class names according to class naming convention: only first
letter in acronym is uppercase
	* XACMLAttributeCategory -> XacmlAttributeCategory
	* XACMLAttributeId -> XACMLAttributeId
	* XACMLDatatypeId -> XacmlDatatypeId
	* XACMLNodeName -> XacmlNodeName
	* XACMLResourceScope -> XacmlResourceScope
	* XACMLVersion -> XacmlVersion
parent f24ab7a0
......@@ -7,7 +7,7 @@
</parent>
<artifactId>authzforce-ce-xacml-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<description>AuthZForce - Java model (JAXB) for OASIS XACML Core Specification. The first two (dot-separated) sequences of the artifact version refer to the version of the OASIS XACML standard from which model (XML schema) this artifact is generated (using JAXB framework). OASIS XACML schema file is included. This project also includes standard XACML identifiers as Java enums.</description>
<description>AuthzForce - Java model (JAXB) for OASIS XACML Core Specification. This project also includes the OASIS XACML schema, standard XACML identifiers as Java enums, and JAXB-related utilities.</description>
<url>${project.url}</url>
<scm>
<connection>scm:git:${git.url.base}/parent.git</connection>
......
......@@ -21,7 +21,7 @@ package org.ow2.authzforce.xacml.identifiers;
* XPATH Version.
*
*/
public enum XPATHVersion
public enum XPathVersion
{
/**
* 1.0
......@@ -36,7 +36,7 @@ public enum XPATHVersion
private final String uri;
private final String versionNumber;
XPATHVersion(String uri, String versionNumber)
XPathVersion(String uri, String versionNumber)
{
this.uri = uri;
this.versionNumber = versionNumber;
......@@ -67,9 +67,9 @@ public enum XPATHVersion
* @throws IllegalArgumentException
* if uri does not match any XPath version
*/
public static XPATHVersion fromURI(String uri) throws IllegalArgumentException
public static XPathVersion fromURI(String uri) throws IllegalArgumentException
{
for (XPATHVersion c : XPATHVersion.values())
for (XPathVersion c : XPathVersion.values())
{
if (c.uri.equals(uri))
{
......
......@@ -22,10 +22,10 @@ package org.ow2.authzforce.xacml.identifiers;
/**
* XACML Version. The actual version IDs are returned by {@link XACMLAttributeCategory#ordinal()} and match the XACML version integers defined in SunXACML PolicyMetadata class.
* XACML Version. The actual version IDs are returned by {@link XacmlAttributeCategory#ordinal()} and match the XACML version integers defined in SunXACML PolicyMetadata class.
*
*/
public enum XACMLAttributeCategory
public enum XacmlAttributeCategory
{
/**
* Subject Category
......@@ -73,7 +73,7 @@ public enum XACMLAttributeCategory
private final String value;
XACMLAttributeCategory(String v) {
XacmlAttributeCategory(String v) {
value = v;
}
......@@ -88,8 +88,8 @@ public enum XACMLAttributeCategory
* @param v XACML identifier for this category
* @return XACMLCategory
*/
public static XACMLAttributeCategory fromValue(String v) {
for (XACMLAttributeCategory c : XACMLAttributeCategory.values()) {
public static XacmlAttributeCategory fromValue(String v) {
for (XacmlAttributeCategory c : XacmlAttributeCategory.values()) {
if (c.value.equals(v)) {
return c;
}
......
......@@ -21,7 +21,7 @@ package org.ow2.authzforce.xacml.identifiers;
* XACML standard attribute identifiers
*
*/
public enum XACMLAttributeId
public enum XacmlAttributeId
{
/*
......@@ -132,7 +132,7 @@ public enum XACMLAttributeId
private final String value;
XACMLAttributeId(final String v)
XacmlAttributeId(final String v)
{
value = v;
}
......@@ -154,9 +154,9 @@ public enum XACMLAttributeId
* attribute identifier
* @return enum constant for this attribute ID
*/
public static XACMLAttributeId fromValue(final String identifier)
public static XacmlAttributeId fromValue(final String identifier)
{
for (final XACMLAttributeId c : XACMLAttributeId.values())
for (final XacmlAttributeId c : XacmlAttributeId.values())
{
if (c.value.equals(identifier))
{
......
......@@ -21,7 +21,7 @@ package org.ow2.authzforce.xacml.identifiers;
* XACML Standard Datatypes
*
*/
public enum XACMLDatatypeId
public enum XacmlDatatypeId
{
// Mandatory
/**
......@@ -102,7 +102,7 @@ public enum XACMLDatatypeId
/**
* Length of {@link #XML_SCHEMA_URI_PREFIX}, used for extracting suffix from datatypes in order to create XACML function names, logging types of data, etc.
*/
public static final int XML_SCHEMA_URI_PREFIX_LENGTH = XACMLDatatypeId.XML_SCHEMA_URI_PREFIX.length();
public static final int XML_SCHEMA_URI_PREFIX_LENGTH = XacmlDatatypeId.XML_SCHEMA_URI_PREFIX.length();
private final String value;
......@@ -116,7 +116,7 @@ public enum XACMLDatatypeId
return value;
}
private XACMLDatatypeId(final String v)
private XacmlDatatypeId(final String v)
{
value = v;
}
......@@ -128,9 +128,9 @@ public enum XACMLDatatypeId
* datatype idenfifier (URI)
* @return Datatype enum
*/
public static XACMLDatatypeId fromValue(final String datatypeURI)
public static XacmlDatatypeId fromValue(final String datatypeURI)
{
for (final XACMLDatatypeId c : XACMLDatatypeId.values())
for (final XacmlDatatypeId c : XacmlDatatypeId.values())
{
if (c.value.equals(datatypeURI))
{
......
......@@ -24,7 +24,7 @@ package org.ow2.authzforce.xacml.identifiers;
* XACML node names, as defined in XACML Core Specification (declared in the same order). There may be fewer names than defined in the XACML schema. There are added progressively as needed.
*
*/
public enum XACMLNodeName
public enum XacmlNodeName
{
/**
......@@ -219,7 +219,7 @@ public enum XACMLNodeName
return value;
}
private XACMLNodeName(final String v)
private XacmlNodeName(final String v)
{
value = v;
}
......@@ -231,9 +231,9 @@ public enum XACMLNodeName
* XACML node name
* @return enum constant
*/
public static XACMLNodeName fromValue(final String nodeName)
public static XacmlNodeName fromValue(final String nodeName)
{
for (final XACMLNodeName c : XACMLNodeName.values())
for (final XacmlNodeName c : XacmlNodeName.values())
{
if (c.value.equals(nodeName))
{
......
......@@ -21,10 +21,10 @@
package org.ow2.authzforce.xacml.identifiers;
/**
* XACML Resource scopes, as defined in XACML v2.0 Multiple Resource Profile, §5. The actual value
* XACML Resource scopes, as defined in XACML v3.0 Multiple Decision Profile Version 1.0, §6.1. The actual value
*
*/
public enum XACMLResourceScope
public enum XacmlResourceScope
{
/**
......@@ -54,7 +54,7 @@ public enum XACMLResourceScope
return value;
}
private XACMLResourceScope(final String v)
private XacmlResourceScope(final String v)
{
value = v;
}
......@@ -66,9 +66,9 @@ public enum XACMLResourceScope
* resource scope identifier
* @return Resource scope enum
*/
public static XACMLResourceScope fromValue(final String scopeId)
public static XacmlResourceScope fromValue(final String scopeId)
{
for (final XACMLResourceScope c : XACMLResourceScope.values())
for (final XacmlResourceScope c : XacmlResourceScope.values())
{
if (c.value.equals(scopeId))
{
......
......@@ -22,11 +22,11 @@ package org.ow2.authzforce.xacml.identifiers;
/**
* XACML Version. The actual version IDs are returned by {@link XACMLVersion#ordinal()} and match
* XACML Version. The actual version IDs are returned by {@link XacmlVersion#ordinal()} and match
* the XACML version integers defined in SunXACML PolicyMetadata class.
*
*/
public enum XACMLVersion
public enum XacmlVersion
{
/**
* XACML 1.0
......@@ -51,7 +51,7 @@ public enum XACMLVersion
private final String namespace;
XACMLVersion(String ns)
XacmlVersion(String ns)
{
namespace = ns;
}
......@@ -69,9 +69,9 @@ public enum XACMLVersion
* schema namespace of this XACML version.
* @return XACML Version enum
*/
public static XACMLVersion fromValue(String v)
public static XacmlVersion fromValue(String v)
{
for (XACMLVersion c : XACMLVersion.values())
for (XacmlVersion c : XacmlVersion.values())
{
if (c.namespace.equals(v))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment