You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openaz.apache.org by pd...@apache.org on 2015/05/13 18:03:16 UTC

[54/56] [abbrv] incubator-openaz git commit: fixed comments that still referenced com.att.research

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResponseMatchResult.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResponseMatchResult.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResponseMatchResult.java
index ccd6375..66be65e 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResponseMatchResult.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResponseMatchResult.java
@@ -39,7 +39,7 @@ import org.apache.openaz.xacml.api.Response;
 import org.apache.openaz.xacml.api.Result;
 
 /**
- * ResponseMatchResult provides information about how a {@link com.att.research.xacml.api.Response} object
+ * ResponseMatchResult provides information about how a {@link org.apache.openaz.xacml.api.Response} object
  * matches another <code>Response</code> object.
  */
 public class ResponseMatchResult {

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResultMatchResult.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResultMatchResult.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResultMatchResult.java
index 7ae977c..c827107 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResultMatchResult.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResultMatchResult.java
@@ -35,7 +35,7 @@ import org.apache.openaz.xacml.std.StdStatusCode;
 import org.apache.openaz.xacml.util.ListUtil;
 
 /**
- * ResultMatchResult provides information about how well a {@link com.att.research.xacml.api.Result} object
+ * ResultMatchResult provides information about how well a {@link org.apache.openaz.xacml.api.Result} object
  * matches another <code>Result</code> object.
  */
 public class ResultMatchResult {

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/TestCustom.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/TestCustom.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/TestCustom.java
index b83af85..17a6e38 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/TestCustom.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/TestCustom.java
@@ -149,7 +149,7 @@ public class TestCustom extends TestBase {
     /*
      * (non-Javadoc) Simply look for command line option: -generate This generates the public/private key.
      * Shouldn't need to call it again, the keys have already been generated and saved.
-     * @see com.att.research.xacmlatt.pdp.test.TestBase#parseCommands(java.lang.String[])
+     * @see org.apache.openaz.xacml.pdp.test.TestBase#parseCommands(java.lang.String[])
      */
     @Override
     protected void parseCommands(String[] args) throws ParseException, MalformedURLException, HelpException {
@@ -173,7 +173,7 @@ public class TestCustom extends TestBase {
     /*
      * (non-Javadoc) After our parent class configure's itself, all this needs to do is read in the
      * public/private key's into objects.
-     * @see com.att.research.xacmlatt.pdp.test.TestBase#configure()
+     * @see org.apache.openaz.xacml.pdp.test.TestBase#configure()
      */
     @Override
     protected void configure() throws FactoryException {
@@ -206,7 +206,7 @@ public class TestCustom extends TestBase {
      * (non-Javadoc) Here we add 2 attributes into the request: 1) the private key, and 2) a String that was
      * encrypted using the public key. The goal is to have the custom decrypt function use the private key to
      * decrypt that string.
-     * @see com.att.research.xacmlatt.pdp.test.TestBase#generateRequest(java.nio.file.Path, java.lang.String)
+     * @see org.apache.openaz.xacml.pdp.test.TestBase#generateRequest(java.nio.file.Path, java.lang.String)
      */
     @Override
     protected Request generateRequest(Path file, String group) throws JSONStructureException,

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/policy/TestPolicy.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/policy/TestPolicy.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/policy/TestPolicy.java
index 16e8f45..3ea93cd 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/policy/TestPolicy.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/policy/TestPolicy.java
@@ -128,7 +128,7 @@ public class TestPolicy extends TestBase {
     /*
      * Look for the -policy command line argument. This application needs a pointer to a specific policy in
      * order to run. (non-Javadoc)
-     * @see com.att.research.xacmlatt.pdp.test.TestBase#parseCommands(java.lang.String[])
+     * @see org.apache.openaz.xacml.pdp.test.TestBase#parseCommands(java.lang.String[])
      */
     @Override
     protected void parseCommands(String[] args) throws ParseException, MalformedURLException, HelpException {
@@ -164,7 +164,7 @@ public class TestPolicy extends TestBase {
      * attributes that are defined within the policy. This routine will then dump all the possible requests
      * into the requests sub-directory. Thus, when this method returns the TestBase can proceed to iterate
      * each generated request and run it against the PDP engine. (non-Javadoc)
-     * @see com.att.research.xacmlatt.pdp.test.TestBase#configure()
+     * @see org.apache.openaz.xacml.pdp.test.TestBase#configure()
      */
     @Override
     protected void configure() throws FactoryException {

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Attribute.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Attribute.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Attribute.java
index c32d538..741a73f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Attribute.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Attribute.java
@@ -85,7 +85,7 @@ public interface Attribute {
 
     /**
      * Gets the <code>boolean</code> value indicating whether this <code>Attribute</code> should be included
-     * in the {@link com.att.research.xacml.Response} to a XACML 3.0 Request.
+     * in the {@link org.apache.openaz.xacml.Response} to a XACML 3.0 Request.
      *
      * @return true if this <code>Attribute</code> should be included in the <code>Response</code> else false.
      */

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeFactory.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeFactory.java
index 45bbb91..bf9beee 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeFactory.java
@@ -42,7 +42,7 @@ import org.apache.openaz.xacml.util.FactoryFinder;
  * places (in order): 1. System properties 2. The xacml.properties file which is located by: a)
  * {@code System.getProperty("xacml.properties")} b) {@code java.home/xacml.properties} 3. If the class name
  * is not found in one of these properties, the default is:
- * {@code com.att.research.xacml.std.StdDataTypeFactory}
+ * {@code org.apache.openaz.xacml.std.StdDataTypeFactory}
  */
 public abstract class DataTypeFactory {
     private static final String	FACTORYID					= "xacml.dataTypeFactory";

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
index 6d19f3f..4bc13db 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
@@ -56,7 +56,7 @@ public interface Result {
      * <code>Result</code>. If there are no <code>Obligation</code>s this method must return an empty
      * <code>Collection</code>.
      *
-     * @return the <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s
+     * @return the <code>Collection</code> of {@link org.apache.openaz.xacml.api.Obligation}s
      *         <code>Result</code>.
      */
     Collection<Obligation> getObligations();
@@ -74,7 +74,7 @@ public interface Result {
      * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeCategory} objects in this <code>Result</code>.  If there
      * are no <code>AttributeCategory</code> objects this method must return an empty <code>Collection</code>.
 =======
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.AttributeCategory} objects in
+     * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeCategory} objects in
      * this <code>Result</code>. If there are no <code>AttributeCategory</code> objects this method must
      * return an empty <code>Collection</code>.
 >>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
@@ -89,7 +89,7 @@ public interface Result {
      * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to XACML 3.0 Policies
      * that are in this <code>Result</code>.
 =======
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects referring to
+     * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to
      * XACML 3.0 Policies that are in this <code>Result</code>.
 >>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
      *
@@ -102,7 +102,7 @@ public interface Result {
      * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to XACML 3.0 PolicySets
      * that are in this <code>Result</code>.
 =======
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects referring to
+     * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to
      * XACML 3.0 PolicySets that are in this <code>Result</code>.
 >>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
      *

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusCode.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusCode.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusCode.java
index e75ee5a..0919113 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusCode.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusCode.java
@@ -35,7 +35,7 @@ package org.apache.openaz.xacml.api;
  */
 public interface StatusCode {
     /**
-     * Retrieves the major status {@link com.att.research.xacmo.common.Identifier} for this
+     * Retrieves the major status {@link org.apache.openaz.xacmo.common.Identifier} for this
      * <code>StatusCode</code>.
      *
      * @return the major status <code>Identifier</code> for this <code>StatusCode</code>

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
index 447e903..f0a3986 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
@@ -39,7 +39,7 @@ import org.apache.openaz.xacml.util.FactoryFinder;
 import org.apache.openaz.xacml.util.XACMLProperties;
 
 /**
- * PDPEngineFactory provides the interface for creating {@link com.att.research.xacml.pep.PDPEngine}
+ * PDPEngineFactory provides the interface for creating {@link org.apache.openaz.xacml.pep.PDPEngine}
  * instances.
  */
 public abstract class PDPEngineFactory {
@@ -155,7 +155,7 @@ public abstract class PDPEngineFactory {
      * Creates a new <code>PDPEngine</code> using the default policy set and {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
 =======
      * Creates a new <code>PDPEngine</code> using the default policy set and
-     * {@link com.att.research.xacml.api.pip.PIPFinder}.
+     * {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
 >>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngineFactory.java
      *
      * @return a new <code>PDPEngine</code>
@@ -167,7 +167,7 @@ public abstract class PDPEngineFactory {
      * Creates a new <code>PDPEngine</code> using the default policy set and {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
 =======
      * Creates a new <code>PDPEngine</code> using the default policy set and
-     * {@link com.att.research.xacml.api.pip.PIPFinder}.
+     * {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
 >>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngineFactory.java
      *
      * @return a new <code>PDPEngine</code>

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverResult.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverResult.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverResult.java
index 055dca5..d99a8b5 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverResult.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverResult.java
@@ -41,13 +41,13 @@ import org.apache.openaz.xacml.api.Status;
  */
 public interface ScopeResolverResult {
     /*
-     * Gets the {@link com.att.research.xacml.api.Status} for the scope resolution request.
+     * Gets the {@link org.apache.openaz.xacml.api.Status} for the scope resolution request.
      * @return the <code>Status</code> of the scope resolution request
      */
     Status getStatus();
 
     /*
-     * Gets an <code>Iterator</code> over {@link com.att.research.xacml.api.Attribute}s resolved from a scope
+     * Gets an <code>Iterator</code> over {@link org.apache.openaz.xacml.api.Attribute}s resolved from a scope
      * resolution request.
      * @return an <code>Iterator</code> over the <code>Attribute</code>s resolved from a scope resolution
      * request.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/package-info.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/package-info.java
index 6bdca5a..c48d4c4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/package-info.java
@@ -32,7 +32,7 @@
 package org.apache.openaz.xacml.api.pdp;
 
 /**
- * com.att.research.xacml.api.pdp contains the XACML API for that PDP implementations must meet to be used by the standard PEP
+ * org.apache.openaz.xacml.api.pdp contains the XACML API for that PDP implementations must meet to be used by the standard PEP
  * implementation.
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/package-info.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/package-info.java
index ece5930..e40e48a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/package-info.java
@@ -32,6 +32,6 @@
 package org.apache.openaz.xacml.api.pep;
 
 /**
- * com.att.research.xacml.api.pep contains the XACML API for the PEP interface
+ * org.apache.openaz.xacml.api.pep contains the XACML API for the PEP interface
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPException.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPException.java
index 1f5eeee..1370362 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPException.java
@@ -32,7 +32,7 @@ package org.apache.openaz.xacml.api.pip;
 
 /**
  * PIPException extends <code>Exception</code> to represent errors that can occur as a result of querying a
- * {@link PIPEngine} for {@link com.att.research.xacml.api.Attribute}s.
+ * {@link PIPEngine} for {@link org.apache.openaz.xacml.api.Attribute}s.
  */
 public class PIPException extends Exception {
     private static final long serialVersionUID = -6656926395983776184L;

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinder.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinder.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinder.java
index 1ae08bb..007241a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinder.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinder.java
@@ -34,13 +34,13 @@ import java.util.Collection;
 
 /**
  * PIPFinder is the interface objects implement that can query multiple sources of
- * {@link com.att.research.xacml.api.Attribute}s based on a {@link com.att.research.xacml.api.pip.PIPRequest}.
+ * {@link org.apache.openaz.xacml.api.Attribute}s based on a {@link org.apache.openaz.xacml.api.pip.PIPRequest}.
  */
 public interface PIPFinder {
     /**
      * Retrieves <code>Attribute</code>s that based on the given
-     * {@link com.att.research.xacml.api.pip.PIPRequest}. The
-     * {@link com.att.research.xacml.api.pip.PIPResponse} may contain multiple <code>Attribute</code>s and
+     * {@link org.apache.openaz.xacml.api.pip.PIPRequest}. The
+     * {@link org.apache.openaz.xacml.api.pip.PIPResponse} may contain multiple <code>Attribute</code>s and
      * they do not need to match the <code>PIPRequest</code>. In this way, a <code>PIPFinder</code> may
      * compute multiple related <code>Attribute</code>s at once.
      *
@@ -48,23 +48,23 @@ public interface PIPFinder {
      *            retrieved
      * @param excude the (optional) <code>PIPEngine</code> to exclude from searches for the given
      *            <code>PIPRequest</code>
-     * @return a {@link com.att.research.xacml.pip.PIPResponse} with the results of the request
+     * @return a {@link org.apache.openaz.xacml.pip.PIPResponse} with the results of the request
      * @throws PIPException if there is an error retrieving the <code>Attribute</code>s.
      */
     PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException;
 
     /**
      * Retrieves <code>Attribute</code>s that match the given
-     * {@link com.att.research.xacml.api.pip.PIPRequest}. The
-     * {@link com.att.research.xacml.api.pip.PIPResponse} should only include a single
-     * {@link com.att.research.xacml.api.Attribute} with {@link com.att.research.xacml.api.AttributeValue}s
+     * {@link org.apache.openaz.xacml.api.pip.PIPRequest}. The
+     * {@link org.apache.openaz.xacml.api.pip.PIPResponse} should only include a single
+     * {@link org.apache.openaz.xacml.api.Attribute} with {@link org.apache.openaz.xacml.api.AttributeValue}s
      * whose data type matches the request.
      *
      * @param pipRequest the <code>PIPRequest</code> defining which <code>Attribute</code>s should be
      *            retrieved
      * @param excude the (optional) <code>PIPEngine</code> to exclude from searches for the given
      *            <code>PIPRequest</code>
-     * @return a {@link com.att.research.xacml.pip.PIPResponse} with the results of the request
+     * @return a {@link org.apache.openaz.xacml.pip.PIPResponse} with the results of the request
      * @throws PIPException if there is an error retrieving the <code>Attribute</code>s.
      */
     PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException;

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPResponse.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPResponse.java
index 9e9fe01..c9171b0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPResponse.java
@@ -40,7 +40,7 @@ import org.apache.openaz.xacml.api.Status;
  */
 public interface PIPResponse {
     /**
-     * Gets the {@link com.att.research.xacml.api.Status} of the request to retrieve attributes from a
+     * Gets the {@link org.apache.openaz.xacml.api.Status} of the request to retrieve attributes from a
      * <code>PIPEngine</code>.
      *
      * @return the <code>Status</code> of the request to retrieve attributes from a <code>PIPEngine</code>
@@ -48,7 +48,7 @@ public interface PIPResponse {
     Status getStatus();
 
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s returned from a
+     * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s returned from a
      * {@link PIPEngine}. The caller must not modify the returned <code>Collection</code>. The implementation
      * is free to enforce this with unmodifiable collections.
      *
@@ -59,8 +59,8 @@ public interface PIPResponse {
 
     /**
      * Determines if this <code>PIPResponse</code> is simple or not. A simple <code>PIPResponse</code>
-     * contains a single {@link com.att.research.xacml.api.Attribute} whose
-     * {@link com.att.research.xacml.api.AttributeValue}s are all of the same data type.
+     * contains a single {@link org.apache.openaz.xacml.api.Attribute} whose
+     * {@link org.apache.openaz.xacml.api.AttributeValue}s are all of the same data type.
      *
      * @return true if this <code>PIPResponse</code> is simple, else false.
      */

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/package-info.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/package-info.java
index 873ea36..5b14fc5 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/package-info.java
@@ -32,6 +32,6 @@
 package org.apache.openaz.xacml.api.pip;
 
 /**
- * com.att.research.xacml.api.pip contains an API for PIP providers and PIP users
+ * org.apache.openaz.xacml.api.pip contains an API for PIP providers and PIP users
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngine.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngine.java
index 8730518..a695902 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngine.java
@@ -33,7 +33,7 @@ package org.apache.openaz.xacml.api.trace;
 
 /**
  * Defines the API for objects that serve as handlers for {@link TraceEvent}s. <code>TraceEngine</code>s are
- * instantiated with {@link com.att.research.xacml.api.trace.TraceEngineFactory} objects.
+ * instantiated with {@link org.apache.openaz.xacml.api.trace.TraceEngineFactory} objects.
  */
 public interface TraceEngine {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/Traceable.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/Traceable.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/Traceable.java
index b4a7916..236a647 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/Traceable.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/Traceable.java
@@ -33,13 +33,13 @@ package org.apache.openaz.xacml.api.trace;
 
 /**
  * Defines the API for objects that can be set as the "cause" in a
- * {@link com.att.research.xacml.api.trace.TraceEvent}. Objects cause a <code>TraceEvent</code> through
+ * {@link org.apache.openaz.xacml.api.trace.TraceEvent}. Objects cause a <code>TraceEvent</code> through
  * methods called during the evaluation of a XACML Policy or PolicySet.
  */
 public interface Traceable {
     /**
      * Gets the <code>String</code> identifier for the object that caused the
-     * {@link com.att.research.xacml.api.trace.TraceEvent} as a result of a policy evaluation method.
+     * {@link org.apache.openaz.xacml.api.trace.TraceEvent} as a result of a policy evaluation method.
      * Implementations must not return <code>null</code>.
      *
      * @return the <code>String</code> identifier for the object that caused the <code>TraceEvent</code>.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/package-info.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/package-info.java
index 59b0879..9d6d08d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/package-info.java
@@ -35,8 +35,8 @@ package org.apache.openaz.xacml;
  * Provides base interfaces and standard implementation classes for applications using the "eXtensible Access Control Markup Language (XACML) Version 3.0"
  * to provide ABAC access control for resources and actions.
  *
- * The packages in com.att.research.api define Java Interfaces only.
+ * The packages in org.apache.openaz.api define Java Interfaces only.
  *
- * The packages in com.att.research.std define standard implementations of the com.att.research.api interfaces.
+ * The packages in org.apache.openaz.std define standard implementations of the org.apache.openaz.api interfaces.
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/IdentifierImpl.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/IdentifierImpl.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/IdentifierImpl.java
index fcad762..672e22a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/IdentifierImpl.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/IdentifierImpl.java
@@ -38,7 +38,7 @@ import org.apache.openaz.xacml.api.Identifier;
 import org.apache.openaz.xacml.util.ObjUtil;
 
 /**
- * IdentifierImpl provides a common implementation of the {@link com.att.research.xacml.api.Identifier}
+ * IdentifierImpl provides a common implementation of the {@link org.apache.openaz.xacml.api.Identifier}
  * interface with a stored, fixed <code>URI</code>.
  */
 public class IdentifierImpl implements Identifier {

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAdvice.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAdvice.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAdvice.java
index 2a74178..fbf6fa7 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAdvice.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAdvice.java
@@ -38,12 +38,12 @@ import org.apache.openaz.xacml.api.Identifier;
 import org.apache.openaz.xacml.util.Wrapper;
 
 /**
- * Immutable implementation of the {@link com.att.research.xacml.api.Advice} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.Advice} interface.
  */
 public class StdAdvice extends Wrapper<Advice> implements Advice {
     /**
      * Creates an immutable <code>StdAdvice</code> that wraps the given
-     * {@link com.att.research.xacml.api.Advice}.
+     * {@link org.apache.openaz.xacml.api.Advice}.
      *
      * @param advice the <code>Advice</code> object to wrap in the new <code>StdAdvice</code>
      */
@@ -53,8 +53,8 @@ public class StdAdvice extends Wrapper<Advice> implements Advice {
 
     /**
      * Creates an immutable <code>StdAdvice</code> with the given
-     * {@link com.att.research.xacml.api.Identifier} as the XACML AdviceId and the given
-     * <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s representing the
+     * {@link org.apache.openaz.xacml.api.Identifier} as the XACML AdviceId and the given
+     * <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeAssignment}s representing the
      * XACML AttributeAssignment elements.
      *
      * @param adviceId the <code>Identifier</code> representing the XACML AdviceId
@@ -67,7 +67,7 @@ public class StdAdvice extends Wrapper<Advice> implements Advice {
 
     /**
      * Creates an immutable <code>StdAdvice</code> with the given
-     * {@link com.att.research.xacml.api.Identifier} as the XACML AdviceId and an empty list of
+     * {@link org.apache.openaz.xacml.api.Identifier} as the XACML AdviceId and an empty list of
      * <code>AttributeAssignment</code>s.
      *
      * @param adviceId the <code>Identifier</code> representing the XACML AdviceId

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttribute.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttribute.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttribute.java
index f5df24b..d1a21ba 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttribute.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttribute.java
@@ -40,12 +40,12 @@ import org.apache.openaz.xacml.api.Identifier;
 import org.apache.openaz.xacml.util.Wrapper;
 
 /**
- * Immutable implementation of the {@link com.att.research.xacml.api.Attribute} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.Attribute} interface.
  */
 public class StdAttribute extends Wrapper<Attribute> implements Attribute {
     /**
      * Creates an immutable <code>StdAttribute</code> that wraps the given
-     * {@link com.att.research.xacml.api.Attribute}.
+     * {@link org.apache.openaz.xacml.api.Attribute}.
      *
      * @param attribute the <code>Attribute</code> wrapped by this <code>StdAttribute</code>.
      */
@@ -55,8 +55,8 @@ public class StdAttribute extends Wrapper<Attribute> implements Attribute {
 
     /**
      * Creates an immutable <code>StdAttribute</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s representing the XACML Category and AttributeId, a copy
-     * of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeValue}s representing
+     * {@link org.apache.openaz.xacml.api.Identifier}s representing the XACML Category and AttributeId, a copy
+     * of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeValue}s representing
      * the XACML AttributeValue elements, the given <code>String</code> Issuer, and the given
      * <code>boolean</code> indicating whether the new <code>StdAttribute</code> should be returned as part of
      * a decision Result.
@@ -74,8 +74,8 @@ public class StdAttribute extends Wrapper<Attribute> implements Attribute {
 
     /**
      * Creates an immutable <code>StdAttribute</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s representing the XACML Category and AttributeId, the
-     * {@link com.att.research.xacml.api.AttributeValue}s representing a single XACML AttributeValue element,
+     * {@link org.apache.openaz.xacml.api.Identifier}s representing the XACML Category and AttributeId, the
+     * {@link org.apache.openaz.xacml.api.AttributeValue}s representing a single XACML AttributeValue element,
      * the given <code>String</code> Issuer, and the given <code>boolean</code> indicating whether the new
      * <code>StdAttribute</code> should be returned as part of a decision Result.
      *
@@ -92,8 +92,8 @@ public class StdAttribute extends Wrapper<Attribute> implements Attribute {
 
     /**
      * Creates an immutable <code>StdAttribute</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s representing the XACML Category and AttributeId, and the
-     * {@link com.att.research.xacml.api.AttributeValue}s representing a single XACML AttributeValue element.
+     * {@link org.apache.openaz.xacml.api.Identifier}s representing the XACML Category and AttributeId, and the
+     * {@link org.apache.openaz.xacml.api.AttributeValue}s representing a single XACML AttributeValue element.
      *
      * @param categoryIdIn the <code>Identifier</code> representing the XACML Category
      * @param attributeIdIn the <code>Identifier</code> representing the XACML AttributeId
@@ -105,7 +105,7 @@ public class StdAttribute extends Wrapper<Attribute> implements Attribute {
 
     /**
      * Gets a new <code>StdAttribute</code> that is a copy of the given
-     * {@link com.att.research.xacml.api.Attribute}.
+     * {@link org.apache.openaz.xacml.api.Attribute}.
      *
      * @param attribute the <code>Attribute</code> to copy
      * @return a new <code>StdAttribute</code> that is a copy of the given <code>Attribute</code>

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeAssignment.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeAssignment.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeAssignment.java
index 647ddb9..f5ec45d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeAssignment.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeAssignment.java
@@ -36,12 +36,12 @@ import org.apache.openaz.xacml.api.Identifier;
 import org.apache.openaz.xacml.util.Wrapper;
 
 /**
- * Immutable implementation of the {@link com.att.research.xacml.api.AttributeAssignment} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.AttributeAssignment} interface.
  */
 public class StdAttributeAssignment extends Wrapper<AttributeAssignment> implements AttributeAssignment {
     /**
      * Creates a new immutable <code>StdAttributeAssignment</code> that wraps the given
-     * {@link com.att.research.xacml.api.AttributeAssignment}. The caller agrees not to modify the given
+     * {@link org.apache.openaz.xacml.api.AttributeAssignment}. The caller agrees not to modify the given
      * <code>AttributeAssignment</code> as long as the new <code>StdAttributeAssignment</code> refers to it.
      *
      * @param attributeAssignment the <code>AttributeAssignment</code> to be wrapped by the new
@@ -53,9 +53,9 @@ public class StdAttributeAssignment extends Wrapper<AttributeAssignment> impleme
 
     /**
      * Creates a new immutable <code>StdAttributeAssignment</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s representing the XACML Category and AttributeId of the
+     * {@link org.apache.openaz.xacml.api.Identifier}s representing the XACML Category and AttributeId of the
      * Attribute to be assigned, the given <code>String</code> issuer, and the given
-     * {@link com.att.research.xacml.api.AttributeValue} representing the value to assign to the Attribute.
+     * {@link org.apache.openaz.xacml.api.AttributeValue} representing the value to assign to the Attribute.
      *
      * @param categoryIn the <code>Identifier</code> representing the Category of the Attribute to be assigned
      * @param attributeIdIn the <code>Identifier</code> representing the AttributeId of the Attribute to be
@@ -71,7 +71,7 @@ public class StdAttributeAssignment extends Wrapper<AttributeAssignment> impleme
 
     /**
      * Creates a new immutable <code>StdAttributeAssignment</code> by copying the given
-     * {@link com.att.research.xacml.api.AttributeAssignment}.
+     * {@link org.apache.openaz.xacml.api.AttributeAssignment}.
      *
      * @param attributeAssignment the <code>AttributeAssignment</code> to copy
      * @return a new <code>StdAttributeAssignment</code> copied from the given

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeCategory.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeCategory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeCategory.java
index 633ccfd..907d328 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeCategory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeCategory.java
@@ -39,12 +39,12 @@ import org.apache.openaz.xacml.api.Identifier;
 import org.apache.openaz.xacml.util.Wrapper;
 
 /**
- * Immutable implementation of the {@link com.att.research.xacml.api.AttributeCategory} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.AttributeCategory} interface.
  */
 public class StdAttributeCategory extends Wrapper<AttributeCategory> implements AttributeCategory {
     /**
      * Creates an immutable <code>StdAttributeCategory</code> that wraps the given
-     * {@link com.att.research.xacml.api.AttributeCategory}. The caller agrees to no longer modify the given
+     * {@link org.apache.openaz.xacml.api.AttributeCategory}. The caller agrees to no longer modify the given
      * <code>AttributeCategory</code> while it is wrapped by the <code>StdAttributeCategory</code>>
      *
      * @param attributeCategory the <code>AttributeCategory</code> to wrap.
@@ -55,8 +55,8 @@ public class StdAttributeCategory extends Wrapper<AttributeCategory> implements
 
     /**
      * Creates a new <code>StdAttributeCategory</code> with the given
-     * {@link com.att.research.xacml.api.Identifier} representing its XACML Category, and the given
-     * <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s as its XACML Attributes. The
+     * {@link org.apache.openaz.xacml.api.Identifier} representing its XACML Category, and the given
+     * <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s as its XACML Attributes. The
      * <code>Collection</code> is copied; changes made to the <code>Collection</code> after creating the new
      * <code>StdAttributeCategory</code> are not reflected in the <code>StdAttributeCategory</code>.
      *

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeValue.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeValue.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeValue.java
index f6e7feb..cb8b9d7 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeValue.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeValue.java
@@ -47,7 +47,7 @@ public class StdAttributeValue<T> implements AttributeValue<T> {
 
     /**
      * Creates a new <code>StdAttributeValue</code> with the given
-     * {@link com.att.research.xacml.api.Identifier} representing the XACML data type id and the given object
+     * {@link org.apache.openaz.xacml.api.Identifier} representing the XACML data type id and the given object
      * representing the value. The <code>xpathCategoryIn</code> is optional and is only needed for
      * <code>StdAttributeValue</code>s whose <code>dataTypeIdIn</code> is XPathExpression.
      *
@@ -66,7 +66,7 @@ public class StdAttributeValue<T> implements AttributeValue<T> {
 
     /**
      * Creates a new <code>StdAttributeValue</code> with the given
-     * {@link com.att.research.xacml.api.Identifier} representing the XACML data type id and the given object
+     * {@link org.apache.openaz.xacml.api.Identifier} representing the XACML data type id and the given object
      * representing the value.
      *
      * @param dataTypeIdIn the <code>Identifier</code> representing the XACML data type id for the new

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdDataTypeFactory.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdDataTypeFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdDataTypeFactory.java
index 84c8be1..5c9681c 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdDataTypeFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdDataTypeFactory.java
@@ -39,7 +39,7 @@ import org.apache.openaz.xacml.api.Identifier;
 import org.apache.openaz.xacml.std.datatypes.DataTypes;
 
 /**
- * Implements the {@link com.att.research.xacml.api.DataTypeFactory} interface to support all of the data
+ * Implements the {@link org.apache.openaz.xacml.api.DataTypeFactory} interface to support all of the data
  * types in the XACML 3.0 specification.
  */
 public class StdDataTypeFactory extends DataTypeFactory {
@@ -81,8 +81,8 @@ public class StdDataTypeFactory extends DataTypeFactory {
 
     /**
      * Creates a new <code>StdDataTypeFactory</code> and initializes the mapping from
-     * {@link com.att.research.xacml.api.Identifier}s for XACML data types to the
-     * {@link com.att.research.xacml.api.DataType} class instance that implements that data type.
+     * {@link org.apache.openaz.xacml.api.Identifier}s for XACML data types to the
+     * {@link org.apache.openaz.xacml.api.DataType} class instance that implements that data type.
      */
     public StdDataTypeFactory() {
         initMap();

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReference.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReference.java
index 16aa691..f7de678 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReference.java
@@ -36,16 +36,16 @@ import org.apache.openaz.xacml.api.Version;
 import org.apache.openaz.xacml.util.ObjUtil;
 
 /**
- * Immutable implementation of the {@link com.att.research.xacml.api.IdReference} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.IdReference} interface.
  */
 public class StdIdReference implements IdReference {
     private Identifier id;
     private Version version;
 
     /**
-     * Creates a new <code>StdIdReference</code> with the given {@link com.att.research.xacml.api.Identifier}
+     * Creates a new <code>StdIdReference</code> with the given {@link org.apache.openaz.xacml.api.Identifier}
      * representing the XACML PolicyId or PolicySetId, and the given
-     * {@link com.att.research.xacml.api.Version} representing the PolicyVersion or PolicySetVersion.
+     * {@link org.apache.openaz.xacml.api.Version} representing the PolicyVersion or PolicySetVersion.
      *
      * @param idIn the <code>Identifier</code> representing the PolicyId or PolicySetId.
      * @param versionIn the <code>Version</code> representing the PolicyVersion or PolicySetVersion.
@@ -56,7 +56,7 @@ public class StdIdReference implements IdReference {
     }
 
     /**
-     * Creates a new <code>StdIdReference</code> with the given {@link com.att.research.xacml.api.Identifier}
+     * Creates a new <code>StdIdReference</code> with the given {@link org.apache.openaz.xacml.api.Identifier}
      * representing the XACML PolicyId or PolicySetId.
      *
      * @param idIn the <code>Identifier</code> representing the PolicyId or PolicySetId.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReferenceMatch.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReferenceMatch.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReferenceMatch.java
index 9925c06..bea59c2 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReferenceMatch.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReferenceMatch.java
@@ -36,7 +36,7 @@ import org.apache.openaz.xacml.api.VersionMatch;
 import org.apache.openaz.xacml.util.ObjUtil;
 
 /**
- * Immutable implementation of the {@link com.att.research.xacml.api.IdReferenceMatch} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.IdReferenceMatch} interface.
  */
 public class StdIdReferenceMatch implements IdReferenceMatch {
     private Identifier id;
@@ -46,8 +46,8 @@ public class StdIdReferenceMatch implements IdReferenceMatch {
 
     /**
      * Creates a new <code>StdIdReferenceMatch</code> with the given
-     * {@link com.att.research.xacml.api.Identifier} representing the PolicyId or PolicySetId to match, and
-     * the given set of {@link com.att.research.xacml.api.VersionMatch} objects specifying which XACML
+     * {@link org.apache.openaz.xacml.api.Identifier} representing the PolicyId or PolicySetId to match, and
+     * the given set of {@link org.apache.openaz.xacml.api.VersionMatch} objects specifying which XACML
      * Versions are acceptable.
      *
      * @param idIn the <code>Identifier</code> representing the PolicyId or PolicySetId.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIndividualDecisionRequestGenerator.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIndividualDecisionRequestGenerator.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIndividualDecisionRequestGenerator.java
index c5fde23..c5eb0b9 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIndividualDecisionRequestGenerator.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIndividualDecisionRequestGenerator.java
@@ -60,7 +60,7 @@ import org.w3c.dom.NodeList;
 
 /**
  * StdIndividualDecisionRequestGenerator is a utility that PDP developers can use to take an original
- * {@link com.att.research.xacml.api.Request} and turn it into a sequence of individual decision
+ * {@link org.apache.openaz.xacml.api.Request} and turn it into a sequence of individual decision
  * <code>Request</code>s. This class implements all of the multiple-decision profiles specified in
  * "XACML v3.0 Multiple Decision Profile Version 1.0"
  */

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMissingAttributeDetail.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMissingAttributeDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMissingAttributeDetail.java
index 34cddab..1d4b978 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMissingAttributeDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMissingAttributeDetail.java
@@ -38,13 +38,13 @@ import org.apache.openaz.xacml.api.MissingAttributeDetail;
 import org.apache.openaz.xacml.util.Wrapper;
 
 /**
- * Immutable implementation of the {@link com.att.research.xacml.api.MissingAttributeDetail} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.MissingAttributeDetail} interface.
  */
 public class StdMissingAttributeDetail extends Wrapper<MissingAttributeDetail> implements
     MissingAttributeDetail {
     /**
      * Creates a new immutable <code>StdMissingAttributeDetail</code> that wraps the given
-     * {@link com.att.research.xacml.api.MissingAttributeDetail}. The caller agrees not to modify the
+     * {@link org.apache.openaz.xacml.api.MissingAttributeDetail}. The caller agrees not to modify the
      * <code>MissingAttributeDetail</code> as long as the new <code>StdMissingAttributeDetail</code> refers to
      * it.
      *
@@ -57,9 +57,9 @@ public class StdMissingAttributeDetail extends Wrapper<MissingAttributeDetail> i
 
     /**
      * Creates a new immutable <code>StdMissingAttributeDetail</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
+     * {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
      * missing Attribute, and the given <code>String</code> Issuer. If not null, the <code>Collection</code>
-     * of {@link com.att.research.xacml.api.AttributeValue}s is copied into the new
+     * of {@link org.apache.openaz.xacml.api.AttributeValue}s is copied into the new
      * <code>StdMutableMissingAttributeDetail</code>.
      *
      * @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
@@ -80,7 +80,7 @@ public class StdMissingAttributeDetail extends Wrapper<MissingAttributeDetail> i
 
     /**
      * Creates a new immutable <code>StdMissingAttributeDetail</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
+     * {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
      * missing Attribute, and the given <code>String</code> Issuer.
      *
      * @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
@@ -97,7 +97,7 @@ public class StdMissingAttributeDetail extends Wrapper<MissingAttributeDetail> i
 
     /**
      * Creates a new immutable <code>StdMissingAttributeDetail</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
+     * {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
      * missing Attribute.
      *
      * @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
@@ -111,7 +111,7 @@ public class StdMissingAttributeDetail extends Wrapper<MissingAttributeDetail> i
     }
 
     /**
-     * Creates a new <code>StdMissingAttributeDetail</code> that is a copy of the given {@link com.att.research.xacml.api.MissingAttributeDetail</code>.
+     * Creates a new <code>StdMissingAttributeDetail</code> that is a copy of the given {@link org.apache.openaz.xacml.api.MissingAttributeDetail</code>.
      *
      * @param missingAttributeDetail the <code>MissingAttributeDetail</code> to copy
      * @return a new <code>StdMissingAttributeDetail</code> that is a copy of the given <code>MissingAttributeDetail</code>.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java
index ad9afd6..7ec2e19 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java
@@ -42,7 +42,7 @@ import org.apache.openaz.xacml.util.ListUtil;
 import org.apache.openaz.xacml.util.ObjUtil;
 
 /**
- * Mutable implementation of the {@link com.att.research.xacml.api.Advice} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.Advice} interface.
  */
 public class StdMutableAdvice implements Advice {
     private static final List<AttributeAssignment> EMPTY_ATTRIBUTE_ASSIGNMENTS = Collections
@@ -59,9 +59,9 @@ public class StdMutableAdvice implements Advice {
     }
 
     /**
-     * Creates a new <code>StdMutableAdvice</code> with the given {@link com.att.research.xacml.Identifier} as
+     * Creates a new <code>StdMutableAdvice</code> with the given {@link org.apache.openaz.xacml.Identifier} as
      * its unique identifier, and the given <code>Collection</code> of
-     * {@link com.att.research.xacml.AttributeAssignment}s. A copy of the <code>AttributeAssignment</code>s is
+     * {@link org.apache.openaz.xacml.AttributeAssignment}s. A copy of the <code>AttributeAssignment</code>s is
      * made.
      *
      * @param idIn the <code>Identifier</code> that uniquely identifies this <code>StdMutableAdvice</code>.
@@ -79,7 +79,7 @@ public class StdMutableAdvice implements Advice {
     }
 
     /**
-     * Creates a new <code>StdMutableAdvice</code> with the given {@link com.att.research.xacml.Identifier} as
+     * Creates a new <code>StdMutableAdvice</code> with the given {@link org.apache.openaz.xacml.Identifier} as
      * its unique identifier.
      *
      * @param idIn the <code>Identifier</code> that uniquely identifies this <code>StdMutableAdvice</code>.
@@ -94,7 +94,7 @@ public class StdMutableAdvice implements Advice {
 <<<<<<< HEAD:openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java
      * Creates a copy of the given {@link org.apache.openaz.xacml.api.Advice} as a new <code>StdMutableAdvice</code>.
 =======
-     * Creates a copy of the given {@link com.att.research.xacml.api.Advice} as a new
+     * Creates a copy of the given {@link org.apache.openaz.xacml.api.Advice} as a new
      * <code>StdMutableAdvice</code>.
 >>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/std/StdMutableAdvice.java
      *
@@ -114,7 +114,7 @@ public class StdMutableAdvice implements Advice {
 <<<<<<< HEAD:openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java
      * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML AdviceId of the Advice represented by this <code>StdMutableAdvice</code>.
 =======
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML AdviceId of the Advice
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML AdviceId of the Advice
      * represented by this <code>StdMutableAdvice</code>.
 >>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/std/StdMutableAdvice.java
      *
@@ -146,7 +146,7 @@ public class StdMutableAdvice implements Advice {
 
     /**
      * Adds a copy of the given <code>Collection</code> of
-     * {@link com.att.research.xacml.api.AttributeAssignment}s to this <code>StdMutableAdvice</code>>
+     * {@link org.apache.openaz.xacml.api.AttributeAssignment}s to this <code>StdMutableAdvice</code>>
      *
      * @param listAttributeAssignments the <code>Collection</code> of <code>AttributeAssignment</code>s to add
      *            to this <code>StdMutableAdvice</code>.
@@ -161,7 +161,7 @@ public class StdMutableAdvice implements Advice {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.AttributeAssignment}s in this <code>StdMutableAdvice</code>
+     * Sets the {@link org.apache.openaz.xacml.api.AttributeAssignment}s in this <code>StdMutableAdvice</code>
      * to a copy of the given <code>Collection</code>.
      *
      * @param listAttributeAssignments the <code>Collection</code> of <code>AttributeAssignment</code>s to set

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttribute.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttribute.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttribute.java
index d9ddb71..ef76034 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttribute.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttribute.java
@@ -45,7 +45,7 @@ import org.apache.openaz.xacml.util.ListUtil;
 import org.apache.openaz.xacml.util.ObjUtil;
 
 /**
- * Mutable implementation of the {@link com.att.research.xacml.Attribute} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.Attribute} interface.
  */
 public class StdMutableAttribute implements Attribute {
     private static final List<AttributeValue<?>> EMPTY_ATTRIBUTE_VALUE_LIST = Collections
@@ -59,16 +59,16 @@ public class StdMutableAttribute implements Attribute {
 
     /**
      * Creates a new <code>StdMutableAttribute</code> with an empty list of
-     * {@link com.att.research.xacom.api.AttributeValue}s.
+     * {@link org.apache.openaz.xacom.api.AttributeValue}s.
      */
     public StdMutableAttribute() {
         this.values = EMPTY_ATTRIBUTE_VALUE_LIST;
     }
 
     /**
-     * Creates a new <code>StdMutableAttribute</code> with the given {@link com.att.research.xacml.Identifier}
+     * Creates a new <code>StdMutableAttribute</code> with the given {@link org.apache.openaz.xacml.Identifier}
      * s for the XACML 3.0 Category and AttributeId properties, and the given <code>Collection</code> of
-     * {@link com.att.research.xacml.AttributeValue}s. The <code>String</code> issuer may be null.
+     * {@link org.apache.openaz.xacml.AttributeValue}s. The <code>String</code> issuer may be null.
      *
      * @param categoryIdIn the <code>Identifier</code> for the XACML 3.0 Category of the new
      *            <code>StdMutableAttribute</code>
@@ -97,9 +97,9 @@ public class StdMutableAttribute implements Attribute {
     }
 
     /**
-     * Creates a new <code>StdMutableAttribute</code> with the given {@link com.att.research.xacml.Identifier}
+     * Creates a new <code>StdMutableAttribute</code> with the given {@link org.apache.openaz.xacml.Identifier}
      * s for the XACML 3.0 Category and AttributeId properties, and the given
-     * {@link com.att.research.xacml.AttributeValue} as its only value. The <code>String</code> issuer may be
+     * {@link org.apache.openaz.xacml.AttributeValue} as its only value. The <code>String</code> issuer may be
      * null.
      *
      * @param categoryIdIn the <code>Identifier</code> for the XACML 3.0 Category of the new
@@ -124,9 +124,9 @@ public class StdMutableAttribute implements Attribute {
     }
 
     /**
-     * Creates a new <code>StdMutableAttribute</code> with the given {@link com.att.research.xacml.Identifier}
+     * Creates a new <code>StdMutableAttribute</code> with the given {@link org.apache.openaz.xacml.Identifier}
      * s for the XACML 3.0 Category and AttributeId properties and the given
-     * {@link com.att.research.xacml.AttributeValue} as its only value. The issuer is null and the
+     * {@link org.apache.openaz.xacml.AttributeValue} as its only value. The issuer is null and the
      * <code>StdMutableAttribute</code> will not be included in XACML 3.0 responses.
      *
      * @param categoryIdIn the <code>Identifier</code> for the XACML 3.0 Category of the new
@@ -141,7 +141,7 @@ public class StdMutableAttribute implements Attribute {
 
     /**
      * Creates a new <code>StdMutableAttribute</code> that is a copy of the given
-     * {@link com.att.research.xacml.api.Attribute}.
+     * {@link org.apache.openaz.xacml.api.Attribute}.
      *
      * @param attribute the <code>Attribute</code> to copy
      * @return a new <code>StdMutableAttribute</code> that is a copy of the given <code>Attribute</code>.
@@ -158,7 +158,7 @@ public class StdMutableAttribute implements Attribute {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML AttributeId of the
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML AttributeId of the
      * Attribute represented by this <code>StdMutableAttribute</code>>
      *
      * @param identifier the <code>Identifier</code> representing the XACML AttributeId of the Attribute
@@ -174,7 +174,7 @@ public class StdMutableAttribute implements Attribute {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML Category of the Attribute
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML Category of the Attribute
      * represented by this <code>StdMutableAttribute</code>.
      *
      * @param identifier the <code>Identifier</code> representing the XACML Category of the Attribute
@@ -203,7 +203,7 @@ public class StdMutableAttribute implements Attribute {
     }
 
     /**
-     * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeValue}s
+     * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeValue}s
      * to this <code>StdMutableAttribute</code>.
      *
      * @param listAttributeValues the <code>Collection</code> of <code>AttributeValue</code>s to add to this
@@ -219,7 +219,7 @@ public class StdMutableAttribute implements Attribute {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.AttributeValue}s in this <code>StdMutableAttribute</code> to
+     * Sets the {@link org.apache.openaz.xacml.api.AttributeValue}s in this <code>StdMutableAttribute</code> to
      * a copy of the given <code>Collection</code>.
      *
      * @param listAttributeValues the <code>Collection</code> of <code>AttributValue</code>s to set in this

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeAssignment.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeAssignment.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeAssignment.java
index 3343f03..cc2a2d5 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeAssignment.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeAssignment.java
@@ -36,7 +36,7 @@ import org.apache.openaz.xacml.api.Identifier;
 import org.apache.openaz.xacml.util.ObjUtil;
 
 /**
- * Mutable implementation of the {@link com.att.research.xacml.api.AttributeAssignment} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.AttributeAssignment} interface.
  */
 public class StdMutableAttributeAssignment implements AttributeAssignment {
     private Identifier attributeId;
@@ -53,8 +53,8 @@ public class StdMutableAttributeAssignment implements AttributeAssignment {
 
     /**
      * Creates a new <code>StdMutableAttributeAssignment</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s for the XACML Category and AttributeId, the given
-     * <code>String</code> issuer, and the given {@link com.att.research.xacml.api.AttributeValue}.
+     * {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category and AttributeId, the given
+     * <code>String</code> issuer, and the given {@link org.apache.openaz.xacml.api.AttributeValue}.
      *
      * @param categoryIn the <code>Identifier</code> for the XACML Category of the new
      *            <code>StdMutableAttributeAssignment</code>
@@ -82,7 +82,7 @@ public class StdMutableAttributeAssignment implements AttributeAssignment {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.AttributeValue} representing the value to be assigned to the
+     * Sets the {@link org.apache.openaz.xacml.api.AttributeValue} representing the value to be assigned to the
      * XACML AttributeId associated with this <code>StdMutableAttributeAssignment</code>.
      *
      * @param attributeValueIn the <code>AttributeValue</code> representing the value to be assigned to the
@@ -98,7 +98,7 @@ public class StdMutableAttributeAssignment implements AttributeAssignment {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML AttributeId to be
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML AttributeId to be
      * assigned in this <code>StdMutableAttributeAssignment</code>.
      *
      * @param identifier the <code>Identifier</code> representing the XACML AttributeId to be assigned in this
@@ -114,7 +114,7 @@ public class StdMutableAttributeAssignment implements AttributeAssignment {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML Category of the
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML Category of the
      * AttributeId to be assigned in this <code>StdMutableAttributeAssignment</code>.
      *
      * @param identifier the <code>Identifier</code> representing the XACML Category of the AttributeId to be

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeCategory.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeCategory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeCategory.java
index 3c87ccc..5831030 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeCategory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeCategory.java
@@ -60,8 +60,8 @@ public class StdMutableAttributeCategory implements AttributeCategory {
     private Map<Identifier, List<Attribute>> attributesById = new HashMap<Identifier, List<Attribute>>();
 
     /**
-     * Builds the <code>Map</code> from {@link com.att.research.xacml.api.Identifier}s for XACML AttributeIds
-     * to {@link com.att.research.xacml.api.Attribute}s.
+     * Builds the <code>Map</code> from {@link org.apache.openaz.xacml.api.Identifier}s for XACML AttributeIds
+     * to {@link org.apache.openaz.xacml.api.Attribute}s.
      */
     private void buildMap() {
         for (Attribute attribute : this.attributes) {
@@ -83,8 +83,8 @@ public class StdMutableAttributeCategory implements AttributeCategory {
 
     /**
      * Creates a new <code>StdMutableAttributeCategory</code> with the given
-     * {@link com.att.research.xacml.api.Identifier} representing its XACML Category, and the given
-     * <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s as its XACML Attributes. The
+     * {@link org.apache.openaz.xacml.api.Identifier} representing its XACML Category, and the given
+     * <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s as its XACML Attributes. The
      * <code>Collection</code> is copied; changes made to the <code>Collection</code> after creating the new
      * <code>StdMutableAttributeCategory</code> are not reflected in the
      * <code>StdMutableAttributeCategory</code>.
@@ -104,7 +104,7 @@ public class StdMutableAttributeCategory implements AttributeCategory {
 
     /**
      * Creates a new <code>StdMutableAttributeCategory</code> that is a copy of the given
-     * {@link com.att.research.xacml.api.AttributeCategory}.
+     * {@link org.apache.openaz.xacml.api.AttributeCategory}.
      *
      * @param attributeCategory the <code>AttributeCategory</code> to copy
      */
@@ -120,7 +120,7 @@ public class StdMutableAttributeCategory implements AttributeCategory {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML Category of this
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML Category of this
      * <code>StdMutableAttributeCategory</code>.
      *
      * @param identifierCategory the <code>Identifier</code> representing the XACML Category of this

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableMissingAttributeDetail.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableMissingAttributeDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableMissingAttributeDetail.java
index a104af7..0783b09 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableMissingAttributeDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableMissingAttributeDetail.java
@@ -64,9 +64,9 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
 
     /**
      * Creates a new <code>StdMutableMissingAttributeDetail</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
+     * {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
      * missing Attribute, and the given <code>String</code> Issuer. If not null, the <code>Collection</code>
-     * of {@link com.att.research.xacml.api.AttributeValue}s is copied into the new
+     * of {@link org.apache.openaz.xacml.api.AttributeValue}s is copied into the new
      * <code>StdMutableMissingAttributeDetail</code>.
      *
      * @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
@@ -95,7 +95,7 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
 
     /**
      * Creates a new <code>StdMutableMissingAttributeDetail</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
+     * {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
      * missing Attribute, and the given <code>String</code> Issuer.
      *
      * @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
@@ -112,7 +112,7 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
 
     /**
      * Creates a new <code>StdMutableMissingAttributeDetail</code> with the given
-     * {@link com.att.research.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
+     * {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category, AttributeId, and DataType of the
      * missing Attribute.
      *
      * @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
@@ -128,7 +128,7 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
 
     /**
      * Creates a new <code>StdMutableMissingAttributeDetail</code> that is a copy of the given
-     * {@link com.att.research.xacml.api.MissingAttributeDetail}.
+     * {@link org.apache.openaz.xacml.api.MissingAttributeDetail}.
      *
      * @param missingAttributeDetail the <code>MissingAttributeDetail</code> to copy
      * @return a new <code>StdMutableMissingAttributeDetail</code> that is a copy of the given
@@ -148,7 +148,7 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML Category of the
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML Category of the
      * MissingAttributeDetail.
      *
      * @param identifier the <code>Identifier</code> representing the XACML Category of the
@@ -164,7 +164,7 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML AttributeId of the
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML AttributeId of the
      * MissingAttributeDetail.
      *
      * @param identifier the <code>Identifier</code> representing the XACML AttributeId of the
@@ -180,7 +180,7 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML DataTypeId of the
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML DataTypeId of the
      * MissingAttributeDetail.
      *
      * @param identifier the <code>Identifier</code> representing the XACML AttributeId of the
@@ -206,7 +206,7 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
     }
 
     /**
-     * Adds an {@link com.att.research.xacml.api.AttributeValue} to this
+     * Adds an {@link org.apache.openaz.xacml.api.AttributeValue} to this
      * <code>StdMutableMissingAttributeDetail</code>.
      *
      * @param attributeValue the <code>AttributeValue</code> to add to this
@@ -220,7 +220,7 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
     }
 
     /**
-     * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeValue}s
+     * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeValue}s
      * to this <code>StdMutableMissingAttributeDetail</code>.
      *
      * @param attributeValuesIn the <code>Collection</code> of <code>AttributeValue</code>s to add to this
@@ -236,7 +236,7 @@ public class StdMutableMissingAttributeDetail implements MissingAttributeDetail
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.AtributeValue}s in this
+     * Sets the {@link org.apache.openaz.xacml.api.AtributeValue}s in this
      * <code>StdMutableMissingAttributeDetail</code> to a copy of the given <code>Collection</code>. If the
      * <code>Collection</code> is null or empty, the list of <code>AttributeValue</code>s in is set to the
      * empty list.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7cf99dd0/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableObligation.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableObligation.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableObligation.java
index 7c46b7b..147f92c 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableObligation.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableObligation.java
@@ -42,7 +42,7 @@ import org.apache.openaz.xacml.util.ListUtil;
 import org.apache.openaz.xacml.util.ObjUtil;
 
 /**
- * Mutable implementation of the {@link com.att.research.xacml.api.Obligation} interface for XACML Obligation
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.Obligation} interface for XACML Obligation
  * elements.
  */
 public class StdMutableObligation implements Obligation {
@@ -61,8 +61,8 @@ public class StdMutableObligation implements Obligation {
 
     /**
      * Creates a new <code>StdMutableObligation</code> with the given
-     * {@link com.att.research.xacml.api.Identifier} representing the XACML ObligationId and the given
-     * <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s representing the
+     * {@link org.apache.openaz.xacml.api.Identifier} representing the XACML ObligationId and the given
+     * <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeAssignment}s representing the
      * XACML AttributeAssignments for the Obligation.
      *
      * @param idIn the <code>Identifier</code> representing the XACML ObligationId
@@ -81,7 +81,7 @@ public class StdMutableObligation implements Obligation {
 
     /**
      * Creates a new <code>StdMutableObligation</code> with the given
-     * {@link com.att.research.xacml.api.Identifier} representing the XACML ObligationId.
+     * {@link org.apache.openaz.xacml.api.Identifier} representing the XACML ObligationId.
      *
      * @param idIn the <code>Identifier</code> representing the XACML ObligationId
      */
@@ -95,7 +95,7 @@ public class StdMutableObligation implements Obligation {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML ObligationId for the
+     * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML ObligationId for the
      * Obligation represented by this <code>StdMutableObligation</code>.
      *
      * @param identifier the <code>Identifier</code> representing the XACML ObligationId for the Obligation
@@ -111,7 +111,7 @@ public class StdMutableObligation implements Obligation {
     }
 
     /**
-     * Adds an {@link com.att.research.xacmo.api.AttributeAssignment} to this
+     * Adds an {@link org.apache.openaz.xacmo.api.AttributeAssignment} to this
      * <code>StdMutableObligation</code>.
      *
      * @param attributeAssignment the <code>AttributeAssignment</code> to add to this
@@ -126,7 +126,7 @@ public class StdMutableObligation implements Obligation {
 
     /**
      * Adds a copy of the given <code>Collection</code> of
-     * {@link com.att.research.xacml.api.AttributeAssignment}s to this <code>StdMutableObligation</code>.
+     * {@link org.apache.openaz.xacml.api.AttributeAssignment}s to this <code>StdMutableObligation</code>.
      *
      * @param attributeAssignmentsIn the <code>Collection</code> of <code>AttributeAssignment</code>s to add
      *            to this <code>StdMutableObligation</code>.
@@ -137,7 +137,7 @@ public class StdMutableObligation implements Obligation {
     }
 
     /**
-     * Sets the {@link com.att.research.xacml.api.AttributeAssignment}s in this
+     * Sets the {@link org.apache.openaz.xacml.api.AttributeAssignment}s in this
      * <code>StdMutableObligation</code> to a copy of the given <code>Collection</code>.
      *
      * @param attributeAssignmentsIn the <code>Collection</code> of <code>AttributeAssignment</code>s to set