Re-factoring the package names
diff --git a/openaz-pep/pom.xml b/openaz-pep/pom.xml
index 32ac9de..d9df276 100644
--- a/openaz-pep/pom.xml
+++ b/openaz-pep/pom.xml
@@ -18,18 +18,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>openaz</artifactId>
-        <groupId>org.openliberty.openaz</groupId>
+        <groupId>org.apache.openaz</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openaz-pep</artifactId>
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.openaz</groupId>
             <artifactId>openaz-xacml</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.openaz</groupId>
             <artifactId>openaz-xacml-pdp</artifactId>
         </dependency>
         <dependency>
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Action.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Action.java
index 647070d..7d365dc 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Action.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Action.java
@@ -18,9 +18,9 @@
  *
  */
 
-package org.openliberty.openaz.pepapi;
+package org.apache.openaz.pepapi;
 
-import com.att.research.xacml.api.XACML3;
+import org.apache.openaz.xacml.api.XACML3;
 
 ;
 
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ActionResourcePair.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ActionResourcePair.java
index d59879b..869ce0d 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ActionResourcePair.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ActionResourcePair.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 

 /**

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Advice.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Advice.java
index 57f8f18..4ee6247 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Advice.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Advice.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.openliberty.openaz.pepapi;
+package org.apache.openaz.pepapi;
 
 import java.util.Map;
 
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Attribute.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Attribute.java
index 94c01f3..3b28a81 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Attribute.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Attribute.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 import java.lang.annotation.Retention;

 import java.lang.annotation.RetentionPolicy;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/CategoryContainer.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/CategoryContainer.java
index b59c0c8..a83e2c2 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/CategoryContainer.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/CategoryContainer.java
@@ -18,9 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

-

-import com.att.research.xacml.api.Identifier;

+package org.apache.openaz.pepapi;

 

 import java.net.URI;

 import java.util.Collections;

@@ -29,6 +27,8 @@
 import java.util.Map;

 import java.util.Map.Entry;

 

+import org.apache.openaz.xacml.api.Identifier;

+

 /**

  * Abstraction for an attribute container of a specific XACML category.

  *

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Environment.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Environment.java
index 5f85917..de472ab 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Environment.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Environment.java
@@ -18,9 +18,9 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

-import com.att.research.xacml.api.XACML3;

+import org.apache.openaz.xacml.api.XACML3;

 

 /**

  *

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/InvalidAnnotationException.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/InvalidAnnotationException.java
index a6be878..5de0430 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/InvalidAnnotationException.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/InvalidAnnotationException.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 /**

  * RuntimeException thrown when a registered handler class does not contain one of the

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/MapperRegistry.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/MapperRegistry.java
index d254fba..8b0a361 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/MapperRegistry.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/MapperRegistry.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 

 /**

@@ -47,7 +47,7 @@
      *

      * @param clazz

      * @return an ObjectMapper instance

-     * @throws org.openliberty.openaz.pepapi.PepException if no ObjectMapper could be found for class clazz;

+     * @throws org.apache.openaz.pepapi.PepException if no ObjectMapper could be found for class clazz;

      */

     public ObjectMapper getMapper(Class<?> clazz);

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/MatchAllObligationAttributes.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/MatchAllObligationAttributes.java
index 2f55bf6..6ac6a4c 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/MatchAllObligationAttributes.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/MatchAllObligationAttributes.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 import java.lang.annotation.ElementType;

 import java.lang.annotation.Retention;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/MatchAnyObligation.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/MatchAnyObligation.java
index 12ace7a..c257d22 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/MatchAnyObligation.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/MatchAnyObligation.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 import java.lang.annotation.ElementType;

 import java.lang.annotation.Retention;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Matchable.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Matchable.java
index 224776a..9e35831 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Matchable.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Matchable.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.openliberty.openaz.pepapi;
+package org.apache.openaz.pepapi;
 
 /**
  * Interface that abstracts an object that can be matched. Concrete implementations provide a match() function.
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObjectMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObjectMapper.java
index f3c4be5..49ff480 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObjectMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObjectMapper.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Obligation.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Obligation.java
index a27bc59..fc82cbb 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Obligation.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Obligation.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 import java.util.Map;

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationHandler.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationHandler.java
index dd05c86..ff8d442 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationHandler.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationHandler.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.openliberty.openaz.pepapi;
+package org.apache.openaz.pepapi;
 
 
 /**
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationHandlerRegistry.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationHandlerRegistry.java
index 7ecf090..93d134f 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationHandlerRegistry.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationHandlerRegistry.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 

 import java.util.Map;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationRouter.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationRouter.java
index 4fea674..8be2ebc 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationRouter.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationRouter.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.openliberty.openaz.pepapi;
+package org.apache.openaz.pepapi;
 
 import java.util.Map;
 
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationStore.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationStore.java
index 3f2a275..76a71f8 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationStore.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationStore.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 import java.util.Set;

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationStoreAware.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationStoreAware.java
index 5e9e40c..2c49f71 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationStoreAware.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/ObligationStoreAware.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.openliberty.openaz.pepapi;
+package org.apache.openaz.pepapi;
 
 
 /**
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepAgent.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepAgent.java
index d4afc8f..0dfe649 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepAgent.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepAgent.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 import java.util.List;

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepAgentFactory.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepAgentFactory.java
index fcd39d5..f2954d1 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepAgentFactory.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepAgentFactory.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.openliberty.openaz.pepapi;
+package org.apache.openaz.pepapi;
 
 /**
  *
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepConfig.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepConfig.java
index c96b116..aa248a2 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepConfig.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepConfig.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.openliberty.openaz.pepapi;
+package org.apache.openaz.pepapi;
 
 import java.util.List;
 
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepException.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepException.java
index 6894f3d..582823d 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepException.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepException.java
@@ -16,7 +16,7 @@
  * Contributor:

  * 	  Rich Levinson (Oracle)

  */

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 /**

  * The PepException is used to provide additional

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequest.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequest.java
index 12025c6..ac4f571 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequest.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequest.java
@@ -17,10 +17,10 @@
  * Contributor:

  * 	  Rich Levinson (Oracle)

  */

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Request;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Request;

 

 /**

  *

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequestAttributes.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequestAttributes.java
index 9e1f0d7..f248333 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequestAttributes.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequestAttributes.java
@@ -18,16 +18,16 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

-

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.RequestAttributes;

+package org.apache.openaz.pepapi;

 

 import java.net.URI;

 import java.util.Date;

 

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.RequestAttributes;

+

 /**

- * Convenient wrapper around a RequestAttributes{@link com.att.research.xacml.api.RequestAttributes} instance,

+ * Convenient wrapper around a RequestAttributes{@link org.apache.openaz.xacml.api.RequestAttributes} instance,

  * representing a collection of request attributes that belong to a particular category.

  *

  */

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequestFactory.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequestFactory.java
index 24ea0da..b54363b 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequestFactory.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepRequestFactory.java
@@ -16,7 +16,7 @@
  * Contributor:

  * 	  Rich Levinson (Oracle)

  */

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 import java.util.List;

 

@@ -29,7 +29,7 @@
     /**

      *

      * @return

-     * @throws org.openliberty.openaz.pepapi.PepException, if no ObjectMappers found.

+     * @throws org.apache.openaz.pepapi.PepException, if no ObjectMappers found.

      * @throws IllegalArgumentException,, if any argument is null.

      */

     public PepRequest newPepRequest(Object[] objects);

@@ -39,7 +39,7 @@
      * @param associations

      * @param objects

      * @return

-     * @throws org.openliberty.openaz.pepapi.PepException, if ObjectMappers are not found.

+     * @throws org.apache.openaz.pepapi.PepException, if ObjectMappers are not found.

      * @throws IllegalArgumentException,, if the arguments are null.

      */

     public PepRequest newBulkPepRequest(List<?> associations, Object[] objects);

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponse.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponse.java
index 76c1bdc..9fb28cc 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponse.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponse.java
@@ -18,15 +18,15 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

-

-import com.att.research.xacml.api.Attribute;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Result;

+package org.apache.openaz.pepapi;

 

 import java.util.Collection;

 import java.util.Map;

 

+import org.apache.openaz.xacml.api.Attribute;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Result;

+

 /**

  */

 public interface PepResponse {

@@ -42,20 +42,20 @@
     public boolean allowed() throws PepException;

 

     /**

-     * Return the set of {@link org.openliberty.openaz.pepapi.Obligation}s associated with the

+     * Return the set of {@link org.apache.openaz.pepapi.Obligation}s associated with the

      * current result indexed by ObligationId.

      * @return a Map of ObligationId, Obligation pairs

      * @throws PepException

-     * @see org.openliberty.openaz.pepapi.Obligation#getId()

+     * @see org.apache.openaz.pepapi.Obligation#getId()

      */

     public Map<String, Obligation> getObligations() throws PepException;

 

     /**

-     * Return the set of {@link org.openliberty.openaz.pepapi.Advice}s associated with the

+     * Return the set of {@link org.apache.openaz.pepapi.Advice}s associated with the

      * current result indexed by adviceId.

      * @return a Map of adviceId, Advice pairs

      * @throws PepException

-     * @see org.openliberty.openaz.pepapi.Advice#getId()

+     * @see org.apache.openaz.pepapi.Advice#getId()

      */

     public Map<String, Advice> getAdvices() throws PepException;

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseBehavior.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseBehavior.java
index b16d6f8..8a55a60 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseBehavior.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseBehavior.java
@@ -18,12 +18,12 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 /**

  * This enum provides the options that can be set using the

- * {@link org.openliberty.openaz.pepapi.PepResponseFactory} to determine the behavior when

- * {@link org.openliberty.openaz.pepapi.PepResponse#allowed()} is called AND the

+ * {@link org.apache.openaz.pepapi.PepResponseFactory} to determine the behavior when

+ * {@link org.apache.openaz.pepapi.PepResponse#allowed()} is called AND the

  * decision is either Indeterminate or NotApplicable.

  *

  *

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseFactory.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseFactory.java
index bc91c10..063ab08 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseFactory.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseFactory.java
@@ -18,29 +18,29 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

-import com.att.research.xacml.api.Result;

+import org.apache.openaz.xacml.api.Result;

 

 /**

  * Factory for creating and configuring <code>PepResponse</code>.

  * <br>

- * This class creates {@link org.openliberty.openaz.pepapi.PepResponse} objects and configures

+ * This class creates {@link org.apache.openaz.pepapi.PepResponse} objects and configures

  * the behavior of how the <code>PepResponse</code> interprets the

  * results from the AzService or any other PDP that is supported

  * by an implementation of PepApi (org.openliberty.openaz.azapi.pep.*).

  * <br>

  * The {@link PepResponseBehavior} that is invoked when

- * {@link org.openliberty.openaz.pepapi.PepResponse#allowed()} is called and the associated status code

+ * {@link org.apache.openaz.pepapi.PepResponse#allowed()} is called and the associated status code

  * has been returned by the PDP and is being handled by the PepResponse

  * provider impl, can be configured to be one of:

  * <ul>

  * <li>

- * {@link org.openliberty.openaz.pepapi.PepResponse#allowed()} returns true (PERMIT: {@link PepResponseBehavior#RETURN_YES}),

+ * {@link org.apache.openaz.pepapi.PepResponse#allowed()} returns true (PERMIT: {@link PepResponseBehavior#RETURN_YES}),

  * <li>

- * {@link org.openliberty.openaz.pepapi.PepResponse#allowed()} returns false (DENY: {@link PepResponseBehavior#RETURN_NO}),

+ * {@link org.apache.openaz.pepapi.PepResponse#allowed()} returns false (DENY: {@link PepResponseBehavior#RETURN_NO}),

  * <li>

- * or{@link org.openliberty.openaz.pepapi.PepResponse#allowed()} throws an exception (DENY: {@link PepResponseBehavior#THROW_EXCEPTION}).

+ * or{@link org.apache.openaz.pepapi.PepResponse#allowed()} throws an exception (DENY: {@link PepResponseBehavior#THROW_EXCEPTION}).

  * </ul>

  * <p>

  * In general, a Permit returns true, and a Deny returns false,

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseType.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseType.java
index 5c27d38..f48d723 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseType.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepResponseType.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 /**

  *

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PostDecisionHandler.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PostDecisionHandler.java
index 1961122..12068cb 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PostDecisionHandler.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PostDecisionHandler.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 /**

  * An interface that may be implemented to process the

@@ -31,11 +31,11 @@
 

     /**

      * This method is used to apply post-decision custom

-     * processing to the {@link org.openliberty.openaz.pepapi.PepResponse} after it has

+     * processing to the {@link org.apache.openaz.pepapi.PepResponse} after it has

      * been returned.

      *

      * @param request

-     * @throws org.openliberty.openaz.pepapi.PepException

+     * @throws org.apache.openaz.pepapi.PepException

      */

     public void postDecide(PepRequest request, PepResponse response)

     throws PepException;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PreDecisionHandler.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PreDecisionHandler.java
index c5a4fe6..bb9a93f 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PreDecisionHandler.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PreDecisionHandler.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 /**

  * An interface that can be used for preliminary processing

@@ -31,11 +31,11 @@
 

     /**

      * This method is used to apply preliminary custom

-     * processing to the {@link org.openliberty.openaz.pepapi.PepRequest} prior to its

+     * processing to the {@link org.apache.openaz.pepapi.PepRequest} prior to its

      * being submitted.

      *

      * @param request

-     * @throws org.openliberty.openaz.pepapi.PepException

+     * @throws org.apache.openaz.pepapi.PepException

      */

     public void preDecide(PepRequest request)

     throws PepException;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Resource.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Resource.java
index b67390a..c786e51 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Resource.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Resource.java
@@ -18,13 +18,13 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

-

-import com.att.research.xacml.api.XACML3;

+package org.apache.openaz.pepapi;

 

 import java.net.URI;

 import java.util.Date;

 

+import org.apache.openaz.xacml.api.XACML3;

+

 /**

  * Container class that maps attributes to predefined XACML Resource category.

  *

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Subject.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Subject.java
index ce0112e..a711888 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Subject.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Subject.java
@@ -18,9 +18,9 @@
  *
  */
 
-package org.openliberty.openaz.pepapi;
+package org.apache.openaz.pepapi;
 
-import com.att.research.xacml.api.XACML3;
+import org.apache.openaz.xacml.api.XACML3;
 
 /**
  * Container class that maps attributes to predefined XACML AccessSubject category.
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/UnhandleableObligationException.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/UnhandleableObligationException.java
index e626004..c585c6b 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/UnhandleableObligationException.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/UnhandleableObligationException.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi;

+package org.apache.openaz.pepapi;

 

 /**

  * Runtime Exception thrown when the framework cannot find a registered handler to deal with the obligation.

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionMapper.java
index 483d6ca..7bac35c 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionMapper.java
@@ -18,10 +18,10 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std;
+package org.apache.openaz.pepapi.std;
 
 
-import org.openliberty.openaz.pepapi.Action;
+import org.apache.openaz.pepapi.Action;
 
 /**
  * Created by ajith on 12/11/14.
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionResourcePairMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionResourcePairMapper.java
index 7c678ed..1836bb9 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionResourcePairMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionResourcePairMapper.java
@@ -18,10 +18,10 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

 

 public final class ActionResourcePairMapper implements ObjectMapper {

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ArrayMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ArrayMapper.java
index cfb5b00..26341dc 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ArrayMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ArrayMapper.java
@@ -18,11 +18,11 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

 

 

 public final class ArrayMapper implements ObjectMapper {

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/CategoryContainerMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/CategoryContainerMapper.java
index ed657e8..09ff308 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/CategoryContainerMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/CategoryContainerMapper.java
@@ -18,12 +18,12 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

 

 import java.net.URI;

 import java.util.Date;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/CollectionMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/CollectionMapper.java
index 9219436..ea80e6a 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/CollectionMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/CollectionMapper.java
@@ -18,11 +18,11 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

 

 import java.util.Collection;

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/MatchAnyCriterion.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/MatchAnyCriterion.java
index 89f10a9..2ad8bad 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/MatchAnyCriterion.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/MatchAnyCriterion.java
@@ -18,10 +18,10 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std;
+package org.apache.openaz.pepapi.std;
 
 
-import org.openliberty.openaz.pepapi.Obligation;
+import org.apache.openaz.pepapi.Obligation;
 
 public final class MatchAnyCriterion implements ObligationCriterion {
 
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/MultiRequest.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/MultiRequest.java
index a236b5f..95adca5 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/MultiRequest.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/MultiRequest.java
@@ -18,15 +18,15 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std;
+package org.apache.openaz.pepapi.std;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.RequestReference;
-import com.att.research.xacml.std.StdMutableRequest;
-import com.att.research.xacml.std.StdMutableRequestReference;
-import com.att.research.xacml.std.StdRequestAttributesReference;
-import org.openliberty.openaz.pepapi.*;
+import org.apache.openaz.pepapi.*;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.RequestReference;
+import org.apache.openaz.xacml.std.StdMutableRequest;
+import org.apache.openaz.xacml.std.StdMutableRequestReference;
+import org.apache.openaz.xacml.std.StdRequestAttributesReference;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationAttributeCriterion.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationAttributeCriterion.java
index 407af2e..9ef2b5a 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationAttributeCriterion.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationAttributeCriterion.java
@@ -18,9 +18,9 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import org.openliberty.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.Obligation;

 

 import java.util.*;

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriteria.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriteria.java
index 3f04967..83e761c 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriteria.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriteria.java
@@ -18,10 +18,10 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.Matchable;

+import org.apache.openaz.pepapi.Matchable;

+import org.apache.openaz.pepapi.Obligation;

 

 import java.util.Collection;

 import java.util.HashSet;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriteriaBuilder.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriteriaBuilder.java
index ebe6a6f..88a2a94 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriteriaBuilder.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriteriaBuilder.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriterion.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriterion.java
index 2f3de72..0975eeb 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriterion.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationCriterion.java
@@ -18,10 +18,10 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std;
+package org.apache.openaz.pepapi.std;
 
 
-import org.openliberty.openaz.pepapi.Obligation;
+import org.apache.openaz.pepapi.Obligation;
 
 public interface ObligationCriterion {
 
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationIdCriterion.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationIdCriterion.java
index 738602e..e10b492 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationIdCriterion.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ObligationIdCriterion.java
@@ -18,9 +18,9 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import org.openliberty.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.Obligation;

 

 import java.util.Arrays;

 import java.util.HashSet;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/PepUtils.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/PepUtils.java
index b718695..d845540 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/PepUtils.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/PepUtils.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std;
+package org.apache.openaz.pepapi.std;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ResourceMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ResourceMapper.java
index b879953..56485c4 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ResourceMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ResourceMapper.java
@@ -18,10 +18,10 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std;
+package org.apache.openaz.pepapi.std;
 
 
-import org.openliberty.openaz.pepapi.Resource;
+import org.apache.openaz.pepapi.Resource;
 
 /**
  * Created by ajith on 12/11/14.
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdAdvice.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdAdvice.java
index 463e12f..7b895b3 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdAdvice.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdAdvice.java
@@ -18,10 +18,10 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std;
+package org.apache.openaz.pepapi.std;
 
-import com.att.research.xacml.api.AttributeAssignment;
-import org.openliberty.openaz.pepapi.Advice;
+import org.apache.openaz.pepapi.Advice;
+import org.apache.openaz.xacml.api.AttributeAssignment;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,9 +31,9 @@
 
 final class StdAdvice implements Advice {
 
-    private com.att.research.xacml.api.Advice wrappedAdvice;
+    private org.apache.openaz.xacml.api.Advice wrappedAdvice;
 
-    StdAdvice(com.att.research.xacml.api.Advice advice) {
+    StdAdvice(org.apache.openaz.xacml.api.Advice advice) {
         this.wrappedAdvice = advice;
     }
 
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdMapperRegistry.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdMapperRegistry.java
index 5c8a6e0..a3e7ebc 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdMapperRegistry.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdMapperRegistry.java
@@ -18,11 +18,11 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

 

 import java.util.HashMap;

 import java.util.List;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligation.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligation.java
index 964174c..e5d823e 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligation.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligation.java
@@ -18,10 +18,10 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import com.att.research.xacml.api.AttributeAssignment;

-import org.openliberty.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.xacml.api.AttributeAssignment;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -31,9 +31,9 @@
 

 final class StdObligation implements Obligation {

 

-    private com.att.research.xacml.api.Obligation wrappedObligation;

+    private org.apache.openaz.xacml.api.Obligation wrappedObligation;

 

-    StdObligation(com.att.research.xacml.api.Obligation obligation) {

+    StdObligation(org.apache.openaz.xacml.api.Obligation obligation) {

         this.wrappedObligation = obligation;

     }

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligationHandlerRegistry.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligationHandlerRegistry.java
index b41a73d..17ceabb 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligationHandlerRegistry.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligationHandlerRegistry.java
@@ -18,17 +18,17 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationHandler;

-import org.openliberty.openaz.pepapi.ObligationHandlerRegistry;

-import org.openliberty.openaz.pepapi.Attribute;

-import org.openliberty.openaz.pepapi.MatchAllObligationAttributes;

-import org.openliberty.openaz.pepapi.MatchAnyObligation;

-import org.openliberty.openaz.pepapi.Matchable;

+import org.apache.openaz.pepapi.Attribute;

+import org.apache.openaz.pepapi.MatchAllObligationAttributes;

+import org.apache.openaz.pepapi.MatchAnyObligation;

+import org.apache.openaz.pepapi.Matchable;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationHandler;

+import org.apache.openaz.pepapi.ObligationHandlerRegistry;

 

 import java.lang.annotation.Annotation;

 import java.util.HashMap;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligationRouter.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligationRouter.java
index 5931269..bd2a161 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligationRouter.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdObligationRouter.java
@@ -18,15 +18,15 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationHandlerRegistry;

-import org.openliberty.openaz.pepapi.ObligationRouter;

-import org.openliberty.openaz.pepapi.UnhandleableObligationException;

-import org.openliberty.openaz.pepapi.Matchable;

+import org.apache.openaz.pepapi.Matchable;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationHandlerRegistry;

+import org.apache.openaz.pepapi.ObligationRouter;

+import org.apache.openaz.pepapi.UnhandleableObligationException;

 

 import java.util.HashMap;

 import java.util.HashSet;

@@ -37,7 +37,7 @@
 /**

  * Entity that routes obligations at runtime.

  *

- * @see org.openliberty.openaz.pepapi.Obligation

+ * @see org.apache.openaz.pepapi.Obligation

  */

 public final class StdObligationRouter implements ObligationRouter {

 

@@ -64,7 +64,7 @@
      * Handles runtime obligations and routes to appropriate policy enforcement points as required.

      *

      * @param obligationMap	a <code>Map</code> of <code>Obligation</code>s keyed by Obligation ID.

-     * @throws org.openliberty.openaz.pepapi.UnhandleableObligationException	if an Obligation cannot be handled/routed.

+     * @throws org.apache.openaz.pepapi.UnhandleableObligationException	if an Obligation cannot be handled/routed.

      */

     @Override

     public void routeObligations(Map<String, Obligation> obligationMap) {

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepAgent.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepAgent.java
index dad3f5e..31949d8 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepAgent.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepAgent.java
@@ -18,21 +18,21 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import com.att.research.xacml.api.Request;

-import com.att.research.xacml.api.Response;

-import com.att.research.xacml.api.Result;

-import com.att.research.xacml.api.pdp.PDPEngine;

-import com.att.research.xacml.api.pdp.PDPEngineFactory;

-import com.att.research.xacml.api.pdp.PDPException;

-import com.att.research.xacml.std.json.JSONRequest;

-import com.att.research.xacml.std.json.JSONResponse;

-import com.att.research.xacml.std.json.JSONStructureException;

-import com.att.research.xacml.util.FactoryException;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.xacml.api.Request;

+import org.apache.openaz.xacml.api.Response;

+import org.apache.openaz.xacml.api.Result;

+import org.apache.openaz.xacml.api.pdp.PDPEngine;

+import org.apache.openaz.xacml.api.pdp.PDPEngineFactory;

+import org.apache.openaz.xacml.api.pdp.PDPException;

+import org.apache.openaz.xacml.std.json.JSONRequest;

+import org.apache.openaz.xacml.std.json.JSONResponse;

+import org.apache.openaz.xacml.std.json.JSONStructureException;

+import org.apache.openaz.xacml.util.FactoryException;

 

 import java.io.ByteArrayOutputStream;

 import java.io.IOException;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepAgentFactory.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepAgentFactory.java
index 6b18805..580ff85 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepAgentFactory.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepAgentFactory.java
@@ -18,11 +18,11 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import com.att.research.xacml.api.pdp.PDPEngineFactory;

-import com.att.research.xacml.util.FactoryException;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.xacml.api.pdp.PDPEngineFactory;

+import org.apache.openaz.xacml.util.FactoryException;

 

 import java.util.List;

 import java.util.Properties;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepConfig.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepConfig.java
index 9b31c8f..5495350 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepConfig.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepConfig.java
@@ -18,15 +18,16 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import com.att.research.xacml.api.XACML3;

 import com.google.common.base.Splitter;

+

 import org.apache.commons.lang3.StringUtils;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.PepConfig;

-import org.openliberty.openaz.pepapi.PepResponseBehavior;

+import org.apache.openaz.pepapi.PepConfig;

+import org.apache.openaz.pepapi.PepResponseBehavior;

+import org.apache.openaz.xacml.api.XACML3;

 

 import java.util.ArrayList;

 import java.util.Collections;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequest.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequest.java
index 07cfaec..6d9c0ac 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequest.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequest.java
@@ -18,14 +18,14 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std;
+package org.apache.openaz.pepapi.std;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.std.StdMutableRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openliberty.openaz.pepapi.*;
+import org.apache.openaz.pepapi.*;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.std.StdMutableRequest;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequestAttributes.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequestAttributes.java
index 6fccdf9..0272a19 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequestAttributes.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequestAttributes.java
@@ -18,18 +18,18 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.RequestAttributes;

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.IdentifierImpl;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.StdMutableAttribute;

-import com.att.research.xacml.std.StdMutableRequestAttributes;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.PepRequestAttributes;

+import org.apache.openaz.pepapi.PepRequestAttributes;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.RequestAttributes;

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.std.IdentifierImpl;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.StdMutableAttribute;

+import org.apache.openaz.xacml.std.StdMutableRequestAttributes;

 

 import java.net.URI;

 import java.util.Date;

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequestFactory.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequestFactory.java
index b8f1c1f..be6097a 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequestFactory.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepRequestFactory.java
@@ -18,14 +18,14 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.MapperRegistry;

-import org.openliberty.openaz.pepapi.PepConfig;

-import org.openliberty.openaz.pepapi.PepRequest;

-import org.openliberty.openaz.pepapi.PepRequestFactory;

+import org.apache.openaz.pepapi.MapperRegistry;

+import org.apache.openaz.pepapi.PepConfig;

+import org.apache.openaz.pepapi.PepRequest;

+import org.apache.openaz.pepapi.PepRequestFactory;

 

 import java.util.List;

 

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepResponse.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepResponse.java
index f76aa4c..20a1f57 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepResponse.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepResponse.java
@@ -18,15 +18,15 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import com.att.research.xacml.api.*;

-import com.att.research.xacml.api.Attribute;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.Advice;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.pepapi.Advice;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.xacml.api.*;

+import org.apache.openaz.xacml.api.Attribute;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -84,7 +84,7 @@
     @Override

     public Map<String, Obligation> getObligations() throws PepException {

         Map<String, Obligation> obligationMap = new HashMap<String, Obligation>();

-        for(com.att.research.xacml.api.Obligation wrappedObligation: wrappedResult.getObligations()) {

+        for(org.apache.openaz.xacml.api.Obligation wrappedObligation: wrappedResult.getObligations()) {

             Obligation obligation = new StdObligation(wrappedObligation);

             obligationMap.put(obligation.getId(), obligation);

         }

@@ -94,7 +94,7 @@
     @Override

     public Map<String, Advice> getAdvices() throws PepException {

         Map<String, Advice> adviceMap = new HashMap<String, Advice>();

-        for(com.att.research.xacml.api.Advice wrappedAdvice: wrappedResult.getAssociatedAdvice()) {

+        for(org.apache.openaz.xacml.api.Advice wrappedAdvice: wrappedResult.getAssociatedAdvice()) {

             Advice advice = new StdAdvice(wrappedAdvice);

             adviceMap.put(advice.getId(), advice);

         }

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepResponseFactory.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepResponseFactory.java
index 88dfec9..023c63b 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepResponseFactory.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepResponseFactory.java
@@ -18,15 +18,15 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

-import com.att.research.xacml.api.Result;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.ObligationRouter;

-import org.openliberty.openaz.pepapi.PepConfig;

-import org.openliberty.openaz.pepapi.PepResponse;

-import org.openliberty.openaz.pepapi.PepResponseFactory;

+import org.apache.openaz.pepapi.ObligationRouter;

+import org.apache.openaz.pepapi.PepConfig;

+import org.apache.openaz.pepapi.PepResponse;

+import org.apache.openaz.pepapi.PepResponseFactory;

+import org.apache.openaz.xacml.api.Result;

 

 

 final class StdPepResponseFactory implements PepResponseFactory {

diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/SubjectMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/SubjectMapper.java
index 75a52c5..f685317 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/SubjectMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/SubjectMapper.java
@@ -18,10 +18,10 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std;
+package org.apache.openaz.pepapi.std;
 
 
-import org.openliberty.openaz.pepapi.Subject;
+import org.apache.openaz.pepapi.Subject;
 
 /**
  * Created by ajith on 12/11/14.
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ThreadLocalObligationStore.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ThreadLocalObligationStore.java
index 40a40a7..afea1c5 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ThreadLocalObligationStore.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ThreadLocalObligationStore.java
@@ -18,11 +18,11 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std;

+package org.apache.openaz.pepapi.std;

 

 

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationStore;

 

 import java.util.Collections;

 import java.util.HashSet;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAPI.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAPI.java
index 54ef688..63b0c5f 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAPI.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAPI.java
@@ -18,13 +18,13 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test;

+package org.apache.openaz.pepapi.std.test;

 

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.pepapi.std.StdPepAgentFactory;

 import org.junit.Assert;

 import org.junit.Before;

 import org.junit.Test;

-import org.openliberty.openaz.pepapi.*;

-import org.openliberty.openaz.pepapi.std.StdPepAgentFactory;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAPIWithPIP.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAPIWithPIP.java
index cd9c4e0..80b2436 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAPIWithPIP.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAPIWithPIP.java
@@ -18,16 +18,16 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test;

+package org.apache.openaz.pepapi.std.test;

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.pepapi.std.StdPepAgentFactory;

 import org.junit.Assert;

 import org.junit.Before;

 import org.junit.Ignore;

 import org.junit.Test;

-import org.openliberty.openaz.pepapi.*;

-import org.openliberty.openaz.pepapi.std.StdPepAgentFactory;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAnnotatedHandlerRegistration.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAnnotatedHandlerRegistration.java
index f6f3b53..c7e0ea3 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAnnotatedHandlerRegistration.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestAnnotatedHandlerRegistration.java
@@ -18,19 +18,19 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test;

+package org.apache.openaz.pepapi.std.test;

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.pepapi.std.StdPepAgentFactory;

+import org.apache.openaz.pepapi.std.test.obligation.AnnotatedCatchAllObligationHandler;

+import org.apache.openaz.pepapi.std.test.obligation.AnnotatedFilteringObligationHandler;

+import org.apache.openaz.pepapi.std.test.obligation.AnnotatedRedactionObligationHandler;

 import org.junit.Assert;

 import org.junit.Before;

 import org.junit.Ignore;

 import org.junit.Test;

-import org.openliberty.openaz.pepapi.*;

-import org.openliberty.openaz.pepapi.std.StdPepAgentFactory;

-import org.openliberty.openaz.pepapi.std.test.obligation.AnnotatedCatchAllObligationHandler;

-import org.openliberty.openaz.pepapi.std.test.obligation.AnnotatedFilteringObligationHandler;

-import org.openliberty.openaz.pepapi.std.test.obligation.AnnotatedRedactionObligationHandler;

 

 

 public class TestAnnotatedHandlerRegistration {

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestDataTypes.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestDataTypes.java
index 0333bee..3d21f6d 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestDataTypes.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestDataTypes.java
@@ -18,13 +18,13 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test;

+package org.apache.openaz.pepapi.std.test;

 

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.pepapi.std.StdPepAgentFactory;

 import org.junit.Assert;

 import org.junit.Before;

 import org.junit.Test;

-import org.openliberty.openaz.pepapi.*;

-import org.openliberty.openaz.pepapi.std.StdPepAgentFactory;

 

 import java.net.URI;

 import java.util.ArrayList;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestMapper.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestMapper.java
index 37aacad..7ca0092 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestMapper.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestMapper.java
@@ -18,18 +18,18 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test;

+package org.apache.openaz.pepapi.std.test;

 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.pepapi.std.StdPepAgentFactory;

+import org.apache.openaz.pepapi.std.test.mapper.BusinessRequestContext;

+import org.apache.openaz.pepapi.std.test.mapper.Client;

+import org.apache.openaz.pepapi.std.test.mapper.Document;

 import org.junit.Assert;

 import org.junit.Before;

 import org.junit.Test;

-import org.openliberty.openaz.pepapi.*;

-import org.openliberty.openaz.pepapi.std.StdPepAgentFactory;

-import org.openliberty.openaz.pepapi.std.test.mapper.BusinessRequestContext;

-import org.openliberty.openaz.pepapi.std.test.mapper.Client;

-import org.openliberty.openaz.pepapi.std.test.mapper.Document;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/BusinessRequestContext.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/BusinessRequestContext.java
index cc6bad8..ac3fd60 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/BusinessRequestContext.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/BusinessRequestContext.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.mapper;

+package org.apache.openaz.pepapi.std.test.mapper;

 

 public class BusinessRequestContext {

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/BusinessRequestContextMapper.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/BusinessRequestContextMapper.java
index 6b6ac79..6d2c6a9 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/BusinessRequestContextMapper.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/BusinessRequestContextMapper.java
@@ -18,10 +18,10 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.mapper;

+package org.apache.openaz.pepapi.std.test.mapper;

 

-import com.att.research.xacml.api.XACML3;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.xacml.api.XACML3;

 

 public class BusinessRequestContextMapper implements ObjectMapper {

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/Client.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/Client.java
index 4f83bc8..869b828 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/Client.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/Client.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.mapper;

+package org.apache.openaz.pepapi.std.test.mapper;

 

 public class Client {

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/ClientMapper.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/ClientMapper.java
index 4211a3b..9c13b2f 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/ClientMapper.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/ClientMapper.java
@@ -18,10 +18,10 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.mapper;

+package org.apache.openaz.pepapi.std.test.mapper;

 

-import com.att.research.xacml.api.XACML3;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.xacml.api.XACML3;

 

 public class ClientMapper implements ObjectMapper {

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/Document.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/Document.java
index 719b356..cc5c86b 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/Document.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/Document.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.mapper;

+package org.apache.openaz.pepapi.std.test.mapper;

 

 public class Document {

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/DocumentMapper.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/DocumentMapper.java
index 454372e..689c6ef 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/DocumentMapper.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/DocumentMapper.java
@@ -18,10 +18,10 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.mapper;

+package org.apache.openaz.pepapi.std.test.mapper;

 

-import com.att.research.xacml.api.XACML3;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.xacml.api.XACML3;

 

 public class DocumentMapper implements ObjectMapper {

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/MedicalRecord.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/MedicalRecord.java
index c904393..45a2bc2 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/MedicalRecord.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/MedicalRecord.java
@@ -18,7 +18,7 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.mapper;

+package org.apache.openaz.pepapi.std.test.mapper;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/MedicalRecordMapper.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/MedicalRecordMapper.java
index 91d42b7..c82f251 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/MedicalRecordMapper.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/mapper/MedicalRecordMapper.java
@@ -18,10 +18,10 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.mapper;

+package org.apache.openaz.pepapi.std.test.mapper;

 

-import com.att.research.xacml.api.XACML3;

-import org.openliberty.openaz.pepapi.*;

+import org.apache.openaz.pepapi.*;

+import org.apache.openaz.xacml.api.XACML3;

 

 public class MedicalRecordMapper implements ObjectMapper {

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AccessRestrictionObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AccessRestrictionObligationHandler.java
index 497d89b..3d0a839 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AccessRestrictionObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AccessRestrictionObligationHandler.java
@@ -18,14 +18,15 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

+

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationHandler;

-import org.openliberty.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationHandler;

+import org.apache.openaz.pepapi.ObligationStore;

 

 import java.util.Map;

 import java.util.Map.Entry;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AgeRestrictionObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AgeRestrictionObligationHandler.java
index 759af0f..f5a4589 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AgeRestrictionObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AgeRestrictionObligationHandler.java
@@ -18,15 +18,16 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

+

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationHandler;

-import org.openliberty.openaz.pepapi.ObligationStore;

-import org.openliberty.openaz.pepapi.std.test.util.HasResult;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationHandler;

+import org.apache.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.std.test.util.HasResult;

 

 import java.util.Map;

 import java.util.Set;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAccessRestrictionObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAccessRestrictionObligationHandler.java
index fe46c0d..4472d41 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAccessRestrictionObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAccessRestrictionObligationHandler.java
@@ -18,15 +18,16 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

+

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationStore;

-import org.openliberty.openaz.pepapi.ObligationStoreAware;

-import org.openliberty.openaz.pepapi.MatchAnyObligation;

+import org.apache.openaz.pepapi.MatchAnyObligation;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.ObligationStoreAware;

 

 import java.util.Map.Entry;

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAgeRestrictionObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAgeRestrictionObligationHandler.java
index ddcc9a2..c7adbaf 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAgeRestrictionObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAgeRestrictionObligationHandler.java
@@ -18,16 +18,17 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

+

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationStore;

-import org.openliberty.openaz.pepapi.ObligationStoreAware;

-import org.openliberty.openaz.pepapi.MatchAnyObligation;

-import org.openliberty.openaz.pepapi.std.test.util.HasResult;

+import org.apache.openaz.pepapi.MatchAnyObligation;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.ObligationStoreAware;

+import org.apache.openaz.pepapi.std.test.util.HasResult;

 

 import java.util.Map;

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAuditObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAuditObligationHandler.java
index 72e3a1f..ba93c89 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAuditObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedAuditObligationHandler.java
@@ -18,15 +18,16 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

+

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationStore;

-import org.openliberty.openaz.pepapi.ObligationStoreAware;

-import org.openliberty.openaz.pepapi.MatchAnyObligation;

+import org.apache.openaz.pepapi.MatchAnyObligation;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.ObligationStoreAware;

 

 import java.util.Set;

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedCatchAllObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedCatchAllObligationHandler.java
index a1fea2f..2da8050 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedCatchAllObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedCatchAllObligationHandler.java
@@ -18,13 +18,14 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationStore;

-import org.openliberty.openaz.pepapi.ObligationStoreAware;

-import org.openliberty.openaz.pepapi.MatchAnyObligation;

+

+import org.apache.openaz.pepapi.MatchAnyObligation;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.ObligationStoreAware;

 

 import java.util.HashSet;

 import java.util.Set;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedFilteringObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedFilteringObligationHandler.java
index ebd6e95..8b09cf3 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedFilteringObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedFilteringObligationHandler.java
@@ -18,14 +18,15 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationStore;

-import org.openliberty.openaz.pepapi.ObligationStoreAware;

-import org.openliberty.openaz.pepapi.Attribute;

-import org.openliberty.openaz.pepapi.MatchAllObligationAttributes;

+

+import org.apache.openaz.pepapi.Attribute;

+import org.apache.openaz.pepapi.MatchAllObligationAttributes;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.ObligationStoreAware;

 

 import java.util.Set;

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedObligationHandler.java
index 5c96ae8..caf0e8b 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedObligationHandler.java
@@ -18,11 +18,11 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std.test.obligation;
+package org.apache.openaz.pepapi.std.test.obligation;
 
-import org.openliberty.openaz.pepapi.Attribute;
-import org.openliberty.openaz.pepapi.MatchAllObligationAttributes;
-import org.openliberty.openaz.pepapi.MatchAnyObligation;
+import org.apache.openaz.pepapi.Attribute;
+import org.apache.openaz.pepapi.MatchAllObligationAttributes;
+import org.apache.openaz.pepapi.MatchAnyObligation;
 
 @MatchAnyObligation({"jpmc:obligation:one","jpmc:obligation:two","jpmc:obligation:three"})
 @MatchAllObligationAttributes({
diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedRedactionObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedRedactionObligationHandler.java
index e6a49d8..afd548b 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedRedactionObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AnnotatedRedactionObligationHandler.java
@@ -18,14 +18,15 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationStore;

-import org.openliberty.openaz.pepapi.ObligationStoreAware;

-import org.openliberty.openaz.pepapi.Attribute;

-import org.openliberty.openaz.pepapi.MatchAllObligationAttributes;

+

+import org.apache.openaz.pepapi.Attribute;

+import org.apache.openaz.pepapi.MatchAllObligationAttributes;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.ObligationStoreAware;

 

 import java.util.Set;

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AuditObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AuditObligationHandler.java
index 702e5af..d846260 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AuditObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/AuditObligationHandler.java
@@ -18,14 +18,15 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

+

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationHandler;

-import org.openliberty.openaz.pepapi.ObligationStore;

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationHandler;

+import org.apache.openaz.pepapi.ObligationStore;

 

 import java.util.Set;

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/CatchAllObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/CatchAllObligationHandler.java
index c1eabd4..e07e68a 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/CatchAllObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/CatchAllObligationHandler.java
@@ -18,12 +18,13 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationHandler;

-import org.openliberty.openaz.pepapi.ObligationStore;

+

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationHandler;

+import org.apache.openaz.pepapi.ObligationStore;

 

 import java.util.HashSet;

 import java.util.Set;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/FilteringObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/FilteringObligationHandler.java
index 3bf2a03..6295346 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/FilteringObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/FilteringObligationHandler.java
@@ -18,12 +18,13 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationHandler;

-import org.openliberty.openaz.pepapi.ObligationStore;

+

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationHandler;

+import org.apache.openaz.pepapi.ObligationStore;

 

 import java.util.Map;

 import java.util.Set;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/RedactionObligationHandler.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/RedactionObligationHandler.java
index 4ea6e43..6c9de1a 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/RedactionObligationHandler.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/obligation/RedactionObligationHandler.java
@@ -18,12 +18,13 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.obligation;

+package org.apache.openaz.pepapi.std.test.obligation;

 

 import junit.framework.Assert;

-import org.openliberty.openaz.pepapi.Obligation;

-import org.openliberty.openaz.pepapi.ObligationHandler;

-import org.openliberty.openaz.pepapi.ObligationStore;

+

+import org.apache.openaz.pepapi.Obligation;

+import org.apache.openaz.pepapi.ObligationHandler;

+import org.apache.openaz.pepapi.ObligationStore;

 

 import java.util.Map;

 import java.util.Set;

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/util/AzInvoker.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/util/AzInvoker.java
index f46b870..f71647e 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/util/AzInvoker.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/util/AzInvoker.java
@@ -18,10 +18,10 @@
  *

  */

 

-package org.openliberty.openaz.pepapi.std.test.util;

+package org.apache.openaz.pepapi.std.test.util;

 

-import org.openliberty.openaz.pepapi.PepAgent;

-import org.openliberty.openaz.pepapi.PepResponse;

+import org.apache.openaz.pepapi.PepAgent;

+import org.apache.openaz.pepapi.PepResponse;

 

 import java.util.concurrent.Callable;

 

diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/util/HasResult.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/util/HasResult.java
index ec105b7..c457075 100644
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/util/HasResult.java
+++ b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/util/HasResult.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.openliberty.openaz.pepapi.std.test.util;
+package org.apache.openaz.pepapi.std.test.util;
 
 public interface HasResult {
 
diff --git a/openaz-pep/src/test/resources/properties/testapi.xacml.properties b/openaz-pep/src/test/resources/properties/testapi.xacml.properties
index b45d2c1..75c84a3 100755
--- a/openaz-pep/src/test/resources/properties/testapi.xacml.properties
+++ b/openaz-pep/src/test/resources/properties/testapi.xacml.properties
@@ -1,17 +1,17 @@
 # Default XACML Properties File
 # Standard API Factories
 #
-xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
-xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
-xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
-xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
+xacml.dataTypeFactory=org.apache.openaz.xacml.std.StdDataTypeFactory
+xacml.pdpEngineFactory=org.apache.openaz.xacmlatt.pdp.ATTPDPEngineFactory
+xacml.pepEngineFactory=org.apache.openaz.xacml.std.pep.StdEngineFactory
+xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
 
-# AT&T PDP Implementation Factories
+# OpenAZ PDP Implementation Factories
 #
-xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
-xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory
-xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
+xacml.openaz.evaluationContextFactory=org.apache.openaz.xacml.pdp.std.StdEvaluationContextFactory
+xacml.openaz.combiningAlgorithmFactory=org.apache.openaz.xacml.pdp.std.StdCombiningAlgorithmFactory
+xacml.openaz.functionDefinitionFactory=org.apache.openaz.xacml.pdp.std.StdFunctionDefinitionFactory
+xacml.openaz.policyFinderFactory=org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory
 
 xacml.rootPolicies=testPolicy
 testPolicy.file=src/test/resources/policies/TestPolicy001.xml
diff --git a/openaz-pep/src/test/resources/properties/testdatatypes.xacml.properties b/openaz-pep/src/test/resources/properties/testdatatypes.xacml.properties
index cb6d77b..ee83c87 100755
--- a/openaz-pep/src/test/resources/properties/testdatatypes.xacml.properties
+++ b/openaz-pep/src/test/resources/properties/testdatatypes.xacml.properties
@@ -1,17 +1,17 @@
 # Default XACML Properties File
 # Standard API Factories
 #
-xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
-xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
-xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
-xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
+xacml.dataTypeFactory=org.apache.openaz.xacml.std.StdDataTypeFactory
+xacml.pdpEngineFactory=org.apache.openaz.xacmlatt.pdp.ATTPDPEngineFactory
+xacml.pepEngineFactory=org.apache.openaz.xacml.std.pep.StdEngineFactory
+xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
 
-# AT&T PDP Implementation Factories
+# OpenAZ PDP Implementation Factories
 #
-xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
-xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory
-xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
+xacml.openaz.evaluationContextFactory=org.apache.openaz.xacml.pdp.std.StdEvaluationContextFactory
+xacml.openaz.combiningAlgorithmFactory=org.apache.openaz.xacml.pdp.std.StdCombiningAlgorithmFactory
+xacml.openaz.functionDefinitionFactory=org.apache.openaz.xacml.pdp.std.StdFunctionDefinitionFactory
+xacml.openaz.policyFinderFactory=org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory
 
 xacml.rootPolicies=testPolicy
 testPolicy.file=src/test/resources/policies/TestPolicy003.xml
diff --git a/openaz-pep/src/test/resources/properties/testmapper.xacml.properties b/openaz-pep/src/test/resources/properties/testmapper.xacml.properties
index 12e1754..676b748 100755
--- a/openaz-pep/src/test/resources/properties/testmapper.xacml.properties
+++ b/openaz-pep/src/test/resources/properties/testmapper.xacml.properties
@@ -1,24 +1,24 @@
 # Default XACML Properties File
 # Standard API Factories
 #
-xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
-xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
-xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
-xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
+xacml.dataTypeFactory=org.apache.openaz.xacml.std.StdDataTypeFactory
+xacml.pdpEngineFactory=org.apache.openaz.xacmlatt.pdp.ATTPDPEngineFactory
+xacml.pepEngineFactory=org.apache.openaz.xacml.std.pep.StdEngineFactory
+xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
 
-# AT&T PDP Implementation Factories
+# OpenAZ PDP Implementation Factories
 #
-xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
-xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory
-xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
+xacml.openaz.evaluationContextFactory=org.apache.openaz.xacml.pdp.std.StdEvaluationContextFactory
+xacml.openaz.combiningAlgorithmFactory=org.apache.openaz.xacml.pdp.std.StdCombiningAlgorithmFactory
+xacml.openaz.functionDefinitionFactory=org.apache.openaz.xacml.pdp.std.StdFunctionDefinitionFactory
+xacml.openaz.policyFinderFactory=org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory
 
 xacml.rootPolicies=testPolicy
 testPolicy.file=src/test/resources/policies/TestPolicy004.xml
 
 #pep properties
 pep.issuer=test
-pep.mapper.classes=org.openliberty.openaz.pepapi.std.test.mapper.BusinessRequestContextMapper,\
-  org.openliberty.openaz.pepapi.std.test.mapper.DocumentMapper, \
-  org.openliberty.openaz.pepapi.std.test.mapper.ClientMapper, \
-  org.openliberty.openaz.pepapi.std.test.mapper.MedicalRecordMapper
+pep.mapper.classes=org.apache.openaz.pepapi.std.test.mapper.BusinessRequestContextMapper,\
+  org.apache.openaz.pepapi.std.test.mapper.DocumentMapper, \
+  org.apache.openaz.pepapi.std.test.mapper.ClientMapper, \
+  org.apache.openaz.pepapi.std.test.mapper.MedicalRecordMapper
diff --git a/openaz-xacml-pap-admin/pom.xml b/openaz-xacml-pap-admin/pom.xml
index 552fb01..b027045 100644
--- a/openaz-xacml-pap-admin/pom.xml
+++ b/openaz-xacml-pap-admin/pom.xml
@@ -18,7 +18,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>openaz</artifactId>
-        <groupId>org.openliberty.openaz</groupId>
+        <groupId>org.apache.openaz</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/openaz-xacml-pap-rest/pdps/configurable-csv-and-hyper/xacml.pip.properties b/openaz-xacml-pap-rest/pdps/configurable-csv-and-hyper/xacml.pip.properties
index 17ec3a2..79ace57 100755
--- a/openaz-xacml-pap-rest/pdps/configurable-csv-and-hyper/xacml.pip.properties
+++ b/openaz-xacml-pap-rest/pdps/configurable-csv-and-hyper/xacml.pip.properties
@@ -2,14 +2,10 @@
 #
 xacml.pip.engines=csv1,csv2,hyper1
 
-ATTWebPhone.classname=com.att.research.xacmlatt.pip.webphone.PIPEngineATTWebphone
-CSO.classname=com.att.research.xacmlatt.pip.cso.PIPEngineCSOCookie
-CSO.mode=DEVL
-
-csv1.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
+csv1.classname=org.apache.openaz.xacml.std.pip.engines.csv.CSVEngine
 csv1.name=Master
 csv1.description=Sean Lahman Basebase stats - Player names, DOB, and biographical info
-csv1.issuer=com:att:research:xacml:test:csv
+csv1.issuer=org.apache.openaz:xacml:test:csv
 csv1.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Master.txt
 csv1.maxsize=500000
 csv1.delimiter=,
@@ -18,42 +14,42 @@
 
 csv1.resolvers=data
 
-csv1.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
+csv1.resolver.data.classname=org.apache.openaz.xacml.std.pip.engines.csv.ConfigurableCSVResolver
 csv1.resolver.data.name=Player Resolver
 csv1.resolver.data.description=This resolver finds player information in the Master table.
 csv1.resolver.data.fields=firstname,lastname,deathyear,deathmonth,deathday,debut,finalgame
 csv1.resolver.data.field.firstname.column=16
-csv1.resolver.data.field.firstname.id=com:att:research:xacml:test:csv:subject:firstname
+csv1.resolver.data.field.firstname.id=org.apache.openaz:xacml:test:csv:subject:firstname
 csv1.resolver.data.field.firstname.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.field.firstname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.lastname.column=17
-csv1.resolver.data.field.lastname.id=com:att:research:xacml:test:csv:subject:lastname
+csv1.resolver.data.field.lastname.id=org.apache.openaz:xacml:test:csv:subject:lastname
 csv1.resolver.data.field.lastname.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.field.lastname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathyear.column=10
-csv1.resolver.data.field.deathyear.id=com:att:research:xacml:test:csv:subject:deathyear
+csv1.resolver.data.field.deathyear.id=org.apache.openaz:xacml:test:csv:subject:deathyear
 csv1.resolver.data.field.deathyear.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathyear.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathmonth.column=11
-csv1.resolver.data.field.deathmonth.id=com:att:research:xacml:test:csv:subject:deathmonth
+csv1.resolver.data.field.deathmonth.id=org.apache.openaz:xacml:test:csv:subject:deathmonth
 csv1.resolver.data.field.deathmonth.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathmonth.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathday.column=12
-csv1.resolver.data.field.deathday.id=com:att:research:xacml:test:csv:subject:deathday
+csv1.resolver.data.field.deathday.id=org.apache.openaz:xacml:test:csv:subject:deathday
 csv1.resolver.data.field.deathday.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathday.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.debut.column=25
-csv1.resolver.data.field.debut.id=com:att:research:xacml:test:csv:subject:debut
+csv1.resolver.data.field.debut.id=org.apache.openaz:xacml:test:csv:subject:debut
 csv1.resolver.data.field.debut.datatype=http://www.w3.org/2001/XMLSchema#date
 csv1.resolver.data.field.debut.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.finalgame.column=26
-csv1.resolver.data.field.finalgame.id=com:att:research:xacml:test:csv:subject:finalgame
+csv1.resolver.data.field.finalgame.id=org.apache.openaz:xacml:test:csv:subject:finalgame
 csv1.resolver.data.field.finalgame.datatype=http://www.w3.org/2001/XMLSchema#date
 csv1.resolver.data.field.finalgame.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
@@ -63,7 +59,7 @@
 csv1.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
-csv2.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
+csv2.classname=org.apache.openaz.xacml.std.pip.engines.csv.CSVEngine
 csv2.name=Appearances
 csv2.description=Sean Lahman Basebase stats - Player appearances for a team in a given year.
 #csv2.issuer=
@@ -75,15 +71,15 @@
 
 csv2.resolvers=data
 
-csv2.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
+csv2.resolver.data.classname=org.apache.openaz.xacml.std.pip.engines.csv.ConfigurableCSVResolver
 csv2.resolver.data.name=Appearance Resolver
 csv2.resolver.data.description=This resolver returns all the appearances for a player from the appearance table.
 csv2.resolver.data.fields=appearance
 csv2.resolver.data.field.appearance.column=0
-csv2.resolver.data.field.appearance.id=com:att:research:xacml:test:csv:subject:appearance
+csv2.resolver.data.field.appearance.id=org.apache.openaz:xacml:test:csv:subject:appearance
 csv2.resolver.data.field.appearance.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv2.resolver.data.field.appearance.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-csv2.resolver.data.field.appearance.issuer=com:att:research:xacml:test:csv
+csv2.resolver.data.field.appearance.issuer=org.apache.openaz:xacml:test:csv
 
 csv2.resolver.data.parameters=playerid
 csv2.resolver.data.parameter.playerid.column=3
@@ -92,7 +88,7 @@
 csv2.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 #csv1.resolver.data.parameter.playerid.issuer=
 
-hyper1.classname=com.att.research.xacml.std.pip.engines.csv.HyperCSVEngine
+hyper1.classname=org.apache.openaz.xacml.std.pip.engines.csv.HyperCSVEngine
 hyper1.name=World Marriage Age Limits
 hyper1.description=Minimum age for female/male marriages with or without their parental consent.
 hyper1.source=../XACML-TEST/testsets/pip/configurable-csv-hyper/marriage.csv
@@ -101,127 +97,34 @@
 
 hyper1.resolvers=age_consent
 
-hyper1.resolver.age_consent.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
+hyper1.resolver.age_consent.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
 hyper1.resolver.age_consent.name=Ages
 hyper1.resolver.age_consent.description=This returns all the age's for consent or no consent for a country.
 hyper1.resolver.age_consent.select=SELECT wofemale,womale,wfemale,wmale FROM marriage WHERE country=?
 hyper1.resolver.age_consent.fields=wofemale,womale,wfemale,wmale
 
-hyper1.resolver.age_consent.field.wofemale.id=com:att:research:xacml:test:csv:country:no-consent:female
+hyper1.resolver.age_consent.field.wofemale.id=org.apache.openaz:xacml:test:csv:country:no-consent:female
 hyper1.resolver.age_consent.field.wofemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wofemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wofemale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wofemale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wofemale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.womale.id=com:att:research:xacml:test:csv:country:no-consent:male
+hyper1.resolver.age_consent.field.womale.id=org.apache.openaz:xacml:test:csv:country:no-consent:male
 hyper1.resolver.age_consent.field.womale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.womale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.womale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.womale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.womale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.wfemale.id=com:att:research:xacml:test:csv:country:consent:female
+hyper1.resolver.age_consent.field.wfemale.id=org.apache.openaz:xacml:test:csv:country:consent:female
 hyper1.resolver.age_consent.field.wfemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wfemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wfemale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wfemale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wfemale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.wmale.id=com:att:research:xacml:test:csv:country:consent:male
+hyper1.resolver.age_consent.field.wmale.id=org.apache.openaz:xacml:test:csv:country:consent:male
 hyper1.resolver.age_consent.field.wmale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wmale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wmale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wmale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wmale.issuer=org.apache.openaz:xacml:test:csv
 
 hyper1.resolver.age_consent.parameters=country
-hyper1.resolver.age_consent.parameter.country.id=com:att:research:xacml:test:csv:country:name
+hyper1.resolver.age_consent.parameter.country.id=org.apache.openaz:xacml:test:csv:country:name
 hyper1.resolver.age_consent.parameter.country.datatype=http://www.w3.org/2001/XMLSchema#string
-hyper1.resolver.age_consent.parameter.country.category=com:att:research:xacml:test:csv:category:country
+hyper1.resolver.age_consent.parameter.country.category=org.apache.openaz:xacml:test:csv:category:country
 #hyper1.resolver.age_consent.parameter.country.issuer=
-
-sql1.classname=com.att.research.xacml.std.pip.engines.jdbc.JDBCEngine
-sql1.name=World
-sql1.description=World Database from MySQL website. Copyright Statistics Finland, http://www.stat.fi/worldinfigures.
-# This will be the default issuer for the resolvers. NOTE: Issuer only used for attributes provided by the engine.
-sql1.issuer=com:att:research:xacml:test:sql
-#
-# This is the configuration for JDBC. You will have to setup the database and run the data\world*.sql script to
-# create the tables and load the data. 
-#
-sql1.type=jdbc
-sql1.jdbc.driver=org.postgresql.Driver
-#sql1.jdbc.url=jdbc:postgresql://localhost:5432/world
-#sql1.jdbc.conn.user=sa
-#sql1.jdbc.conn.password=
-sql1.jdbc.url=jdbc:postgresql://xacml-pip.research.att.com:5432/world
-sql1.jdbc.conn.user=pip
-sql1.jdbc.conn.password=p1pUs3r
-#
-# This is the configuration for JNDI datasource.
-#
-#sql1.type=jndi
-#sql1.datasource=jdbc/xacml
-
-sql1.resolvers=langer
-
-sql1.resolver.langer.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
-sql1.resolver.langer.name=Language
-sql1.resolver.langer.description=This returns the language for a city.
-sql1.resolver.langer.select=SELECT language FROM city INNER JOIN countrylanguage ON city.countrycode = countrylanguage.countrycode WHERE name=?
-sql1.resolver.langer.fields=language
-sql1.resolver.langer.field.language.id=com:att:research:xacml:test:sql:resource:city:language
-sql1.resolver.langer.field.language.datatype=http://www.w3.org/2001/XMLSchema#string
-sql1.resolver.langer.field.language.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-#You can override the default issuer that is set in the JDBCEngine definition if you want.
-#sql1.resolver.langer.field.language.issuer=com:att:research:xacml:test:sql
-sql1.resolver.langer.parameters=name
-sql1.resolver.langer.parameter.name.id=urn:oasis:names:tc:xacml:1.0:resource:resource-id
-sql1.resolver.langer.parameter.name.datatype=http://www.w3.org/2001/XMLSchema#string
-sql1.resolver.langer.parameter.name.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-
-
-ldap1.classname=com.att.research.xacml.std.pip.engines.ldap.LDAPEngine
-ldap1.name=LDAP PIP
-ldap1.description=The LDAP containing the seven seas sample LDIF data.
-ldap1.issuer=com:att:research:xacml:test:ldap
-ldap1.java.naming.factory.initial=com.sun.jndi.ldap.LdapCtxFactory
-#
-# NOTE: You will have to setup a local LDAP server and load the data\apache-ds-tutorial.ldif before
-# this example will work.
-#
-#ldap1.java.naming.provider.url=ldap://localhost:10389
-ldap1.java.naming.provider.url=ldap://xacml-pip.research.att.com:10389
-#ldap.java.naming.security.principal=
-#ldap.java.naming.security.credentials=
-ldap1.scope=subtree
-
-ldap1.resolvers=dn,ship
-
-ldap1.resolver.dn.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
-ldap1.resolver.dn.name=Domain Names
-ldap1.resolver.dn.description=Find all the dn's for the subject id
-ldap1.resolver.dn.base=o=sevenseas
-ldap1.resolver.dn.base.parameters=
-ldap1.resolver.dn.filter=(|(uid=${uid})(mail=${uid}))
-ldap1.resolver.dn.filter.parameters=uid
-ldap1.resolver.dn.filter.parameters.uid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-ldap1.resolver.dn.filter.parameters.uid.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.dn.filter.parameters.uid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#ldap1.resolver.dn.filter.parameters.uid.issuer=com:att:research:xacml:test:ldap
-ldap1.resolver.dn.filter.view=dn
-ldap1.resolver.dn.filter.view.dn.id=com:att:research:xacml:test:ldap:subject:dn
-ldap1.resolver.dn.filter.view.dn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.dn.filter.view.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.dn.filter.view.dn.issuer=com:att:research:xacml:test:ldap
-
-ldap1.resolver.ship.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
-ldap1.resolver.ship.name=Ship Resolver
-ldap1.resolver.ship.description=This resolves a subject's dn to a ship.
-ldap1.resolver.ship.base=o=sevenseas
-ldap1.resolver.ship.base.parameters=
-ldap1.resolver.ship.filter=uniquemember=${dn}
-ldap1.resolver.ship.filter.parameters=dn
-ldap1.resolver.ship.filter.parameters.dn.id=com:att:research:xacml:test:ldap:subject:dn
-ldap1.resolver.ship.filter.parameters.dn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.ship.filter.parameters.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.parameters.dn.issuer=com:att:research:xacml:test:ldap
-ldap1.resolver.ship.filter.view=cn
-ldap1.resolver.ship.filter.view.cn.id=com:att:research:xacml:test:ldap:subject:ship
-ldap1.resolver.ship.filter.view.cn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.ship.filter.view.cn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.view.cn.issuer=com:att:research:xacml:test:ldap
-
diff --git a/openaz-xacml-pap-rest/pdps/configurable-csv-hyper/xacml.pip.properties b/openaz-xacml-pap-rest/pdps/configurable-csv-hyper/xacml.pip.properties
index 5f66428..9c4d493 100755
--- a/openaz-xacml-pap-rest/pdps/configurable-csv-hyper/xacml.pip.properties
+++ b/openaz-xacml-pap-rest/pdps/configurable-csv-hyper/xacml.pip.properties
@@ -2,97 +2,7 @@
 #
 xacml.pip.engines=hyper1
 
-ATTWebPhone.classname=com.att.research.xacmlatt.pip.webphone.PIPEngineATTWebphone
-CSO.classname=com.att.research.xacmlatt.pip.cso.PIPEngineCSOCookie
-CSO.mode=DEVL
-
-csv1.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
-csv1.name=Master
-csv1.description=Sean Lahman Basebase stats - Player names, DOB, and biographical info
-csv1.issuer=com:att:research:xacml:test:csv
-csv1.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Master.txt
-csv1.maxsize=500000
-csv1.delimiter=,
-csv1.quote="
-csv1.skip=0
-
-csv1.resolvers=data
-
-csv1.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
-csv1.resolver.data.name=Player Resolver
-csv1.resolver.data.description=This resolver finds player information in the Master table.
-csv1.resolver.data.fields=firstname,lastname,deathyear,deathmonth,deathday,debut,finalgame
-csv1.resolver.data.field.firstname.column=16
-csv1.resolver.data.field.firstname.id=com:att:research:xacml:test:csv:subject:firstname
-csv1.resolver.data.field.firstname.datatype=http://www.w3.org/2001/XMLSchema#string
-csv1.resolver.data.field.firstname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.lastname.column=17
-csv1.resolver.data.field.lastname.id=com:att:research:xacml:test:csv:subject:lastname
-csv1.resolver.data.field.lastname.datatype=http://www.w3.org/2001/XMLSchema#string
-csv1.resolver.data.field.lastname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.deathyear.column=10
-csv1.resolver.data.field.deathyear.id=com:att:research:xacml:test:csv:subject:deathyear
-csv1.resolver.data.field.deathyear.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv1.resolver.data.field.deathyear.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.deathmonth.column=11
-csv1.resolver.data.field.deathmonth.id=com:att:research:xacml:test:csv:subject:deathmonth
-csv1.resolver.data.field.deathmonth.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv1.resolver.data.field.deathmonth.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.deathday.column=12
-csv1.resolver.data.field.deathday.id=com:att:research:xacml:test:csv:subject:deathday
-csv1.resolver.data.field.deathday.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv1.resolver.data.field.deathday.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.debut.column=25
-csv1.resolver.data.field.debut.id=com:att:research:xacml:test:csv:subject:debut
-csv1.resolver.data.field.debut.datatype=http://www.w3.org/2001/XMLSchema#date
-csv1.resolver.data.field.debut.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.finalgame.column=26
-csv1.resolver.data.field.finalgame.id=com:att:research:xacml:test:csv:subject:finalgame
-csv1.resolver.data.field.finalgame.datatype=http://www.w3.org/2001/XMLSchema#date
-csv1.resolver.data.field.finalgame.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.parameters=playerid
-csv1.resolver.data.parameter.playerid.column=1
-csv1.resolver.data.parameter.playerid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-csv1.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
-csv1.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv2.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
-csv2.name=Appearances
-csv2.description=Sean Lahman Basebase stats - Player appearances for a team in a given year.
-#csv2.issuer=
-csv2.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Appearances.txt
-csv2.maxsize=500000
-csv2.delimiter=,
-csv2.quote="
-csv2.skip=0
-
-csv2.resolvers=data
-
-csv2.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
-csv2.resolver.data.name=Appearance Resolver
-csv2.resolver.data.description=This resolver returns all the appearances for a player from the appearance table.
-csv2.resolver.data.fields=appearance
-csv2.resolver.data.field.appearance.column=0
-csv2.resolver.data.field.appearance.id=com:att:research:xacml:test:csv:subject:appearance
-csv2.resolver.data.field.appearance.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv2.resolver.data.field.appearance.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-csv2.resolver.data.field.appearance.issuer=com:att:research:xacml:test:csv
-
-csv2.resolver.data.parameters=playerid
-csv2.resolver.data.parameter.playerid.column=3
-csv2.resolver.data.parameter.playerid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-csv2.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
-csv2.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#csv1.resolver.data.parameter.playerid.issuer=
-
-hyper1.classname=com.att.research.xacml.std.pip.engines.csv.HyperCSVEngine
+hyper1.classname=org.apache.openaz.xacml.std.pip.engines.csv.HyperCSVEngine
 hyper1.name=World Marriage Age Limits
 hyper1.description=Minimum age for female/male marriages with or without their parental consent.
 hyper1.source=../XACML-TEST/testsets/pip/configurable-csv-hyper/marriage.csv
@@ -101,127 +11,34 @@
 
 hyper1.resolvers=age_consent
 
-hyper1.resolver.age_consent.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
+hyper1.resolver.age_consent.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
 hyper1.resolver.age_consent.name=Ages
 hyper1.resolver.age_consent.description=This returns all the age's for consent or no consent for a country.
 hyper1.resolver.age_consent.select=SELECT wofemale,womale,wfemale,wmale FROM marriage WHERE country=?
 hyper1.resolver.age_consent.fields=wofemale,womale,wfemale,wmale
 
-hyper1.resolver.age_consent.field.wofemale.id=com:att:research:xacml:test:csv:country:no-consent:female
+hyper1.resolver.age_consent.field.wofemale.id=org.apache.openaz:xacml:test:csv:country:no-consent:female
 hyper1.resolver.age_consent.field.wofemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wofemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wofemale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wofemale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wofemale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.womale.id=com:att:research:xacml:test:csv:country:no-consent:male
+hyper1.resolver.age_consent.field.womale.id=org.apache.openaz:xacml:test:csv:country:no-consent:male
 hyper1.resolver.age_consent.field.womale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.womale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.womale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.womale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.womale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.wfemale.id=com:att:research:xacml:test:csv:country:consent:female
+hyper1.resolver.age_consent.field.wfemale.id=org.apache.openaz:xacml:test:csv:country:consent:female
 hyper1.resolver.age_consent.field.wfemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wfemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wfemale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wfemale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wfemale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.wmale.id=com:att:research:xacml:test:csv:country:consent:male
+hyper1.resolver.age_consent.field.wmale.id=org.apache.openaz:xacml:test:csv:country:consent:male
 hyper1.resolver.age_consent.field.wmale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wmale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wmale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wmale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wmale.issuer=org.apache.openaz:xacml:test:csv
 
 hyper1.resolver.age_consent.parameters=country
-hyper1.resolver.age_consent.parameter.country.id=com:att:research:xacml:test:csv:country:name
+hyper1.resolver.age_consent.parameter.country.id=org.apache.openaz:xacml:test:csv:country:name
 hyper1.resolver.age_consent.parameter.country.datatype=http://www.w3.org/2001/XMLSchema#string
-hyper1.resolver.age_consent.parameter.country.category=com:att:research:xacml:test:csv:category:country
+hyper1.resolver.age_consent.parameter.country.category=org.apache.openaz:xacml:test:csv:category:country
 #hyper1.resolver.age_consent.parameter.country.issuer=
-
-sql1.classname=com.att.research.xacml.std.pip.engines.jdbc.JDBCEngine
-sql1.name=World
-sql1.description=World Database from MySQL website. Copyright Statistics Finland, http://www.stat.fi/worldinfigures.
-# This will be the default issuer for the resolvers. NOTE: Issuer only used for attributes provided by the engine.
-sql1.issuer=com:att:research:xacml:test:sql
-#
-# This is the configuration for JDBC. You will have to setup the database and run the data\world*.sql script to
-# create the tables and load the data. 
-#
-sql1.type=jdbc
-sql1.jdbc.driver=org.postgresql.Driver
-#sql1.jdbc.url=jdbc:postgresql://localhost:5432/world
-#sql1.jdbc.conn.user=sa
-#sql1.jdbc.conn.password=
-sql1.jdbc.url=jdbc:postgresql://xacml-pip.research.att.com:5432/world
-sql1.jdbc.conn.user=pip
-sql1.jdbc.conn.password=p1pUs3r
-#
-# This is the configuration for JNDI datasource.
-#
-#sql1.type=jndi
-#sql1.datasource=jdbc/xacml
-
-sql1.resolvers=langer
-
-sql1.resolver.langer.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
-sql1.resolver.langer.name=Language
-sql1.resolver.langer.description=This returns the language for a city.
-sql1.resolver.langer.select=SELECT language FROM city INNER JOIN countrylanguage ON city.countrycode = countrylanguage.countrycode WHERE name=?
-sql1.resolver.langer.fields=language
-sql1.resolver.langer.field.language.id=com:att:research:xacml:test:sql:resource:city:language
-sql1.resolver.langer.field.language.datatype=http://www.w3.org/2001/XMLSchema#string
-sql1.resolver.langer.field.language.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-#You can override the default issuer that is set in the JDBCEngine definition if you want.
-#sql1.resolver.langer.field.language.issuer=com:att:research:xacml:test:sql
-sql1.resolver.langer.parameters=name
-sql1.resolver.langer.parameter.name.id=urn:oasis:names:tc:xacml:1.0:resource:resource-id
-sql1.resolver.langer.parameter.name.datatype=http://www.w3.org/2001/XMLSchema#string
-sql1.resolver.langer.parameter.name.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-
-
-ldap1.classname=com.att.research.xacml.std.pip.engines.ldap.LDAPEngine
-ldap1.name=LDAP PIP
-ldap1.description=The LDAP containing the seven seas sample LDIF data.
-ldap1.issuer=com:att:research:xacml:test:ldap
-ldap1.java.naming.factory.initial=com.sun.jndi.ldap.LdapCtxFactory
-#
-# NOTE: You will have to setup a local LDAP server and load the data\apache-ds-tutorial.ldif before
-# this example will work.
-#
-#ldap1.java.naming.provider.url=ldap://localhost:10389
-ldap1.java.naming.provider.url=ldap://xacml-pip.research.att.com:10389
-#ldap.java.naming.security.principal=
-#ldap.java.naming.security.credentials=
-ldap1.scope=subtree
-
-ldap1.resolvers=dn,ship
-
-ldap1.resolver.dn.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
-ldap1.resolver.dn.name=Domain Names
-ldap1.resolver.dn.description=Find all the dn's for the subject id
-ldap1.resolver.dn.base=o=sevenseas
-ldap1.resolver.dn.base.parameters=
-ldap1.resolver.dn.filter=(|(uid=${uid})(mail=${uid}))
-ldap1.resolver.dn.filter.parameters=uid
-ldap1.resolver.dn.filter.parameters.uid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-ldap1.resolver.dn.filter.parameters.uid.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.dn.filter.parameters.uid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#ldap1.resolver.dn.filter.parameters.uid.issuer=com:att:research:xacml:test:ldap
-ldap1.resolver.dn.filter.view=dn
-ldap1.resolver.dn.filter.view.dn.id=com:att:research:xacml:test:ldap:subject:dn
-ldap1.resolver.dn.filter.view.dn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.dn.filter.view.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.dn.filter.view.dn.issuer=com:att:research:xacml:test:ldap
-
-ldap1.resolver.ship.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
-ldap1.resolver.ship.name=Ship Resolver
-ldap1.resolver.ship.description=This resolves a subject's dn to a ship.
-ldap1.resolver.ship.base=o=sevenseas
-ldap1.resolver.ship.base.parameters=
-ldap1.resolver.ship.filter=uniquemember=${dn}
-ldap1.resolver.ship.filter.parameters=dn
-ldap1.resolver.ship.filter.parameters.dn.id=com:att:research:xacml:test:ldap:subject:dn
-ldap1.resolver.ship.filter.parameters.dn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.ship.filter.parameters.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.parameters.dn.issuer=com:att:research:xacml:test:ldap
-ldap1.resolver.ship.filter.view=cn
-ldap1.resolver.ship.filter.view.cn.id=com:att:research:xacml:test:ldap:subject:ship
-ldap1.resolver.ship.filter.view.cn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.ship.filter.view.cn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.view.cn.issuer=com:att:research:xacml:test:ldap
-
diff --git a/openaz-xacml-pap-rest/pdps/configurable-csv/xacml.pip.properties b/openaz-xacml-pap-rest/pdps/configurable-csv/xacml.pip.properties
index ebd0904..2431eca 100755
--- a/openaz-xacml-pap-rest/pdps/configurable-csv/xacml.pip.properties
+++ b/openaz-xacml-pap-rest/pdps/configurable-csv/xacml.pip.properties
@@ -2,14 +2,10 @@
 #
 xacml.pip.engines=csv1,csv2
 
-ATTWebPhone.classname=com.att.research.xacmlatt.pip.webphone.PIPEngineATTWebphone
-CSO.classname=com.att.research.xacmlatt.pip.cso.PIPEngineCSOCookie
-CSO.mode=DEVL
-
-csv1.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
+csv1.classname=org.apache.openaz.xacml.std.pip.engines.csv.CSVEngine
 csv1.name=Master
 csv1.description=Sean Lahman Basebase stats - Player names, DOB, and biographical info
-csv1.issuer=com:att:research:xacml:test:csv
+csv1.issuer=org.apache.openaz:xacml:test:csv
 csv1.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Master.txt
 csv1.maxsize=500000
 csv1.delimiter=,
@@ -18,42 +14,42 @@
 
 csv1.resolvers=data
 
-csv1.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
+csv1.resolver.data.classname=org.apache.openaz.xacml.std.pip.engines.csv.ConfigurableCSVResolver
 csv1.resolver.data.name=Player Resolver
 csv1.resolver.data.description=This resolver finds player information in the Master table.
 csv1.resolver.data.fields=firstname,lastname,deathyear,deathmonth,deathday,debut,finalgame
 csv1.resolver.data.field.firstname.column=16
-csv1.resolver.data.field.firstname.id=com:att:research:xacml:test:csv:subject:firstname
+csv1.resolver.data.field.firstname.id=org.apache.openaz:xacml:test:csv:subject:firstname
 csv1.resolver.data.field.firstname.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.field.firstname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.lastname.column=17
-csv1.resolver.data.field.lastname.id=com:att:research:xacml:test:csv:subject:lastname
+csv1.resolver.data.field.lastname.id=org.apache.openaz:xacml:test:csv:subject:lastname
 csv1.resolver.data.field.lastname.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.field.lastname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathyear.column=10
-csv1.resolver.data.field.deathyear.id=com:att:research:xacml:test:csv:subject:deathyear
+csv1.resolver.data.field.deathyear.id=org.apache.openaz:xacml:test:csv:subject:deathyear
 csv1.resolver.data.field.deathyear.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathyear.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathmonth.column=11
-csv1.resolver.data.field.deathmonth.id=com:att:research:xacml:test:csv:subject:deathmonth
+csv1.resolver.data.field.deathmonth.id=org.apache.openaz:xacml:test:csv:subject:deathmonth
 csv1.resolver.data.field.deathmonth.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathmonth.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathday.column=12
-csv1.resolver.data.field.deathday.id=com:att:research:xacml:test:csv:subject:deathday
+csv1.resolver.data.field.deathday.id=org.apache.openaz:xacml:test:csv:subject:deathday
 csv1.resolver.data.field.deathday.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathday.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.debut.column=25
-csv1.resolver.data.field.debut.id=com:att:research:xacml:test:csv:subject:debut
+csv1.resolver.data.field.debut.id=org.apache.openaz:xacml:test:csv:subject:debut
 csv1.resolver.data.field.debut.datatype=http://www.w3.org/2001/XMLSchema#date
 csv1.resolver.data.field.debut.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.finalgame.column=26
-csv1.resolver.data.field.finalgame.id=com:att:research:xacml:test:csv:subject:finalgame
+csv1.resolver.data.field.finalgame.id=org.apache.openaz:xacml:test:csv:subject:finalgame
 csv1.resolver.data.field.finalgame.datatype=http://www.w3.org/2001/XMLSchema#date
 csv1.resolver.data.field.finalgame.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
@@ -63,7 +59,7 @@
 csv1.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
-csv2.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
+csv2.classname=org.apache.openaz.xacml.std.pip.engines.csv.CSVEngine
 csv2.name=Appearances
 csv2.description=Sean Lahman Basebase stats - Player appearances for a team in a given year.
 #csv2.issuer=
@@ -75,153 +71,18 @@
 
 csv2.resolvers=data
 
-csv2.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
+csv2.resolver.data.classname=org.apache.openaz.xacml.std.pip.engines.csv.ConfigurableCSVResolver
 csv2.resolver.data.name=Appearance Resolver
 csv2.resolver.data.description=This resolver returns all the appearances for a player from the appearance table.
 csv2.resolver.data.fields=appearance
 csv2.resolver.data.field.appearance.column=0
-csv2.resolver.data.field.appearance.id=com:att:research:xacml:test:csv:subject:appearance
+csv2.resolver.data.field.appearance.id=org.apache.openaz:xacml:test:csv:subject:appearance
 csv2.resolver.data.field.appearance.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv2.resolver.data.field.appearance.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-csv2.resolver.data.field.appearance.issuer=com:att:research:xacml:test:csv
+csv2.resolver.data.field.appearance.issuer=org.apache.openaz:xacml:test:csv
 
 csv2.resolver.data.parameters=playerid
 csv2.resolver.data.parameter.playerid.column=3
 csv2.resolver.data.parameter.playerid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
 csv2.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
 csv2.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#csv1.resolver.data.parameter.playerid.issuer=
-
-hyper1.classname=com.att.research.xacml.std.pip.engines.csv.HyperCSVEngine
-hyper1.name=World Marriage Age Limits
-hyper1.description=Minimum age for female/male marriages with or without their parental consent.
-hyper1.source=../XACML-TEST/testsets/pip/configurable-csv-hyper/marriage.csv
-hyper1.target=marriage
-hyper1.definition=country VARCHAR(80) PRIMARY KEY, wofemale INT, womale INT, wfemale INT, wmale INT, year INT, source VARCHAR(20)
-
-hyper1.resolvers=age_consent
-
-hyper1.resolver.age_consent.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
-hyper1.resolver.age_consent.name=Ages
-hyper1.resolver.age_consent.description=This returns all the age's for consent or no consent for a country.
-hyper1.resolver.age_consent.select=SELECT wofemale,womale,wfemale,wmale FROM marriage WHERE country=?
-hyper1.resolver.age_consent.fields=wofemale,womale,wfemale,wmale
-
-hyper1.resolver.age_consent.field.wofemale.id=com:att:research:xacml:test:csv:country:no-consent:female
-hyper1.resolver.age_consent.field.wofemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wofemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wofemale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.field.womale.id=com:att:research:xacml:test:csv:country:no-consent:male
-hyper1.resolver.age_consent.field.womale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.womale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.womale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.field.wfemale.id=com:att:research:xacml:test:csv:country:consent:female
-hyper1.resolver.age_consent.field.wfemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wfemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wfemale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.field.wmale.id=com:att:research:xacml:test:csv:country:consent:male
-hyper1.resolver.age_consent.field.wmale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wmale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wmale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.parameters=country
-hyper1.resolver.age_consent.parameter.country.id=com:att:research:xacml:test:csv:country:name
-hyper1.resolver.age_consent.parameter.country.datatype=http://www.w3.org/2001/XMLSchema#string
-hyper1.resolver.age_consent.parameter.country.category=com:att:research:xacml:test:csv:category:country
-#hyper1.resolver.age_consent.parameter.country.issuer=
-
-sql1.classname=com.att.research.xacml.std.pip.engines.jdbc.JDBCEngine
-sql1.name=World
-sql1.description=World Database from MySQL website. Copyright Statistics Finland, http://www.stat.fi/worldinfigures.
-# This will be the default issuer for the resolvers. NOTE: Issuer only used for attributes provided by the engine.
-sql1.issuer=com:att:research:xacml:test:sql
-#
-# This is the configuration for JDBC. You will have to setup the database and run the data\world*.sql script to
-# create the tables and load the data. 
-#
-sql1.type=jdbc
-sql1.jdbc.driver=org.postgresql.Driver
-#sql1.jdbc.url=jdbc:postgresql://localhost:5432/world
-#sql1.jdbc.conn.user=sa
-#sql1.jdbc.conn.password=
-sql1.jdbc.url=jdbc:postgresql://xacml-pip.research.att.com:5432/world
-sql1.jdbc.conn.user=pip
-sql1.jdbc.conn.password=p1pUs3r
-#
-# This is the configuration for JNDI datasource.
-#
-#sql1.type=jndi
-#sql1.datasource=jdbc/xacml
-
-sql1.resolvers=langer
-
-sql1.resolver.langer.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
-sql1.resolver.langer.name=Language
-sql1.resolver.langer.description=This returns the language for a city.
-sql1.resolver.langer.select=SELECT language FROM city INNER JOIN countrylanguage ON city.countrycode = countrylanguage.countrycode WHERE name=?
-sql1.resolver.langer.fields=language
-sql1.resolver.langer.field.language.id=com:att:research:xacml:test:sql:resource:city:language
-sql1.resolver.langer.field.language.datatype=http://www.w3.org/2001/XMLSchema#string
-sql1.resolver.langer.field.language.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-#You can override the default issuer that is set in the JDBCEngine definition if you want.
-#sql1.resolver.langer.field.language.issuer=com:att:research:xacml:test:sql
-sql1.resolver.langer.parameters=name
-sql1.resolver.langer.parameter.name.id=urn:oasis:names:tc:xacml:1.0:resource:resource-id
-sql1.resolver.langer.parameter.name.datatype=http://www.w3.org/2001/XMLSchema#string
-sql1.resolver.langer.parameter.name.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-
-
-ldap1.classname=com.att.research.xacml.std.pip.engines.ldap.LDAPEngine
-ldap1.name=LDAP PIP
-ldap1.description=The LDAP containing the seven seas sample LDIF data.
-ldap1.issuer=com:att:research:xacml:test:ldap
-ldap1.java.naming.factory.initial=com.sun.jndi.ldap.LdapCtxFactory
-#
-# NOTE: You will have to setup a local LDAP server and load the data\apache-ds-tutorial.ldif before
-# this example will work.
-#
-#ldap1.java.naming.provider.url=ldap://localhost:10389
-ldap1.java.naming.provider.url=ldap://xacml-pip.research.att.com:10389
-#ldap.java.naming.security.principal=
-#ldap.java.naming.security.credentials=
-ldap1.scope=subtree
-
-ldap1.resolvers=dn,ship
-
-ldap1.resolver.dn.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
-ldap1.resolver.dn.name=Domain Names
-ldap1.resolver.dn.description=Find all the dn's for the subject id
-ldap1.resolver.dn.base=o=sevenseas
-ldap1.resolver.dn.base.parameters=
-ldap1.resolver.dn.filter=(|(uid=${uid})(mail=${uid}))
-ldap1.resolver.dn.filter.parameters=uid
-ldap1.resolver.dn.filter.parameters.uid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-ldap1.resolver.dn.filter.parameters.uid.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.dn.filter.parameters.uid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#ldap1.resolver.dn.filter.parameters.uid.issuer=com:att:research:xacml:test:ldap
-ldap1.resolver.dn.filter.view=dn
-ldap1.resolver.dn.filter.view.dn.id=com:att:research:xacml:test:ldap:subject:dn
-ldap1.resolver.dn.filter.view.dn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.dn.filter.view.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.dn.filter.view.dn.issuer=com:att:research:xacml:test:ldap
-
-ldap1.resolver.ship.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
-ldap1.resolver.ship.name=Ship Resolver
-ldap1.resolver.ship.description=This resolves a subject's dn to a ship.
-ldap1.resolver.ship.base=o=sevenseas
-ldap1.resolver.ship.base.parameters=
-ldap1.resolver.ship.filter=uniquemember=${dn}
-ldap1.resolver.ship.filter.parameters=dn
-ldap1.resolver.ship.filter.parameters.dn.id=com:att:research:xacml:test:ldap:subject:dn
-ldap1.resolver.ship.filter.parameters.dn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.ship.filter.parameters.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.parameters.dn.issuer=com:att:research:xacml:test:ldap
-ldap1.resolver.ship.filter.view=cn
-ldap1.resolver.ship.filter.view.cn.id=com:att:research:xacml:test:ldap:subject:ship
-ldap1.resolver.ship.filter.view.cn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.ship.filter.view.cn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.view.cn.issuer=com:att:research:xacml:test:ldap
-
diff --git a/openaz-xacml-pap-rest/pdps/configurable-ldap/xacml.pip.properties b/openaz-xacml-pap-rest/pdps/configurable-ldap/xacml.pip.properties
index deb58b4..2dc153c 100755
--- a/openaz-xacml-pap-rest/pdps/configurable-ldap/xacml.pip.properties
+++ b/openaz-xacml-pap-rest/pdps/configurable-ldap/xacml.pip.properties
@@ -2,182 +2,10 @@
 #
 xacml.pip.engines=ldap1
 
-ATTWebPhone.classname=com.att.research.xacmlatt.pip.webphone.PIPEngineATTWebphone
-CSO.classname=com.att.research.xacmlatt.pip.cso.PIPEngineCSOCookie
-CSO.mode=DEVL
-
-csv1.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
-csv1.name=Master
-csv1.description=Sean Lahman Basebase stats - Player names, DOB, and biographical info
-csv1.issuer=com:att:research:xacml:test:csv
-csv1.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Master.txt
-csv1.maxsize=4000000
-csv1.delimiter=,
-csv1.quote="
-csv1.skip=0
-
-csv1.resolvers=data
-
-csv1.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
-csv1.resolver.data.name=Player Resolver
-csv1.resolver.data.description=This resolver finds player information in the Master table.
-csv1.resolver.data.fields=firstname,lastname,deathyear,deathmonth,deathday,debut,finalgame
-csv1.resolver.data.field.firstname.column=16
-csv1.resolver.data.field.firstname.id=com:att:research:xacml:test:csv:subject:firstname
-csv1.resolver.data.field.firstname.datatype=http://www.w3.org/2001/XMLSchema#string
-csv1.resolver.data.field.firstname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.lastname.column=17
-csv1.resolver.data.field.lastname.id=com:att:research:xacml:test:csv:subject:lastname
-csv1.resolver.data.field.lastname.datatype=http://www.w3.org/2001/XMLSchema#string
-csv1.resolver.data.field.lastname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.deathyear.column=10
-csv1.resolver.data.field.deathyear.id=com:att:research:xacml:test:csv:subject:deathyear
-csv1.resolver.data.field.deathyear.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv1.resolver.data.field.deathyear.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.deathmonth.column=11
-csv1.resolver.data.field.deathmonth.id=com:att:research:xacml:test:csv:subject:deathmonth
-csv1.resolver.data.field.deathmonth.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv1.resolver.data.field.deathmonth.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.deathday.column=12
-csv1.resolver.data.field.deathday.id=com:att:research:xacml:test:csv:subject:deathday
-csv1.resolver.data.field.deathday.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv1.resolver.data.field.deathday.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.debut.column=25
-csv1.resolver.data.field.debut.id=com:att:research:xacml:test:csv:subject:debut
-csv1.resolver.data.field.debut.datatype=http://www.w3.org/2001/XMLSchema#date
-csv1.resolver.data.field.debut.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.finalgame.column=26
-csv1.resolver.data.field.finalgame.id=com:att:research:xacml:test:csv:subject:finalgame
-csv1.resolver.data.field.finalgame.datatype=http://www.w3.org/2001/XMLSchema#date
-csv1.resolver.data.field.finalgame.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.parameters=playerid
-csv1.resolver.data.parameter.playerid.column=1
-csv1.resolver.data.parameter.playerid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-csv1.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
-csv1.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv2.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
-csv2.name=Appearances
-csv2.description=Sean Lahman Basebase stats - Player appearances for a team in a given year.
-#csv2.issuer=
-csv2.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Appearances.txt
-csv2.maxsize=4000000
-csv2.delimiter=,
-csv2.quote="
-csv2.skip=0
-
-csv2.resolvers=data
-
-csv2.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
-csv2.resolver.data.name=Appearance Resolver
-csv2.resolver.data.description=This resolver returns all the appearances for a player from the appearance table.
-csv2.resolver.data.fields=appearance
-csv2.resolver.data.field.appearance.column=0
-csv2.resolver.data.field.appearance.id=com:att:research:xacml:test:csv:subject:appearance
-csv2.resolver.data.field.appearance.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv2.resolver.data.field.appearance.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-csv2.resolver.data.field.appearance.issuer=com:att:research:xacml:test:csv
-
-csv2.resolver.data.parameters=playerid
-csv2.resolver.data.parameter.playerid.column=3
-csv2.resolver.data.parameter.playerid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-csv2.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
-csv2.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#csv1.resolver.data.parameter.playerid.issuer=
-
-hyper1.classname=com.att.research.xacml.std.pip.engines.csv.HyperCSVEngine
-hyper1.name=World Marriage Age Limits
-hyper1.description=Minimum age for female/male marriages with or without their parental consent.
-hyper1.source=../XACML-TEST/testsets/pip/configurable-csv-hyper/marriage.csv
-hyper1.target=marriage
-hyper1.definition=country VARCHAR(80) PRIMARY KEY, wofemale INT, womale INT, wfemale INT, wmale INT, year INT, source VARCHAR(20)
-
-hyper1.resolvers=age_consent
-
-hyper1.resolver.age_consent.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
-hyper1.resolver.age_consent.name=Ages
-hyper1.resolver.age_consent.description=This returns all the age's for consent or no consent for a country.
-hyper1.resolver.age_consent.select=SELECT wofemale,womale,wfemale,wmale FROM marriage WHERE country=?
-hyper1.resolver.age_consent.fields=wofemale,womale,wfemale,wmale
-
-hyper1.resolver.age_consent.field.wofemale.id=com:att:research:xacml:test:csv:country:no-consent:female
-hyper1.resolver.age_consent.field.wofemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wofemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wofemale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.field.womale.id=com:att:research:xacml:test:csv:country:no-consent:male
-hyper1.resolver.age_consent.field.womale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.womale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.womale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.field.wfemale.id=com:att:research:xacml:test:csv:country:consent:female
-hyper1.resolver.age_consent.field.wfemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wfemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wfemale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.field.wmale.id=com:att:research:xacml:test:csv:country:consent:male
-hyper1.resolver.age_consent.field.wmale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wmale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wmale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.parameters=country
-hyper1.resolver.age_consent.parameter.country.id=com:att:research:xacml:test:csv:country:name
-hyper1.resolver.age_consent.parameter.country.datatype=http://www.w3.org/2001/XMLSchema#string
-hyper1.resolver.age_consent.parameter.country.category=com:att:research:xacml:test:csv:category:country
-#hyper1.resolver.age_consent.parameter.country.issuer=
-
-sql1.classname=com.att.research.xacml.std.pip.engines.jdbc.JDBCEngine
-sql1.name=World
-sql1.description=World Database from MySQL website. Copyright Statistics Finland, http://www.stat.fi/worldinfigures.
-# This will be the default issuer for the resolvers. NOTE: Issuer only used for attributes provided by the engine.
-sql1.issuer=com:att:research:xacml:test:sql
-#
-# This is the configuration for JDBC. You will have to setup the database and run the data\world*.sql script to
-# create the tables and load the data. 
-#
-sql1.type=jdbc
-sql1.jdbc.driver=org.postgresql.Driver
-#sql1.jdbc.url=jdbc:postgresql://localhost:5432/world
-#sql1.jdbc.conn.user=sa
-#sql1.jdbc.conn.password=
-sql1.jdbc.url=jdbc:postgresql://xacml-pip.research.att.com:5432/world
-sql1.jdbc.conn.user=pip
-sql1.jdbc.conn.password=p1pUs3r
-#
-# This is the configuration for JNDI datasource.
-#
-#sql1.type=jndi
-#sql1.datasource=jdbc/xacml
-
-sql1.resolvers=langer
-
-sql1.resolver.langer.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
-sql1.resolver.langer.name=Language
-sql1.resolver.langer.description=This returns the language for a city.
-sql1.resolver.langer.select=SELECT language FROM city INNER JOIN countrylanguage ON city.countrycode = countrylanguage.countrycode WHERE name=?
-sql1.resolver.langer.fields=language
-sql1.resolver.langer.field.language.id=com:att:research:xacml:test:sql:resource:city:language
-sql1.resolver.langer.field.language.datatype=http://www.w3.org/2001/XMLSchema#string
-sql1.resolver.langer.field.language.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-#You can override the default issuer that is set in the JDBCEngine definition if you want.
-#sql1.resolver.langer.field.language.issuer=com:att:research:xacml:test:sql
-sql1.resolver.langer.parameters=name
-sql1.resolver.langer.parameter.name.id=urn:oasis:names:tc:xacml:1.0:resource:resource-id
-sql1.resolver.langer.parameter.name.datatype=http://www.w3.org/2001/XMLSchema#string
-sql1.resolver.langer.parameter.name.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-
-
-ldap1.classname=com.att.research.xacml.std.pip.engines.ldap.LDAPEngine
+ldap1.classname=org.apache.openaz.xacml.std.pip.engines.ldap.LDAPEngine
 ldap1.name=LDAP PIP
 ldap1.description=The LDAP containing the seven seas sample LDIF data.
-ldap1.issuer=com:att:research:xacml:test:ldap
+ldap1.issuer=org.apache.openaz:xacml:test:ldap
 ldap1.java.naming.factory.initial=com.sun.jndi.ldap.LdapCtxFactory
 #
 # NOTE: You will have to setup a local LDAP server and load the data\apache-ds-tutorial.ldif before
@@ -191,7 +19,7 @@
 
 ldap1.resolvers=dn,ship
 
-ldap1.resolver.dn.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
+ldap1.resolver.dn.classname=org.apache.openaz.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
 ldap1.resolver.dn.name=Domain Names
 ldap1.resolver.dn.description=Find all the dn's for the subject id
 ldap1.resolver.dn.base=o=sevenseas
@@ -201,27 +29,27 @@
 ldap1.resolver.dn.filter.parameters.uid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
 ldap1.resolver.dn.filter.parameters.uid.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.dn.filter.parameters.uid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#ldap1.resolver.dn.filter.parameters.uid.issuer=com:att:research:xacml:test:ldap
+#ldap1.resolver.dn.filter.parameters.uid.issuer=org.apache.openaz:xacml:test:ldap
 ldap1.resolver.dn.filter.view=dn
-ldap1.resolver.dn.filter.view.dn.id=com:att:research:xacml:test:ldap:subject:dn
+ldap1.resolver.dn.filter.view.dn.id=org.apache.openaz:xacml:test:ldap:subject:dn
 ldap1.resolver.dn.filter.view.dn.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.dn.filter.view.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.dn.filter.view.dn.issuer=com:att:research:xacml:test:ldap
+ldap1.resolver.dn.filter.view.dn.issuer=org.apache.openaz:xacml:test:ldap
 
-ldap1.resolver.ship.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
+ldap1.resolver.ship.classname=org.apache.openaz.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
 ldap1.resolver.ship.name=Ship Resolver
 ldap1.resolver.ship.description=This resolves a subject's dn to a ship.
 ldap1.resolver.ship.base=o=sevenseas
 ldap1.resolver.ship.base.parameters=
 ldap1.resolver.ship.filter=uniquemember=${dn}
 ldap1.resolver.ship.filter.parameters=dn
-ldap1.resolver.ship.filter.parameters.dn.id=com:att:research:xacml:test:ldap:subject:dn
+ldap1.resolver.ship.filter.parameters.dn.id=org.apache.openaz:xacml:test:ldap:subject:dn
 ldap1.resolver.ship.filter.parameters.dn.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.ship.filter.parameters.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.parameters.dn.issuer=com:att:research:xacml:test:ldap
+ldap1.resolver.ship.filter.parameters.dn.issuer=org.apache.openaz:xacml:test:ldap
 ldap1.resolver.ship.filter.view=cn
-ldap1.resolver.ship.filter.view.cn.id=com:att:research:xacml:test:ldap:subject:ship
+ldap1.resolver.ship.filter.view.cn.id=org.apache.openaz:xacml:test:ldap:subject:ship
 ldap1.resolver.ship.filter.view.cn.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.ship.filter.view.cn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.view.cn.issuer=com:att:research:xacml:test:ldap
+ldap1.resolver.ship.filter.view.cn.issuer=org.apache.openaz:xacml:test:ldap
 
diff --git a/openaz-xacml-pap-rest/pdps/configurable-sql/xacml.pip.properties b/openaz-xacml-pap-rest/pdps/configurable-sql/xacml.pip.properties
index dcfd4c8..c73d7fe 100755
--- a/openaz-xacml-pap-rest/pdps/configurable-sql/xacml.pip.properties
+++ b/openaz-xacml-pap-rest/pdps/configurable-sql/xacml.pip.properties
@@ -2,142 +2,11 @@
 #
 xacml.pip.engines=sql1
 
-ATTWebPhone.classname=com.att.research.xacmlatt.pip.webphone.PIPEngineATTWebphone
-CSO.classname=com.att.research.xacmlatt.pip.cso.PIPEngineCSOCookie
-CSO.mode=DEVL
-
-csv1.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
-csv1.name=Master
-csv1.description=Sean Lahman Basebase stats - Player names, DOB, and biographical info
-csv1.issuer=com:att:research:xacml:test:csv
-csv1.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Master.txt
-csv1.maxsize=4000000
-csv1.delimiter=,
-csv1.quote="
-csv1.skip=0
-
-csv1.resolvers=data
-
-csv1.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
-csv1.resolver.data.name=Player Resolver
-csv1.resolver.data.description=This resolver finds player information in the Master table.
-csv1.resolver.data.fields=firstname,lastname,deathyear,deathmonth,deathday,debut,finalgame
-csv1.resolver.data.field.firstname.column=16
-csv1.resolver.data.field.firstname.id=com:att:research:xacml:test:csv:subject:firstname
-csv1.resolver.data.field.firstname.datatype=http://www.w3.org/2001/XMLSchema#string
-csv1.resolver.data.field.firstname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.lastname.column=17
-csv1.resolver.data.field.lastname.id=com:att:research:xacml:test:csv:subject:lastname
-csv1.resolver.data.field.lastname.datatype=http://www.w3.org/2001/XMLSchema#string
-csv1.resolver.data.field.lastname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.deathyear.column=10
-csv1.resolver.data.field.deathyear.id=com:att:research:xacml:test:csv:subject:deathyear
-csv1.resolver.data.field.deathyear.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv1.resolver.data.field.deathyear.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.deathmonth.column=11
-csv1.resolver.data.field.deathmonth.id=com:att:research:xacml:test:csv:subject:deathmonth
-csv1.resolver.data.field.deathmonth.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv1.resolver.data.field.deathmonth.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.deathday.column=12
-csv1.resolver.data.field.deathday.id=com:att:research:xacml:test:csv:subject:deathday
-csv1.resolver.data.field.deathday.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv1.resolver.data.field.deathday.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.debut.column=25
-csv1.resolver.data.field.debut.id=com:att:research:xacml:test:csv:subject:debut
-csv1.resolver.data.field.debut.datatype=http://www.w3.org/2001/XMLSchema#date
-csv1.resolver.data.field.debut.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.field.finalgame.column=26
-csv1.resolver.data.field.finalgame.id=com:att:research:xacml:test:csv:subject:finalgame
-csv1.resolver.data.field.finalgame.datatype=http://www.w3.org/2001/XMLSchema#date
-csv1.resolver.data.field.finalgame.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv1.resolver.data.parameters=playerid
-csv1.resolver.data.parameter.playerid.column=1
-csv1.resolver.data.parameter.playerid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-csv1.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
-csv1.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-
-csv2.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
-csv2.name=Appearances
-csv2.description=Sean Lahman Basebase stats - Player appearances for a team in a given year.
-#csv2.issuer=
-csv2.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Appearances.txt
-csv2.maxsize=4000000
-csv2.delimiter=,
-csv2.quote="
-csv2.skip=0
-
-csv2.resolvers=data
-
-csv2.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
-csv2.resolver.data.name=Appearance Resolver
-csv2.resolver.data.description=This resolver returns all the appearances for a player from the appearance table.
-csv2.resolver.data.fields=appearance
-csv2.resolver.data.field.appearance.column=0
-csv2.resolver.data.field.appearance.id=com:att:research:xacml:test:csv:subject:appearance
-csv2.resolver.data.field.appearance.datatype=http://www.w3.org/2001/XMLSchema#integer
-csv2.resolver.data.field.appearance.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-csv2.resolver.data.field.appearance.issuer=com:att:research:xacml:test:csv
-
-csv2.resolver.data.parameters=playerid
-csv2.resolver.data.parameter.playerid.column=3
-csv2.resolver.data.parameter.playerid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-csv2.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
-csv2.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#csv1.resolver.data.parameter.playerid.issuer=
-
-hyper1.classname=com.att.research.xacml.std.pip.engines.csv.HyperCSVEngine
-hyper1.name=World Marriage Age Limits
-hyper1.description=Minimum age for female/male marriages with or without their parental consent.
-hyper1.source=../XACML-TEST/testsets/pip/configurable-csv-hyper/marriage.csv
-hyper1.target=marriage
-hyper1.definition=country VARCHAR(80) PRIMARY KEY, wofemale INT, womale INT, wfemale INT, wmale INT, year INT, source VARCHAR(20)
-
-hyper1.resolvers=age_consent
-
-hyper1.resolver.age_consent.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
-hyper1.resolver.age_consent.name=Ages
-hyper1.resolver.age_consent.description=This returns all the age's for consent or no consent for a country.
-hyper1.resolver.age_consent.select=SELECT wofemale,womale,wfemale,wmale FROM marriage WHERE country=?
-hyper1.resolver.age_consent.fields=wofemale,womale,wfemale,wmale
-
-hyper1.resolver.age_consent.field.wofemale.id=com:att:research:xacml:test:csv:country:no-consent:female
-hyper1.resolver.age_consent.field.wofemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wofemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wofemale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.field.womale.id=com:att:research:xacml:test:csv:country:no-consent:male
-hyper1.resolver.age_consent.field.womale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.womale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.womale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.field.wfemale.id=com:att:research:xacml:test:csv:country:consent:female
-hyper1.resolver.age_consent.field.wfemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wfemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wfemale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.field.wmale.id=com:att:research:xacml:test:csv:country:consent:male
-hyper1.resolver.age_consent.field.wmale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wmale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wmale.issuer=com:att:research:xacml:test:csv
-
-hyper1.resolver.age_consent.parameters=country
-hyper1.resolver.age_consent.parameter.country.id=com:att:research:xacml:test:csv:country:name
-hyper1.resolver.age_consent.parameter.country.datatype=http://www.w3.org/2001/XMLSchema#string
-hyper1.resolver.age_consent.parameter.country.category=com:att:research:xacml:test:csv:category:country
-#hyper1.resolver.age_consent.parameter.country.issuer=
-
-sql1.classname=com.att.research.xacml.std.pip.engines.jdbc.JDBCEngine
+sql1.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.JDBCEngine
 sql1.name=World
 sql1.description=World Database from MySQL website. Copyright Statistics Finland, http://www.stat.fi/worldinfigures.
 # This will be the default issuer for the resolvers. NOTE: Issuer only used for attributes provided by the engine.
-sql1.issuer=com:att:research:xacml:test:sql
+sql1.issuer=org.apache.openaz:xacml:test:sql
 #
 # This is the configuration for JDBC. You will have to setup the database and run the data\world*.sql script to
 # create the tables and load the data. 
@@ -158,70 +27,17 @@
 
 sql1.resolvers=langer
 
-sql1.resolver.langer.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
+sql1.resolver.langer.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
 sql1.resolver.langer.name=Language
 sql1.resolver.langer.description=This returns the language for a city.
 sql1.resolver.langer.select=SELECT language FROM city INNER JOIN countrylanguage ON city.countrycode = countrylanguage.countrycode WHERE name=?
 sql1.resolver.langer.fields=language
-sql1.resolver.langer.field.language.id=com:att:research:xacml:test:sql:resource:city:language
+sql1.resolver.langer.field.language.id=org.apache.openaz:xacml:test:sql:resource:city:language
 sql1.resolver.langer.field.language.datatype=http://www.w3.org/2001/XMLSchema#string
 sql1.resolver.langer.field.language.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
 #You can override the default issuer that is set in the JDBCEngine definition if you want.
-#sql1.resolver.langer.field.language.issuer=com:att:research:xacml:test:sql
+#sql1.resolver.langer.field.language.issuer=org.apache.openaz:xacml:test:sql
 sql1.resolver.langer.parameters=name
 sql1.resolver.langer.parameter.name.id=urn:oasis:names:tc:xacml:1.0:resource:resource-id
 sql1.resolver.langer.parameter.name.datatype=http://www.w3.org/2001/XMLSchema#string
 sql1.resolver.langer.parameter.name.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-
-
-ldap1.classname=com.att.research.xacml.std.pip.engines.ldap.LDAPEngine
-ldap1.name=LDAP PIP
-ldap1.description=The LDAP containing the seven seas sample LDIF data.
-ldap1.issuer=com:att:research:xacml:test:ldap
-ldap1.java.naming.factory.initial=com.sun.jndi.ldap.LdapCtxFactory
-#
-# NOTE: You will have to setup a local LDAP server and load the data\apache-ds-tutorial.ldif before
-# this example will work.
-#
-#ldap1.java.naming.provider.url=ldap://localhost:10389
-ldap1.java.naming.provider.url=ldap://xacml-pip.research.att.com:10389
-#ldap.java.naming.security.principal=
-#ldap.java.naming.security.credentials=
-ldap1.scope=subtree
-
-ldap1.resolvers=dn,ship
-
-ldap1.resolver.dn.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
-ldap1.resolver.dn.name=Domain Names
-ldap1.resolver.dn.description=Find all the dn's for the subject id
-ldap1.resolver.dn.base=o=sevenseas
-ldap1.resolver.dn.base.parameters=
-ldap1.resolver.dn.filter=(|(uid=${uid})(mail=${uid}))
-ldap1.resolver.dn.filter.parameters=uid
-ldap1.resolver.dn.filter.parameters.uid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
-ldap1.resolver.dn.filter.parameters.uid.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.dn.filter.parameters.uid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#ldap1.resolver.dn.filter.parameters.uid.issuer=com:att:research:xacml:test:ldap
-ldap1.resolver.dn.filter.view=dn
-ldap1.resolver.dn.filter.view.dn.id=com:att:research:xacml:test:ldap:subject:dn
-ldap1.resolver.dn.filter.view.dn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.dn.filter.view.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.dn.filter.view.dn.issuer=com:att:research:xacml:test:ldap
-
-ldap1.resolver.ship.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
-ldap1.resolver.ship.name=Ship Resolver
-ldap1.resolver.ship.description=This resolves a subject's dn to a ship.
-ldap1.resolver.ship.base=o=sevenseas
-ldap1.resolver.ship.base.parameters=
-ldap1.resolver.ship.filter=uniquemember=${dn}
-ldap1.resolver.ship.filter.parameters=dn
-ldap1.resolver.ship.filter.parameters.dn.id=com:att:research:xacml:test:ldap:subject:dn
-ldap1.resolver.ship.filter.parameters.dn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.ship.filter.parameters.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.parameters.dn.issuer=com:att:research:xacml:test:ldap
-ldap1.resolver.ship.filter.view=cn
-ldap1.resolver.ship.filter.view.cn.id=com:att:research:xacml:test:ldap:subject:ship
-ldap1.resolver.ship.filter.view.cn.datatype=http://www.w3.org/2001/XMLSchema#string
-ldap1.resolver.ship.filter.view.cn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.view.cn.issuer=com:att:research:xacml:test:ldap
-
diff --git a/openaz-xacml-pap-rest/pdps/default/xacml.pip.properties b/openaz-xacml-pap-rest/pdps/default/xacml.pip.properties
index 4d49be1..680c685 100755
--- a/openaz-xacml-pap-rest/pdps/default/xacml.pip.properties
+++ b/openaz-xacml-pap-rest/pdps/default/xacml.pip.properties
@@ -2,10 +2,10 @@
 #
 xacml.pip.engines=csv1,csv2,hyper1,sql1,ldap1
 
-csv1.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
+csv1.classname=org.apache.openaz.xacml.std.pip.engines.csv.CSVEngine
 csv1.name=Master
 csv1.description=Sean Lahman Basebase stats - Player names, DOB, and biographical info
-csv1.issuer=com:att:research:xacml:test:csv
+csv1.issuer=org.apache.openaz:xacml:test:csv
 csv1.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Master.txt
 csv1.maxsize=500000
 csv1.delimiter=,
@@ -14,42 +14,42 @@
 
 csv1.resolvers=data
 
-csv1.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
+csv1.resolver.data.classname=org.apache.openaz.xacml.std.pip.engines.csv.ConfigurableCSVResolver
 csv1.resolver.data.name=Player Resolver
 csv1.resolver.data.description=This resolver finds player information in the Master table.
 csv1.resolver.data.fields=firstname,lastname,deathyear,deathmonth,deathday,debut,finalgame
 csv1.resolver.data.field.firstname.column=16
-csv1.resolver.data.field.firstname.id=com:att:research:xacml:test:csv:subject:firstname
+csv1.resolver.data.field.firstname.id=org.apache.openaz:xacml:test:csv:subject:firstname
 csv1.resolver.data.field.firstname.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.field.firstname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.lastname.column=17
-csv1.resolver.data.field.lastname.id=com:att:research:xacml:test:csv:subject:lastname
+csv1.resolver.data.field.lastname.id=org.apache.openaz:xacml:test:csv:subject:lastname
 csv1.resolver.data.field.lastname.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.field.lastname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathyear.column=10
-csv1.resolver.data.field.deathyear.id=com:att:research:xacml:test:csv:subject:deathyear
+csv1.resolver.data.field.deathyear.id=org.apache.openaz:xacml:test:csv:subject:deathyear
 csv1.resolver.data.field.deathyear.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathyear.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathmonth.column=11
-csv1.resolver.data.field.deathmonth.id=com:att:research:xacml:test:csv:subject:deathmonth
+csv1.resolver.data.field.deathmonth.id=org.apache.openaz:xacml:test:csv:subject:deathmonth
 csv1.resolver.data.field.deathmonth.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathmonth.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathday.column=12
-csv1.resolver.data.field.deathday.id=com:att:research:xacml:test:csv:subject:deathday
+csv1.resolver.data.field.deathday.id=org.apache.openaz:xacml:test:csv:subject:deathday
 csv1.resolver.data.field.deathday.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathday.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.debut.column=25
-csv1.resolver.data.field.debut.id=com:att:research:xacml:test:csv:subject:debut
+csv1.resolver.data.field.debut.id=org.apache.openaz:xacml:test:csv:subject:debut
 csv1.resolver.data.field.debut.datatype=http://www.w3.org/2001/XMLSchema#date
 csv1.resolver.data.field.debut.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.finalgame.column=26
-csv1.resolver.data.field.finalgame.id=com:att:research:xacml:test:csv:subject:finalgame
+csv1.resolver.data.field.finalgame.id=org.apache.openaz:xacml:test:csv:subject:finalgame
 csv1.resolver.data.field.finalgame.datatype=http://www.w3.org/2001/XMLSchema#date
 csv1.resolver.data.field.finalgame.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
@@ -59,7 +59,7 @@
 csv1.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
-csv2.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
+csv2.classname=org.apache.openaz.xacml.std.pip.engines.csv.CSVEngine
 csv2.name=Appearances
 csv2.description=Sean Lahman Basebase stats - Player appearances for a team in a given year.
 #csv2.issuer=
@@ -71,15 +71,15 @@
 
 csv2.resolvers=data
 
-csv2.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
+csv2.resolver.data.classname=org.apache.openaz.xacml.std.pip.engines.csv.ConfigurableCSVResolver
 csv2.resolver.data.name=Appearance Resolver
 csv2.resolver.data.description=This resolver returns all the appearances for a player from the appearance table.
 csv2.resolver.data.fields=appearance
 csv2.resolver.data.field.appearance.column=0
-csv2.resolver.data.field.appearance.id=com:att:research:xacml:test:csv:subject:appearance
+csv2.resolver.data.field.appearance.id=org.apache.openaz:xacml:test:csv:subject:appearance
 csv2.resolver.data.field.appearance.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv2.resolver.data.field.appearance.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-csv2.resolver.data.field.appearance.issuer=com:att:research:xacml:test:csv
+csv2.resolver.data.field.appearance.issuer=org.apache.openaz:xacml:test:csv
 
 csv2.resolver.data.parameters=playerid
 csv2.resolver.data.parameter.playerid.column=3
@@ -88,7 +88,7 @@
 csv2.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 #csv1.resolver.data.parameter.playerid.issuer=
 
-hyper1.classname=com.att.research.xacml.std.pip.engines.csv.HyperCSVEngine
+hyper1.classname=org.apache.openaz.xacml.std.pip.engines.csv.HyperCSVEngine
 hyper1.name=World Marriage Age Limits
 hyper1.description=Minimum age for female/male marriages with or without their parental consent.
 hyper1.source=../XACML-TEST/testsets/pip/configurable-csv-hyper/marriage.csv
@@ -97,43 +97,43 @@
 
 hyper1.resolvers=age_consent
 
-hyper1.resolver.age_consent.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
+hyper1.resolver.age_consent.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
 hyper1.resolver.age_consent.name=Ages
 hyper1.resolver.age_consent.description=This returns all the age's for consent or no consent for a country.
 hyper1.resolver.age_consent.select=SELECT wofemale,womale,wfemale,wmale FROM marriage WHERE country=?
 hyper1.resolver.age_consent.fields=wofemale,womale,wfemale,wmale
 
-hyper1.resolver.age_consent.field.wofemale.id=com:att:research:xacml:test:csv:country:no-consent:female
+hyper1.resolver.age_consent.field.wofemale.id=org.apache.openaz:xacml:test:csv:country:no-consent:female
 hyper1.resolver.age_consent.field.wofemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wofemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wofemale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wofemale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wofemale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.womale.id=com:att:research:xacml:test:csv:country:no-consent:male
+hyper1.resolver.age_consent.field.womale.id=org.apache.openaz:xacml:test:csv:country:no-consent:male
 hyper1.resolver.age_consent.field.womale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.womale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.womale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.womale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.womale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.wfemale.id=com:att:research:xacml:test:csv:country:consent:female
+hyper1.resolver.age_consent.field.wfemale.id=org.apache.openaz:xacml:test:csv:country:consent:female
 hyper1.resolver.age_consent.field.wfemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wfemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wfemale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wfemale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wfemale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.wmale.id=com:att:research:xacml:test:csv:country:consent:male
+hyper1.resolver.age_consent.field.wmale.id=org.apache.openaz:xacml:test:csv:country:consent:male
 hyper1.resolver.age_consent.field.wmale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wmale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wmale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wmale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wmale.issuer=org.apache.openaz:xacml:test:csv
 
 hyper1.resolver.age_consent.parameters=country
-hyper1.resolver.age_consent.parameter.country.id=com:att:research:xacml:test:csv:country:name
+hyper1.resolver.age_consent.parameter.country.id=org.apache.openaz:xacml:test:csv:country:name
 hyper1.resolver.age_consent.parameter.country.datatype=http://www.w3.org/2001/XMLSchema#string
-hyper1.resolver.age_consent.parameter.country.category=com:att:research:xacml:test:csv:category:country
+hyper1.resolver.age_consent.parameter.country.category=org.apache.openaz:xacml:test:csv:category:country
 #hyper1.resolver.age_consent.parameter.country.issuer=
 
-sql1.classname=com.att.research.xacml.std.pip.engines.jdbc.JDBCEngine
+sql1.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.JDBCEngine
 sql1.name=World
 sql1.description=World Database from MySQL website. Copyright Statistics Finland, http://www.stat.fi/worldinfigures.
 # This will be the default issuer for the resolvers. NOTE: Issuer only used for attributes provided by the engine.
-sql1.issuer=com:att:research:xacml:test:sql
+sql1.issuer=org.apache.openaz:xacml:test:sql
 #
 # This is the configuration for JDBC. You will have to setup the database and run the data\world*.sql script to
 # create the tables and load the data. 
@@ -151,26 +151,26 @@
 
 sql1.resolvers=langer
 
-sql1.resolver.langer.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
+sql1.resolver.langer.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
 sql1.resolver.langer.name=Language
 sql1.resolver.langer.description=This returns the language for a city.
 sql1.resolver.langer.select=SELECT language FROM city INNER JOIN countrylanguage ON city.countrycode = countrylanguage.countrycode WHERE name=?
 sql1.resolver.langer.fields=language
-sql1.resolver.langer.field.language.id=com:att:research:xacml:test:sql:resource:city:language
+sql1.resolver.langer.field.language.id=org.apache.openaz:xacml:test:sql:resource:city:language
 sql1.resolver.langer.field.language.datatype=http://www.w3.org/2001/XMLSchema#string
 sql1.resolver.langer.field.language.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
 #You can override the default issuer that is set in the JDBCEngine definition if you want.
-#sql1.resolver.langer.field.language.issuer=com:att:research:xacml:test:sql
+#sql1.resolver.langer.field.language.issuer=org.apache.openaz:xacml:test:sql
 sql1.resolver.langer.parameters=name
 sql1.resolver.langer.parameter.name.id=urn:oasis:names:tc:xacml:1.0:resource:resource-id
 sql1.resolver.langer.parameter.name.datatype=http://www.w3.org/2001/XMLSchema#string
 sql1.resolver.langer.parameter.name.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
 
 
-ldap1.classname=com.att.research.xacml.std.pip.engines.ldap.LDAPEngine
+ldap1.classname=org.apache.openaz.xacml.std.pip.engines.ldap.LDAPEngine
 ldap1.name=LDAP PIP
 ldap1.description=The LDAP containing the seven seas sample LDIF data.
-ldap1.issuer=com:att:research:xacml:test:ldap
+ldap1.issuer=org.apache.openaz:xacml:test:ldap
 ldap1.java.naming.factory.initial=com.sun.jndi.ldap.LdapCtxFactory
 #
 # NOTE: You will have to setup a local LDAP server and load the data\apache-ds-tutorial.ldif before
@@ -183,7 +183,7 @@
 
 ldap1.resolvers=dn,ship
 
-ldap1.resolver.dn.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
+ldap1.resolver.dn.classname=org.apache.openaz.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
 ldap1.resolver.dn.name=Domain Names
 ldap1.resolver.dn.description=Find all the dn's for the subject id
 ldap1.resolver.dn.base=o=sevenseas
@@ -193,27 +193,27 @@
 ldap1.resolver.dn.filter.parameters.uid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
 ldap1.resolver.dn.filter.parameters.uid.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.dn.filter.parameters.uid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#ldap1.resolver.dn.filter.parameters.uid.issuer=com:att:research:xacml:test:ldap
+#ldap1.resolver.dn.filter.parameters.uid.issuer=org.apache.openaz:xacml:test:ldap
 ldap1.resolver.dn.filter.view=dn
-ldap1.resolver.dn.filter.view.dn.id=com:att:research:xacml:test:ldap:subject:dn
+ldap1.resolver.dn.filter.view.dn.id=org.apache.openaz:xacml:test:ldap:subject:dn
 ldap1.resolver.dn.filter.view.dn.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.dn.filter.view.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.dn.filter.view.dn.issuer=com:att:research:xacml:test:ldap
+ldap1.resolver.dn.filter.view.dn.issuer=org.apache.openaz:xacml:test:ldap
 
-ldap1.resolver.ship.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
+ldap1.resolver.ship.classname=org.apache.openaz.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
 ldap1.resolver.ship.name=Ship Resolver
 ldap1.resolver.ship.description=This resolves a subject's dn to a ship.
 ldap1.resolver.ship.base=o=sevenseas
 ldap1.resolver.ship.base.parameters=
 ldap1.resolver.ship.filter=uniquemember=${dn}
 ldap1.resolver.ship.filter.parameters=dn
-ldap1.resolver.ship.filter.parameters.dn.id=com:att:research:xacml:test:ldap:subject:dn
+ldap1.resolver.ship.filter.parameters.dn.id=org.apache.openaz:xacml:test:ldap:subject:dn
 ldap1.resolver.ship.filter.parameters.dn.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.ship.filter.parameters.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.parameters.dn.issuer=com:att:research:xacml:test:ldap
+ldap1.resolver.ship.filter.parameters.dn.issuer=org.apache.openaz:xacml:test:ldap
 ldap1.resolver.ship.filter.view=cn
-ldap1.resolver.ship.filter.view.cn.id=com:att:research:xacml:test:ldap:subject:ship
+ldap1.resolver.ship.filter.view.cn.id=org.apache.openaz:xacml:test:ldap:subject:ship
 ldap1.resolver.ship.filter.view.cn.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.ship.filter.view.cn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.view.cn.issuer=com:att:research:xacml:test:ldap
+ldap1.resolver.ship.filter.view.cn.issuer=org.apache.openaz:xacml:test:ldap
 
diff --git a/openaz-xacml-pap-rest/pdps/xacml.properties b/openaz-xacml-pap-rest/pdps/xacml.properties
index 8429c20..4143e31 100755
--- a/openaz-xacml-pap-rest/pdps/xacml.properties
+++ b/openaz-xacml-pap-rest/pdps/xacml.properties
@@ -24,4 +24,4 @@
 
 configurable-csv-and-hyper.description=A group whose policies serve both configurable-csv and configurable-csv-hyper requests but not others.
 configurable-csv-and-hyper.name=configurable-csv-and-hyper
-configurable-csv-and-hyper.pdps=
\ No newline at end of file
+configurable-csv-and-hyper.pdps=
diff --git a/openaz-xacml-pap-rest/pom.xml b/openaz-xacml-pap-rest/pom.xml
index fce567e..91e4cdb 100644
--- a/openaz-xacml-pap-rest/pom.xml
+++ b/openaz-xacml-pap-rest/pom.xml
@@ -18,18 +18,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>openaz</artifactId>
-        <groupId>org.openliberty.openaz</groupId>
+        <groupId>org.apache.openaz</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openaz-xacml-pap-rest</artifactId>
     <dependencies>
         <dependency>
-            <groupId>org.openliberty.openaz</groupId>
+            <groupId>org.apache.openaz</groupId>
             <artifactId>openaz-xacml</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openliberty.openaz</groupId>
+            <groupId>org.apache.openaz</groupId>
             <artifactId>openaz-xacml-rest</artifactId>
         </dependency>
         <dependency>
diff --git a/openaz-xacml-pap-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPapServlet.java b/openaz-xacml-pap-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPapServlet.java
index 6ddadab..3e09e1a 100644
--- a/openaz-xacml-pap-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPapServlet.java
+++ b/openaz-xacml-pap-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPapServlet.java
@@ -28,21 +28,24 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacml.rest;
+package org.apache.openaz.xacml.rest;
 
 
-import com.att.research.xacml.api.pap.*;
-import com.att.research.xacml.std.pap.StdPDP;
-import com.att.research.xacml.std.pap.StdPDPGroup;
-import com.att.research.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
-import com.att.research.xacml.std.pap.StdPDPStatus;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.XACMLProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Splitter;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.pap.*;
+import org.apache.openaz.xacml.rest.XACMLRest;
+import org.apache.openaz.xacml.rest.XACMLRestProperties;
+import org.apache.openaz.xacml.std.pap.StdPDP;
+import org.apache.openaz.xacml.std.pap.StdPDPGroup;
+import org.apache.openaz.xacml.std.pap.StdPDPStatus;
+import org.apache.openaz.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
@@ -52,6 +55,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/openaz-xacml-pap-rest/xacml.pap.properties b/openaz-xacml-pap-rest/xacml.pap.properties
index 05fc0c5..118cbee 100755
--- a/openaz-xacml-pap-rest/xacml.pap.properties
+++ b/openaz-xacml-pap-rest/xacml.pap.properties
@@ -1,7 +1,7 @@
 #
 # This is our factory that will create our engine
 #
-xacml.PAP.papEngineFactory=com.att.research.xacml.std.pap.StdEngineFactory
+xacml.PAP.papEngineFactory=org.apache.openaz.xacml.std.pap.StdEngineFactory
 
 #
 # Where we store our PAP PDP Group/Node information
@@ -32,4 +32,4 @@
 #
 # Heartbeat connection timeout (in milliseconds)
 #
-xacml.rest.pap.heartbeat.timeout=10000
\ No newline at end of file
+xacml.rest.pap.heartbeat.timeout=10000
diff --git a/openaz-xacml-pdp-rest/config/xacml.pip.properties b/openaz-xacml-pdp-rest/config/xacml.pip.properties
index 0c16eb3..3d67d02 100755
--- a/openaz-xacml-pdp-rest/config/xacml.pip.properties
+++ b/openaz-xacml-pdp-rest/config/xacml.pip.properties
@@ -2,10 +2,10 @@
 #
 xacml.pip.engines=csv1,csv2,hyper1,sql1,ldap1
 
-csv1.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
+csv1.classname=org.apache.openaz.xacml.std.pip.engines.csv.CSVEngine
 csv1.name=Master
 csv1.description=Sean Lahman Basebase stats - Player names, DOB, and biographical info
-csv1.issuer=com:att:research:xacml:test:csv
+csv1.issuer=org.apache.openaz:xacml:test:csv
 csv1.source=../XACML-TEST/testsets/pip/configurable-csv/adminDB/Master.txt
 csv1.maxsize=4000000
 csv1.delimiter=,
@@ -14,42 +14,42 @@
 
 csv1.resolvers=data
 
-csv1.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
+csv1.resolver.data.classname=org.apache.openaz.xacml.std.pip.engines.csv.ConfigurableCSVResolver
 csv1.resolver.data.name=Player Resolver
 csv1.resolver.data.description=This resolver finds player information in the Master table.
 csv1.resolver.data.fields=firstname,lastname,deathyear,deathmonth,deathday,debut,finalgame
 csv1.resolver.data.field.firstname.column=16
-csv1.resolver.data.field.firstname.id=com:att:research:xacml:test:csv:subject:firstname
+csv1.resolver.data.field.firstname.id=org.apache.openaz:xacml:test:csv:subject:firstname
 csv1.resolver.data.field.firstname.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.field.firstname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.lastname.column=17
-csv1.resolver.data.field.lastname.id=com:att:research:xacml:test:csv:subject:lastname
+csv1.resolver.data.field.lastname.id=org.apache.openaz:xacml:test:csv:subject:lastname
 csv1.resolver.data.field.lastname.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.field.lastname.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathyear.column=10
-csv1.resolver.data.field.deathyear.id=com:att:research:xacml:test:csv:subject:deathyear
+csv1.resolver.data.field.deathyear.id=org.apache.openaz:xacml:test:csv:subject:deathyear
 csv1.resolver.data.field.deathyear.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathyear.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathmonth.column=11
-csv1.resolver.data.field.deathmonth.id=com:att:research:xacml:test:csv:subject:deathmonth
+csv1.resolver.data.field.deathmonth.id=org.apache.openaz:xacml:test:csv:subject:deathmonth
 csv1.resolver.data.field.deathmonth.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathmonth.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.deathday.column=12
-csv1.resolver.data.field.deathday.id=com:att:research:xacml:test:csv:subject:deathday
+csv1.resolver.data.field.deathday.id=org.apache.openaz:xacml:test:csv:subject:deathday
 csv1.resolver.data.field.deathday.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv1.resolver.data.field.deathday.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.debut.column=25
-csv1.resolver.data.field.debut.id=com:att:research:xacml:test:csv:subject:debut
+csv1.resolver.data.field.debut.id=org.apache.openaz:xacml:test:csv:subject:debut
 csv1.resolver.data.field.debut.datatype=http://www.w3.org/2001/XMLSchema#date
 csv1.resolver.data.field.debut.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
 csv1.resolver.data.field.finalgame.column=26
-csv1.resolver.data.field.finalgame.id=com:att:research:xacml:test:csv:subject:finalgame
+csv1.resolver.data.field.finalgame.id=org.apache.openaz:xacml:test:csv:subject:finalgame
 csv1.resolver.data.field.finalgame.datatype=http://www.w3.org/2001/XMLSchema#date
 csv1.resolver.data.field.finalgame.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
@@ -59,7 +59,7 @@
 csv1.resolver.data.parameter.playerid.datatype=http://www.w3.org/2001/XMLSchema#string
 csv1.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 
-csv2.classname=com.att.research.xacml.std.pip.engines.csv.CSVEngine
+csv2.classname=org.apache.openaz.xacml.std.pip.engines.csv.CSVEngine
 csv2.name=Appearances
 csv2.description=Sean Lahman Basebase stats - Player appearances for a team in a given year.
 #csv2.issuer=
@@ -71,15 +71,15 @@
 
 csv2.resolvers=data
 
-csv2.resolver.data.classname=com.att.research.xacml.std.pip.engines.csv.ConfigurableCSVResolver
+csv2.resolver.data.classname=org.apache.openaz.xacml.std.pip.engines.csv.ConfigurableCSVResolver
 csv2.resolver.data.name=Appearance Resolver
 csv2.resolver.data.description=This resolver returns all the appearances for a player from the appearance table.
 csv2.resolver.data.fields=appearance
 csv2.resolver.data.field.appearance.column=0
-csv2.resolver.data.field.appearance.id=com:att:research:xacml:test:csv:subject:appearance
+csv2.resolver.data.field.appearance.id=org.apache.openaz:xacml:test:csv:subject:appearance
 csv2.resolver.data.field.appearance.datatype=http://www.w3.org/2001/XMLSchema#integer
 csv2.resolver.data.field.appearance.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-csv2.resolver.data.field.appearance.issuer=com:att:research:xacml:test:csv
+csv2.resolver.data.field.appearance.issuer=org.apache.openaz:xacml:test:csv
 
 csv2.resolver.data.parameters=playerid
 csv2.resolver.data.parameter.playerid.column=3
@@ -88,7 +88,7 @@
 csv2.resolver.data.parameter.playerid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
 #csv1.resolver.data.parameter.playerid.issuer=
 
-hyper1.classname=com.att.research.xacml.std.pip.engines.csv.HyperCSVEngine
+hyper1.classname=org.apache.openaz.xacml.std.pip.engines.csv.HyperCSVEngine
 hyper1.name=World Marriage Age Limits
 hyper1.description=Minimum age for female/male marriages with or without their parental consent.
 hyper1.source=../XACML-TEST/testsets/pip/configurable-csv-hyper/marriage.csv
@@ -97,43 +97,43 @@
 
 hyper1.resolvers=age_consent
 
-hyper1.resolver.age_consent.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
+hyper1.resolver.age_consent.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
 hyper1.resolver.age_consent.name=Ages
 hyper1.resolver.age_consent.description=This returns all the age's for consent or no consent for a country.
 hyper1.resolver.age_consent.select=SELECT wofemale,womale,wfemale,wmale FROM marriage WHERE country=?
 hyper1.resolver.age_consent.fields=wofemale,womale,wfemale,wmale
 
-hyper1.resolver.age_consent.field.wofemale.id=com:att:research:xacml:test:csv:country:no-consent:female
+hyper1.resolver.age_consent.field.wofemale.id=org.apache.openaz:xacml:test:csv:country:no-consent:female
 hyper1.resolver.age_consent.field.wofemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wofemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wofemale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wofemale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wofemale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.womale.id=com:att:research:xacml:test:csv:country:no-consent:male
+hyper1.resolver.age_consent.field.womale.id=org.apache.openaz:xacml:test:csv:country:no-consent:male
 hyper1.resolver.age_consent.field.womale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.womale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.womale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.womale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.womale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.wfemale.id=com:att:research:xacml:test:csv:country:consent:female
+hyper1.resolver.age_consent.field.wfemale.id=org.apache.openaz:xacml:test:csv:country:consent:female
 hyper1.resolver.age_consent.field.wfemale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wfemale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wfemale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wfemale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wfemale.issuer=org.apache.openaz:xacml:test:csv
 
-hyper1.resolver.age_consent.field.wmale.id=com:att:research:xacml:test:csv:country:consent:male
+hyper1.resolver.age_consent.field.wmale.id=org.apache.openaz:xacml:test:csv:country:consent:male
 hyper1.resolver.age_consent.field.wmale.datatype=http://www.w3.org/2001/XMLSchema#integer
-hyper1.resolver.age_consent.field.wmale.category=com:att:research:xacml:test:csv:category:country
-hyper1.resolver.age_consent.field.wmale.issuer=com:att:research:xacml:test:csv
+hyper1.resolver.age_consent.field.wmale.category=org.apache.openaz:xacml:test:csv:category:country
+hyper1.resolver.age_consent.field.wmale.issuer=org.apache.openaz:xacml:test:csv
 
 hyper1.resolver.age_consent.parameters=country
-hyper1.resolver.age_consent.parameter.country.id=com:att:research:xacml:test:csv:country:name
+hyper1.resolver.age_consent.parameter.country.id=org.apache.openaz:xacml:test:csv:country:name
 hyper1.resolver.age_consent.parameter.country.datatype=http://www.w3.org/2001/XMLSchema#string
-hyper1.resolver.age_consent.parameter.country.category=com:att:research:xacml:test:csv:category:country
+hyper1.resolver.age_consent.parameter.country.category=org.apache.openaz:xacml:test:csv:category:country
 #hyper1.resolver.age_consent.parameter.country.issuer=
 
-sql1.classname=com.att.research.xacml.std.pip.engines.jdbc.JDBCEngine
+sql1.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.JDBCEngine
 sql1.name=World
 sql1.description=World Database from MySQL website. Copyright Statistics Finland, http://www.stat.fi/worldinfigures.
 # This will be the default issuer for the resolvers. NOTE: Issuer only used for attributes provided by the engine.
-sql1.issuer=com:att:research:xacml:test:sql
+sql1.issuer=org.apache.openaz:xacml:test:sql
 #
 # This is the configuration for JDBC. You will have to setup the database and run the data\world*.sql script to
 # create the tables and load the data. 
@@ -151,26 +151,26 @@
 
 sql1.resolvers=langer
 
-sql1.resolver.langer.classname=com.att.research.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
+sql1.resolver.langer.classname=org.apache.openaz.xacml.std.pip.engines.jdbc.ConfigurableJDBCResolver
 sql1.resolver.langer.name=Language
 sql1.resolver.langer.description=This returns the language for a city.
 sql1.resolver.langer.select=SELECT language FROM city INNER JOIN countrylanguage ON city.countrycode = countrylanguage.countrycode WHERE name=?
 sql1.resolver.langer.fields=language
-sql1.resolver.langer.field.language.id=com:att:research:xacml:test:sql:resource:city:language
+sql1.resolver.langer.field.language.id=org.apache.openaz:xacml:test:sql:resource:city:language
 sql1.resolver.langer.field.language.datatype=http://www.w3.org/2001/XMLSchema#string
 sql1.resolver.langer.field.language.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
 #You can override the default issuer that is set in the JDBCEngine definition if you want.
-#sql1.resolver.langer.field.language.issuer=com:att:research:xacml:test:sql
+#sql1.resolver.langer.field.language.issuer=org.apache.openaz:xacml:test:sql
 sql1.resolver.langer.parameters=name
 sql1.resolver.langer.parameter.name.id=urn:oasis:names:tc:xacml:1.0:resource:resource-id
 sql1.resolver.langer.parameter.name.datatype=http://www.w3.org/2001/XMLSchema#string
 sql1.resolver.langer.parameter.name.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
 
 
-ldap1.classname=com.att.research.xacml.std.pip.engines.ldap.LDAPEngine
+ldap1.classname=org.apache.openaz.xacml.std.pip.engines.ldap.LDAPEngine
 ldap1.name=LDAP PIP
 ldap1.description=The LDAP containing the seven seas sample LDIF data.
-ldap1.issuer=com:att:research:xacml:test:ldap
+ldap1.issuer=org.apache.openaz:xacml:test:ldap
 ldap1.java.naming.factory.initial=com.sun.jndi.ldap.LdapCtxFactory
 #
 # NOTE: You will have to setup a local LDAP server and load the data\apache-ds-tutorial.ldif before
@@ -183,7 +183,7 @@
 
 ldap1.resolvers=dn,ship
 
-ldap1.resolver.dn.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
+ldap1.resolver.dn.classname=org.apache.openaz.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
 ldap1.resolver.dn.name=Domain Names
 ldap1.resolver.dn.description=Find all the dn's for the subject id
 ldap1.resolver.dn.base=o=sevenseas
@@ -193,27 +193,27 @@
 ldap1.resolver.dn.filter.parameters.uid.id=urn:oasis:names:tc:xacml:1.0:subject:subject-id
 ldap1.resolver.dn.filter.parameters.uid.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.dn.filter.parameters.uid.category=urn:oasis:names:tc:xacml:1.0:subject-category:access-subject
-#ldap1.resolver.dn.filter.parameters.uid.issuer=com:att:research:xacml:test:ldap
+#ldap1.resolver.dn.filter.parameters.uid.issuer=org.apache.openaz:xacml:test:ldap
 ldap1.resolver.dn.filter.view=dn
-ldap1.resolver.dn.filter.view.dn.id=com:att:research:xacml:test:ldap:subject:dn
+ldap1.resolver.dn.filter.view.dn.id=org.apache.openaz:xacml:test:ldap:subject:dn
 ldap1.resolver.dn.filter.view.dn.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.dn.filter.view.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.dn.filter.view.dn.issuer=com:att:research:xacml:test:ldap
+ldap1.resolver.dn.filter.view.dn.issuer=org.apache.openaz:xacml:test:ldap
 
-ldap1.resolver.ship.classname=com.att.research.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
+ldap1.resolver.ship.classname=org.apache.openaz.xacml.std.pip.engines.ldap.ConfigurableLDAPResolver
 ldap1.resolver.ship.name=Ship Resolver
 ldap1.resolver.ship.description=This resolves a subject's dn to a ship.
 ldap1.resolver.ship.base=o=sevenseas
 ldap1.resolver.ship.base.parameters=
 ldap1.resolver.ship.filter=uniquemember=${dn}
 ldap1.resolver.ship.filter.parameters=dn
-ldap1.resolver.ship.filter.parameters.dn.id=com:att:research:xacml:test:ldap:subject:dn
+ldap1.resolver.ship.filter.parameters.dn.id=org.apache.openaz:xacml:test:ldap:subject:dn
 ldap1.resolver.ship.filter.parameters.dn.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.ship.filter.parameters.dn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.parameters.dn.issuer=com:att:research:xacml:test:ldap
+ldap1.resolver.ship.filter.parameters.dn.issuer=org.apache.openaz:xacml:test:ldap
 ldap1.resolver.ship.filter.view=cn
-ldap1.resolver.ship.filter.view.cn.id=com:att:research:xacml:test:ldap:subject:ship
+ldap1.resolver.ship.filter.view.cn.id=org.apache.openaz:xacml:test:ldap:subject:ship
 ldap1.resolver.ship.filter.view.cn.datatype=http://www.w3.org/2001/XMLSchema#string
 ldap1.resolver.ship.filter.view.cn.category=urn:oasis:names:tc:xacml:3.0:attribute-category:resource
-ldap1.resolver.ship.filter.view.cn.issuer=com:att:research:xacml:test:ldap
+ldap1.resolver.ship.filter.view.cn.issuer=org.apache.openaz:xacml:test:ldap
 
diff --git a/openaz-xacml-pdp-rest/pom.xml b/openaz-xacml-pdp-rest/pom.xml
index 963d199..fe36190 100644
--- a/openaz-xacml-pdp-rest/pom.xml
+++ b/openaz-xacml-pdp-rest/pom.xml
@@ -18,22 +18,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>openaz</artifactId>
-        <groupId>org.openliberty.openaz</groupId>
+        <groupId>org.apache.openaz</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openaz-xacml-pdp-rest</artifactId>
     <dependencies>
         <dependency>
-            <groupId>org.openliberty.openaz</groupId>
+            <groupId>org.apache.openaz</groupId>
             <artifactId>openaz-xacml</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openliberty.openaz</groupId>
+            <groupId>org.apache.openaz</groupId>
             <artifactId>openaz-xacml-rest</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openliberty.openaz</groupId>
+            <groupId>org.apache.openaz</groupId>
             <artifactId>openaz-xacml-pdp</artifactId>
         </dependency>
         <dependency>
diff --git a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpLoader.java b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpLoader.java
index f08f063..46cd22a 100644
--- a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpLoader.java
+++ b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpLoader.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacml.rest;
+package org.apache.openaz.xacml.rest;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -47,24 +47,26 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.pap.PAPException;
+import org.apache.openaz.xacml.api.pap.PDPStatus;
+import org.apache.openaz.xacml.api.pap.PDPStatus.Status;
+import org.apache.openaz.xacml.api.pdp.PDPEngine;
+import org.apache.openaz.xacml.api.pdp.PDPEngineFactory;
+import org.apache.openaz.xacml.api.pip.PIPEngine;
+import org.apache.openaz.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.api.pip.PIPFinder;
+import org.apache.openaz.xacml.api.pip.PIPFinderFactory;
+import org.apache.openaz.xacml.pdp.policy.PolicyDef;
+import org.apache.openaz.xacml.pdp.policy.dom.DOMPolicyDef;
+import org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory;
+import org.apache.openaz.xacml.rest.XACMLRest;
+import org.apache.openaz.xacml.rest.XACMLRestProperties;
+import org.apache.openaz.xacml.std.pap.StdPDPPIPConfig;
+import org.apache.openaz.xacml.std.pap.StdPDPPolicy;
+import org.apache.openaz.xacml.std.pap.StdPDPStatus;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
-import com.att.research.xacml.api.pap.PAPException;
-import com.att.research.xacml.api.pap.PDPStatus;
-import com.att.research.xacml.api.pap.PDPStatus.Status;
-import com.att.research.xacml.api.pdp.PDPEngine;
-import com.att.research.xacml.api.pdp.PDPEngineFactory;
-import com.att.research.xacml.api.pip.PIPEngine;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.api.pip.PIPFinder;
-import com.att.research.xacml.api.pip.PIPFinderFactory;
-import com.att.research.xacml.std.pap.StdPDPPIPConfig;
-import com.att.research.xacml.std.pap.StdPDPPolicy;
-import com.att.research.xacml.std.pap.StdPDPStatus;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.XACMLProperties;
-import com.att.research.xacmlatt.pdp.policy.PolicyDef;
-import com.att.research.xacmlatt.pdp.policy.dom.DOMPolicyDef;
-import com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory;
 import com.google.common.base.Splitter;
 
 /**
diff --git a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpRegisterThread.java b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpRegisterThread.java
index ba6a065..cbef13c 100644
--- a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpRegisterThread.java
+++ b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpRegisterThread.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacml.rest;
+package org.apache.openaz.xacml.rest;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -42,9 +42,9 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.rest.XACMLPdpServlet.PutRequest;
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.rest.XACMLRestProperties;
+import org.apache.openaz.xacml.rest.XACMLPdpServlet.PutRequest;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
 public class XACMLPdpRegisterThread implements Runnable {
     private static final Log logger	= LogFactory.getLog(XACMLPdpRegisterThread.class);
diff --git a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpServlet.java b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpServlet.java
index 5e8b79f..0a40a1a 100644
--- a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpServlet.java
+++ b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLPdpServlet.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacml.rest;
+package org.apache.openaz.xacml.rest;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -54,18 +54,20 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.entity.ContentType;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.api.pap.PDPStatus.Status;
+import org.apache.openaz.xacml.api.pdp.PDPEngine;
+import org.apache.openaz.xacml.api.pdp.PDPException;
+import org.apache.openaz.xacml.rest.XACMLRest;
+import org.apache.openaz.xacml.rest.XACMLRestProperties;
+import org.apache.openaz.xacml.std.dom.DOMRequest;
+import org.apache.openaz.xacml.std.dom.DOMResponse;
+import org.apache.openaz.xacml.std.json.JSONRequest;
+import org.apache.openaz.xacml.std.json.JSONResponse;
+import org.apache.openaz.xacml.std.pap.StdPDPStatus;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.pap.PDPStatus.Status;
-import com.att.research.xacml.api.pdp.PDPEngine;
-import com.att.research.xacml.api.pdp.PDPException;
-import com.att.research.xacml.std.dom.DOMRequest;
-import com.att.research.xacml.std.dom.DOMResponse;
-import com.att.research.xacml.std.json.JSONRequest;
-import com.att.research.xacml.std.json.JSONResponse;
-import com.att.research.xacml.std.pap.StdPDPStatus;
-import com.att.research.xacml.util.XACMLProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
diff --git a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/impl/XACMLPdpPIPFinderFactory.java b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/impl/XACMLPdpPIPFinderFactory.java
index c0b24e9..14f0696 100644
--- a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/impl/XACMLPdpPIPFinderFactory.java
+++ b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/impl/XACMLPdpPIPFinderFactory.java
@@ -28,18 +28,17 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacml.rest.impl;
+package org.apache.openaz.xacml.rest.impl;
 
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.api.pip.PIPFinder;
-import com.att.research.xacml.api.pip.PIPFinderFactory;
-import com.att.research.xacml.std.pip.finders.ConfigurableEngineFinder;
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.api.pip.PIPFinder;
+import org.apache.openaz.xacml.api.pip.PIPFinderFactory;
+import org.apache.openaz.xacml.std.pip.finders.ConfigurableEngineFinder;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
 public class XACMLPdpPIPFinderFactory extends PIPFinderFactory {
     private ConfigurableEngineFinder pipFinder;
diff --git a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/impl/XACMLPdpPolicyFinderFactory.java b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/impl/XACMLPdpPolicyFinderFactory.java
index fc2d0d0..6163226 100644
--- a/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/impl/XACMLPdpPolicyFinderFactory.java
+++ b/openaz-xacml-pdp-rest/src/main/java/org/apache/openaz/xacml/rest/impl/XACMLPdpPolicyFinderFactory.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacml.rest.impl;
+package org.apache.openaz.xacml.rest.impl;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,17 +42,17 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.PolicyDef;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinder;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinderFactory;
+import org.apache.openaz.xacml.pdp.policy.dom.DOMPolicyDef;
+import org.apache.openaz.xacml.pdp.std.StdPolicyFinder;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.XACMLProperties;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.PolicyDef;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinder;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinderFactory;
-import com.att.research.xacmlatt.pdp.policy.dom.DOMPolicyDef;
-import com.att.research.xacmlatt.pdp.std.StdPolicyFinder;
 import com.google.common.base.Splitter;
 
 public class XACMLPdpPolicyFinderFactory extends PolicyFinderFactory {
diff --git a/openaz-xacml-pdp-rest/xacml.pdp.properties b/openaz-xacml-pdp-rest/xacml.pdp.properties
index 34e6b77..d9e730b 100755
--- a/openaz-xacml-pdp-rest/xacml.pdp.properties
+++ b/openaz-xacml-pdp-rest/xacml.pdp.properties
@@ -2,24 +2,25 @@
 #
 # Standard API Factories
 #
-xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
-xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
-xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
-# NOT USED SEE BELOW xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
-xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory
+xacml.dataTypeFactory=org.apache.openaz.xacml.std.StdDataTypeFactory
+xacml.pdpEngineFactory=org.apache.openaz.xacmlatt.pdp.ATTPDPEngineFactory
+xacml.pepEngineFactory=org.apache.openaz.xacml.std.pep.StdEngineFactory
+# NOT USED SEE BELOW xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
+xacml.traceEngineFactory=org.apache.openaz.xacml.std.trace.LoggingTraceEngineFactory
 #
-# AT&T PDP Implementation Factories
+# OpenAZ PDP Implementation Factories
 #
-xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
-xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory
-# NOT USED SEE BELOW xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
+xacml.openaz.evaluationContextFactory=org.apache.openaz.xacml.pdp.std.StdEvaluationContextFactory
+xacml.openaz.combiningAlgorithmFactory=org.apache.openaz.xacml.pdp.std.StdCombiningAlgorithmFactory
+xacml.openaz.functionDefinitionFactory=org.apache.openaz.xacml.pdp.std.StdFunctionDefinitionFactory
+xacml.openaz.policyFinderFactory=org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory
+# NOT USED SEE BELOW xacml.openaz.policyFinderFactory=org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory
 
 #
 # AT&T RESTful PDP Implementation Factories
 #
-xacml.pipFinderFactory=com.att.research.xacml.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=com.att.research.xacml.rest.XACMLPdpPolicyFinderFactory
+xacml.pipFinderFactory=org.apache.openaz.xacml.rest.impl.XACMLPdpPIPFinderFactory
+xacml.att.policyFinderFactory=org.apache.openaz.xacml.rest.XACMLPdpPolicyFinderFactory
 #
 # PDP RESTful API properties
 # 
@@ -50,4 +51,4 @@
 #
 # max number of bytes in a POST of a XML/JSON request
 #
-xacml.rest.pdp.maxcontent=32767
\ No newline at end of file
+xacml.rest.pdp.maxcontent=32767
diff --git a/openaz-xacml-pdp/pom.xml b/openaz-xacml-pdp/pom.xml
index 13593b1..55c6085 100644
--- a/openaz-xacml-pdp/pom.xml
+++ b/openaz-xacml-pdp/pom.xml
@@ -18,14 +18,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>openaz</artifactId>
-        <groupId>org.openliberty.openaz</groupId>
+        <groupId>org.apache.openaz</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openaz-xacml-pdp</artifactId>
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.openaz</groupId>
             <artifactId>openaz-xacml</artifactId>
         </dependency>
         <dependency>
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/ATTPDPEngine.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/ATTPDPEngine.java
index df499f8..c432ca0 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/ATTPDPEngine.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/ATTPDPEngine.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp;
+package org.apache.openaz.xacml.pdp;
 
 import java.net.URI;
 import java.util.Collection;
@@ -40,36 +40,35 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.api.pdp.PDPEngine;
-import com.att.research.xacml.api.pdp.PDPException;
-import com.att.research.xacml.api.pdp.ScopeResolver;
-import com.att.research.xacml.api.trace.TraceEngine;
-import com.att.research.xacml.api.trace.TraceEngineFactory;
-import com.att.research.xacml.api.trace.Traceable;
-import com.att.research.xacml.std.StdIndividualDecisionRequestGenerator;
-import com.att.research.xacml.std.StdMutableResponse;
-import com.att.research.xacml.std.StdMutableResult;
-import com.att.research.xacml.std.StdResult;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.trace.StdTraceEvent;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContextFactory;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.policy.PolicyDef;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinderResult;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.api.pdp.PDPEngine;
+import org.apache.openaz.xacml.api.pdp.PDPException;
+import org.apache.openaz.xacml.api.pdp.ScopeResolver;
+import org.apache.openaz.xacml.api.trace.TraceEngine;
+import org.apache.openaz.xacml.api.trace.TraceEngineFactory;
+import org.apache.openaz.xacml.api.trace.Traceable;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContextFactory;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.policy.PolicyDef;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinderResult;
+import org.apache.openaz.xacml.std.StdIndividualDecisionRequestGenerator;
+import org.apache.openaz.xacml.std.StdMutableResponse;
+import org.apache.openaz.xacml.std.StdMutableResult;
+import org.apache.openaz.xacml.std.StdResult;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.trace.StdTraceEvent;
+import org.apache.openaz.xacml.util.FactoryException;
 
 /**
- * ATTPDPEngine implements the {@link com.att.research.xacml.api.pdp.PDPEngine} interface using the XACML 3.0 specification.
+ * ATTPDPEngine implements the {@link org.apache.openaz.xacml.api.pdp.PDPEngine} interface using the XACML 3.0 specification.
  *
  */
 public class ATTPDPEngine implements PDPEngine, Traceable {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/ATTPDPEngineFactory.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/ATTPDPEngineFactory.java
index 28b14a3..69428b4 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/ATTPDPEngineFactory.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/ATTPDPEngineFactory.java
@@ -28,20 +28,19 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp;
+package org.apache.openaz.xacml.pdp;
 
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.pdp.PDPEngine;
-import com.att.research.xacml.api.pdp.PDPEngineFactory;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContextFactory;
+import org.apache.openaz.xacml.api.pdp.PDPEngine;
+import org.apache.openaz.xacml.api.pdp.PDPEngineFactory;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContextFactory;
+import org.apache.openaz.xacml.util.FactoryException;
 
 /**
- * ATTPDPEngineFactory extends {@link com.att.research.xacml.api.pdp.PDPEngineFactory} by implementing the abstract
+ * ATTPDPEngineFactory extends {@link org.apache.openaz.xacml.api.pdp.PDPEngineFactory} by implementing the abstract
  * <code>newEngine</code> method to create a {@link ATTPDPEngine} instance and initialize it
  * with policies and PIP instances based on configuration information provided to the factory.
  *
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/Evaluatable.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/Evaluatable.java
index 68f7134..7c698e4 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/Evaluatable.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/Evaluatable.java
@@ -29,11 +29,11 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.eval;
+package org.apache.openaz.xacml.pdp.eval;
 
 /**
- * Evaluatable is the interface objects implement to indicate they can be evaluated with an {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext}
- * and return an {@link com.att.research.xacmlatt.pdp.eval.EvaluationResult}.
+ * Evaluatable is the interface objects implement to indicate they can be evaluated with an {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext}
+ * and return an {@link org.apache.openaz.xacml.pdp.eval.EvaluationResult}.
  *
  */
 public interface Evaluatable {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContext.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContext.java
index 23bc1fc..7dc4683 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContext.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContext.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.eval;
+package org.apache.openaz.xacml.pdp.eval;
 
-import com.att.research.xacml.api.IdReferenceMatch;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.api.pip.PIPFinder;
-import com.att.research.xacml.api.pip.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.api.trace.TraceEngine;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.PolicyDef;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinderResult;
-import com.att.research.xacmlatt.pdp.policy.PolicySet;
+import org.apache.openaz.xacml.api.IdReferenceMatch;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.api.pip.PIPFinder;
+import org.apache.openaz.xacml.api.pip.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.api.trace.TraceEngine;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.PolicyDef;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinderResult;
+import org.apache.openaz.xacml.pdp.policy.PolicySet;
 
 /**
  * EvaluationContext provides the interface that the PDP uses to evaluate its set of Policies and PolicySets against
- * a {@link com.att.research.xacml.api.Request}.
+ * a {@link org.apache.openaz.xacml.api.Request}.
  *
  */
 public interface EvaluationContext extends PIPFinder, TraceEngine {
@@ -56,7 +56,7 @@
     public Request getRequest();
 
     /**
-     * Gets the root {@link com.att.research.xacmlatt.pdp.policy.PolicyDef} from the policy store
+     * Gets the root {@link org.apache.openaz.xacml.pdp.policy.PolicyDef} from the policy store
      * configured by the particular implementation of the <code>PolicyFinderFactory</code> class.
      *
      * @return a <code>PolicyFinderResult</code> with the root <code>PolicyDef</code>
@@ -64,7 +64,7 @@
     public abstract PolicyFinderResult<PolicyDef> getRootPolicyDef();
 
     /**
-     * Gets the {@link com.att.research.xacmlatt.pdp.policy.Policy} that matches the given {@link com.att.research.xacml.api.IdReferenceMatch}.
+     * Gets the {@link org.apache.openaz.xacml.pdp.policy.Policy} that matches the given {@link org.apache.openaz.xacml.api.IdReferenceMatch}.
      *
      * @param idReferenceMatch the <code>IdReferenceMatch</code> to search for
      * @return a <code>PolicyFinderResult</code> with the <code>Policy</code> matching the given <code>IdReferenceMatch</code>
@@ -72,7 +72,7 @@
     public abstract PolicyFinderResult<Policy> getPolicy(IdReferenceMatch idReferenceMatch);
 
     /**
-     * Gets the {@link com.att.research.xacmlatt.pdp.policy.PolicySet} that matches the given {@link com.att.research.xacml.api.IdReferenceMatch}.
+     * Gets the {@link org.apache.openaz.xacml.pdp.policy.PolicySet} that matches the given {@link org.apache.openaz.xacml.api.IdReferenceMatch}.
      *
      * @param idReferenceMatch the <code>IdReferenceMatch</code> to search for
      * @return a <code>PolicyFinderResult</code> with the <code>PolicySet</code> matching the given <code>IdReferenceMatch</code>.
@@ -80,11 +80,11 @@
     public abstract PolicyFinderResult<PolicySet> getPolicySet(IdReferenceMatch idReferenceMatch);
 
     /**
-     * Gets the {@link com.att.research.xacml.api.pip.PIPResponse} containing {@link com.att.research.xacml.api.Attribute}s that
-     * match the given {@link com.att.research.xacml.api.pip.PIPRequest} from this <code>EvaluationContext</code>.
+     * Gets the {@link org.apache.openaz.xacml.api.pip.PIPResponse} containing {@link org.apache.openaz.xacml.api.Attribute}s that
+     * match the given {@link org.apache.openaz.xacml.api.pip.PIPRequest} from this <code>EvaluationContext</code>.
      *
      * @param pipRequest the <code>PIPRequest</code> specifying which <code>Attribute</code>s to retrieve
-     * @return the <code>PIPResponse</code> containing the {@link com.att.research.xacml.api.Status} and <code>Attribute</code>s
+     * @return the <code>PIPResponse</code> containing the {@link org.apache.openaz.xacml.api.Status} and <code>Attribute</code>s
      * @throws EvaluationException if there is an error retrieving the <code>Attribute</code>s
      */
     public PIPResponse getAttributes(PIPRequest pipRequest) throws PIPException;
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContextException.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContextException.java
index 402125d..3c1316c 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContextException.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContextException.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.eval;
+package org.apache.openaz.xacml.pdp.eval;
 
 /**
  * EvaluationContextException extends <code>Exception</code> to represent errors thrown by
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContextFactory.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContextFactory.java
index e8a8040..ca8c942 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContextFactory.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationContextFactory.java
@@ -28,16 +28,16 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.eval;
+package org.apache.openaz.xacml.pdp.eval;
 
 import java.util.Properties;
 
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.pip.PIPFinder;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinder;
-import com.att.research.xacmlatt.pdp.util.ATTPDPProperties;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.pip.PIPFinder;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinder;
+import org.apache.openaz.xacml.pdp.util.OpenAZPDPProperties;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
 
 /**
  * EvaluationContextFactory provides methods for creating {@link EvaluationContext} objects
@@ -45,8 +45,8 @@
  *
  */
 public abstract class EvaluationContextFactory {
-    private static final String	FACTORYID					= ATTPDPProperties.PROP_EVALUATIONCONTEXTFACTORY;
-    private static final String DEFAULT_FACTORY_CLASSNAME	= "com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory";
+    private static final String	FACTORYID					= OpenAZPDPProperties.PROP_EVALUATIONCONTEXTFACTORY;
+    private static final String DEFAULT_FACTORY_CLASSNAME	= "org.apache.openaz.xacml.pdp.std.StdEvaluationContextFactory";
 
     protected EvaluationContextFactory() {
     }
@@ -71,7 +71,7 @@
     }
 
     /**
-     * Gets a new {@link com.att.research.xacml.pdp.eval.EvaluationContext} for the given {@link com.att.research.xacml.api.Request}.
+     * Gets a new {@link com.att.research.xacml.pdp.eval.EvaluationContext} for the given {@link org.apache.openaz.xacml.api.Request}.
      *
      * @param request the <code>Request</code> for the new <code>EvaluationContext</code>
      * @return a new <code>EvaluationContext</code> for the given <code>Request</code>
@@ -79,7 +79,7 @@
     public abstract EvaluationContext getEvaluationContext(Request request);
 
     /**
-     * Sets the {@link com.att.research.xacmlatt.pdp.policy.PolicyFinder} for this <code>EvaluationContextFactory</code> to an
+     * Sets the {@link org.apache.openaz.xacml.pdp.policy.PolicyFinder} for this <code>EvaluationContextFactory</code> to an
      * explicit instance instead of the default or configured value.
      *
      * @param policyFinder the <code>PolicyFinder</code> to use in creating new <code>EvaluationContext</code>s.
@@ -87,7 +87,7 @@
     public abstract void setPolicyFinder(PolicyFinder policyFinder);
 
     /**
-     * Sets the {@link com.att.research.xacml.api.pip.PIPFinder} for this <code>EvaluationContextFactory</code> to an
+     * Sets the {@link org.apache.openaz.xacml.api.pip.PIPFinder} for this <code>EvaluationContextFactory</code> to an
      * explicit instance instaed of the default or configured value.
      *
      * @param pipFinder the <code>PIPFinder</code> to use in creating new <code>EvaluationContext</code>s.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationException.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationException.java
index c1d2a91..3c9f04f 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationException.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationException.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.eval;
+package org.apache.openaz.xacml.pdp.eval;
 
 /**
  * EvaluationException extends <code>Exception</code> to represent errors returned by methods of the
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationResult.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationResult.java
index 8f1171b..abb8fc3 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationResult.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/EvaluationResult.java
@@ -29,20 +29,20 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.eval;
+package org.apache.openaz.xacml.pdp.eval;
 
 import java.util.Collection;
 
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.IdReference;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdMutableResult;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.IdReference;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.std.StdMutableResult;
 
 /**
- * EvaluationResult extends {@link com.att.research.xacml.std.StdMutableResult} with methods useful within a PDP implementation
+ * EvaluationResult extends {@link org.apache.openaz.xacml.std.StdMutableResult} with methods useful within a PDP implementation
  *
  */
 public class EvaluationResult extends StdMutableResult {
@@ -72,7 +72,7 @@
     }
 
     /**
-     * Creates an <code>EvaluationResult</code> generally from a {@link com.att.research.xacmlatt.pdp.policy.Rule} <code>evaluation</code>
+     * Creates an <code>EvaluationResult</code> generally from a {@link org.apache.openaz.xacml.pdp.policy.Rule} <code>evaluation</code>
      * call.
      *
      * @param decisionIn the <code>Decision</code>
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/MatchResult.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/MatchResult.java
index d1a2b3d..242a109 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/MatchResult.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/MatchResult.java
@@ -29,10 +29,10 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.eval;
+package org.apache.openaz.xacml.pdp.eval;
 
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdStatus;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.std.StdStatus;
 
 /**
  * MatchResult is the value returned by the {@link Matchable} interface.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/Matchable.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/Matchable.java
index 94fce75..40f5194 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/Matchable.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/Matchable.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.eval;
+package org.apache.openaz.xacml.pdp.eval;
 
 /**
  * Matchable is the interface objects implement to indicate they are part of a XACML Target matching tree.
@@ -37,8 +37,8 @@
  */
 public interface Matchable {
     /**
-     * Matches this <code>Matchable</code> in the given {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext} and
-     * returns a {@link com.att.research.xacmlatt.pdp.eval.MatchResult}.
+     * Matches this <code>Matchable</code> in the given {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext} and
+     * returns a {@link org.apache.openaz.xacml.pdp.eval.MatchResult}.
      *
      * @param evaluationContext the <code>EvaluationContext</code> to use in matching
      * @return a <code>MatchResult</code> indicating whether this <code>Matchable</code> matches against the given <code>EvaluationContext</code>.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/package-info.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/package-info.java
index aa3dddc..dba93bf 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/package-info.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/eval/package-info.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.eval;
+package org.apache.openaz.xacml.pdp.eval;
 
 /**
  * com.att.research.xacmlatt.pdp.eval contains interfaces and classes used in evaluating and matching XACML policy components.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/package-info.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/package-info.java
index ea5147c..c5de0eb 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/package-info.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/package-info.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp;
+package org.apache.openaz.xacml.pdp;
 
 /**
  * com.att.research.xacmlatt.pdp contains a reference implementation of the {@link com.att.research.xacml.pdp.PDPEngine} interface
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AdviceExpression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AdviceExpression.java
index 64f8b4d..489a2e8 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AdviceExpression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AdviceExpression.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdMutableAdvice;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.std.StdMutableAdvice;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
  * AdviceExpression extends {@link PolicyComponent} to implement the XACML AdviceExpression element.
@@ -119,12 +119,12 @@
 
     /**
      * Evaluates the <code>AttributeAssignmentExpression</code>s in this <code>AdviceExpression</code> to generate an
-     * {@link com.att.research.xacml.api.Advice} object.
+     * {@link org.apache.openaz.xacml.api.Advice} object.
      *
-     * @param evaluationContext the {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext} in which to evaluate the <code>AttributeAssignmentExpression</code>s
+     * @param evaluationContext the {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext} in which to evaluate the <code>AttributeAssignmentExpression</code>s
      * @param policyDefaults the {@link PolicyDefaults} for the evaluation
      * @return a new <code>Advice</code> evaluated from this <code>AdviceExpression</code>
-     * @throws com.att.research.xacmlatt.pdp.eval.EvaluationException if there is an error in the evaluation
+     * @throws org.apache.openaz.xacml.pdp.eval.EvaluationException if there is an error in the evaluation
      */
     public Advice evaluate(EvaluationContext evaluationContext, PolicyDefaults policyDefaults) throws EvaluationException {
         if (!this.validate()) {
@@ -156,7 +156,7 @@
      * @param policyDefaults
      * @param listAdviceExpressions
      * @return
-     * @throws com.att.research.xacmlatt.pdp.eval.EvaluationException
+     * @throws org.apache.openaz.xacml.pdp.eval.EvaluationException
      */
     public static List<Advice> evaluate(EvaluationContext evaluationContext, PolicyDefaults policyDefaults, Decision decision, Collection<AdviceExpression> listAdviceExpressions) throws EvaluationException {
         List<Advice> listAdvices	= new ArrayList<Advice>();
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AllOf.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AllOf.java
index 68d9f1c..9fd882b 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AllOf.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AllOf.java
@@ -28,24 +28,24 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
-import com.att.research.xacmlatt.pdp.eval.Matchable;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.pdp.eval.Matchable;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
- * AnyOf extends {@link com.att.research.xacmlatt.pdp.policy.PolicyComponent} and implements the {@link com.att.research.xacmlatt.pdp.policy.Matchable}
+ * AnyOf extends {@link org.apache.openaz.xacml.pdp.policy.PolicyComponent} and implements the {@link com.att.research.xacmlatt.pdp.policy.Matchable}
  * interface to represent XACML AllOf elements in a XACML Target.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AnyOf.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AnyOf.java
index 5f0922e..3db13c2 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AnyOf.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AnyOf.java
@@ -28,24 +28,24 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
-import com.att.research.xacmlatt.pdp.eval.Matchable;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.pdp.eval.Matchable;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
- * AnyOf extends {@link com.att.research.xacmlatt.pdp.policy.PolicyComponent} and implements the {@link com.att.research.xacmlatt.pdp.policy.Matchable}
+ * AnyOf extends {@link org.apache.openaz.xacml.pdp.policy.PolicyComponent} and implements the {@link com.att.research.xacmlatt.pdp.policy.Matchable}
  * interface to represent XACML AnyOf elements in a XACML Target.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AttributeAssignmentExpression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AttributeAssignmentExpression.java
index 02de064..6abf973 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AttributeAssignmentExpression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AttributeAssignmentExpression.java
@@ -28,21 +28,21 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdMutableAttributeAssignment;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.std.StdMutableAttributeAssignment;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
  * AttributeAssignmentExpression extends {@link PolicyComponent} to represent a
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AttributeAssignmentResult.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AttributeAssignmentResult.java
index 7cce2bf..20b40a9 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AttributeAssignmentResult.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/AttributeAssignmentResult.java
@@ -28,21 +28,21 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.util.StringUtils;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
- * AttributeAssignmentResult is the object returned by the <code>evaluate</code> method of an {@link com.att.research.xacmlatt.pdp.policy.AttributeAssignmentExpression}.
- * It contains a {@link com.att.research.xacml.api.Status} and an optional collection of {@link com.att.research.xacml.api.AttributeAssignment}
+ * AttributeAssignmentResult is the object returned by the <code>evaluate</code> method of an {@link org.apache.openaz.xacml.pdp.policy.AttributeAssignmentExpression}.
+ * It contains a {@link org.apache.openaz.xacml.api.Status} and an optional collection of {@link org.apache.openaz.xacml.api.AttributeAssignment}
  * elements.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Bag.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Bag.java
index 054d199..58ba928 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Bag.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Bag.java
@@ -28,13 +28,13 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.AttributeValue;
 
 /**
  * Bag represents a collection of XACML attribute values for the same attribute.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombinerParameter.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombinerParameter.java
index e38c73d..81b5e99 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombinerParameter.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombinerParameter.java
@@ -28,11 +28,11 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
  * CombinerParameter extends {@link PolicyComponent} to represent a XACML CombinerParameter element.
@@ -58,7 +58,7 @@
 
     /**
      * Creates a new <code>CombinerParameter</code> with the given <code>String</code> name, <code>AttributeValue</code>,
-     * {@link com.att.research.xacml.api.StatusCode} and <code>String</code> status message.
+     * {@link org.apache.openaz.xacml.api.StatusCode} and <code>String</code> status message.
      *
      * @param nameIn the <code>String</code> name of the <code>CombinerParameter</code>
      * @param attributeValueIn the <code>AttributeValue</code> of the <code>CombinerParameter</code>
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningAlgorithm.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningAlgorithm.java
index 1a9ef7a..5921d61 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningAlgorithm.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningAlgorithm.java
@@ -28,15 +28,15 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.List;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.Evaluatable;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.Evaluatable;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
 
 /**
  * CombiningAlgorithm is the interface for objects that implement XACML combining algorithms for rules, policies, and policy sets.
@@ -47,7 +47,7 @@
  */
 public interface CombiningAlgorithm<T extends Evaluatable> {
     /**
-     * Gets the {@link com.att.research.xacml.api.Identifier} for this <code>CombiningAlgorithm</code>.
+     * Gets the {@link org.apache.openaz.xacml.api.Identifier} for this <code>CombiningAlgorithm</code>.
      *
      * @return the <code>Identifier</code> for this <code>CombiningAlgorithm</code>
      */
@@ -61,7 +61,7 @@
      * @param elements the <code>List</code> of <code>CombiningElement</code>s to evaluate
      * @param combinerParameters the <code>List</code> of <code>CombinerParameter</code>s to apply to the combining algorithm
      * @return the combined <code>EvaluationResult</code>
-     * @throws com.att.research.xacmlatt.pdp.eval.EvaluationException if there is an error in the <code>evaluate</code> method of any of the <code>CombiningElement</code>s
+     * @throws org.apache.openaz.xacml.pdp.eval.EvaluationException if there is an error in the <code>evaluate</code> method of any of the <code>CombiningElement</code>s
      */
     public EvaluationResult combine(EvaluationContext evaluationContext, List<CombiningElement<T>> elements, List<CombinerParameter> combinerParameters) throws EvaluationException;
 }
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningAlgorithmFactory.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningAlgorithmFactory.java
index a8086de..8177229 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningAlgorithmFactory.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningAlgorithmFactory.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.Properties;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
-import com.att.research.xacmlatt.pdp.util.ATTPDPProperties;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.util.OpenAZPDPProperties;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
 
 /**
- * CombiningAlgorithmFactory is an abstract class for mapping function {@link com.att.research.xacml.api.Identifier} ids to
+ * CombiningAlgorithmFactory is an abstract class for mapping function {@link org.apache.openaz.xacml.api.Identifier} ids to
  * {@link CombiningAlgorithm} objects.
  *
  */
 public abstract class CombiningAlgorithmFactory {
-    private static final String	FACTORYID					= ATTPDPProperties.PROP_COMBININGALGORITHMFACTORY;
-    private static final String DEFAULT_FACTORY_CLASSNAME	= "com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory";
+    private static final String	FACTORYID					= OpenAZPDPProperties.PROP_COMBININGALGORITHMFACTORY;
+    private static final String DEFAULT_FACTORY_CLASSNAME	= "org.apache.openaz.xacml.pdp.std.StdCombiningAlgorithmFactory";
 
     protected CombiningAlgorithmFactory() {
     }
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningElement.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningElement.java
index c29c01c..fdd5759 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningElement.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/CombiningElement.java
@@ -28,22 +28,22 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacmlatt.pdp.eval.Evaluatable;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.eval.Evaluatable;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
 
 /**
  * CombiningElement wraps an {@link com.att.research.xacmlatt.pdp.evl.Evaluatable} with a set of
- * {@link com.att.research.xacmlatt.pdp.policy.TargetedCombinerParameter}s for use with a
- * {@link com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm} to get a combined {@link com.att.research.xacmlatt.pdp.eval.EvaluationResult}
+ * {@link org.apache.openaz.xacml.pdp.policy.TargetedCombinerParameter}s for use with a
+ * {@link org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm} to get a combined {@link org.apache.openaz.xacml.pdp.eval.EvaluationResult}
  *
  *
  * @param <T> the java class extending <code>Evaluatable</code> of the objects to be combined
@@ -87,11 +87,11 @@
     }
 
     /**
-     * Evaluates this <code>CombiningElement</code> in the given {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext}.
+     * Evaluates this <code>CombiningElement</code> in the given {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext}.
      *
      * @param evaluationContext the <code>EvaluationContext</code>
-     * @return the {@link com.att.research.xacmlatt.pdp.eval.EvaluationResult} from the <code>Evaluatable</code>
-     * @throws com.att.research.xacmlatt.pdp.eval.EvaluationException if there is an error in the <code>evaluate</code> method of the <code>Evaluatable</code>
+     * @return the {@link org.apache.openaz.xacml.pdp.eval.EvaluationResult} from the <code>Evaluatable</code>
+     * @throws org.apache.openaz.xacml.pdp.eval.EvaluationException if there is an error in the <code>evaluate</code> method of the <code>Evaluatable</code>
      */
     public EvaluationResult evaluate(EvaluationContext evaluationContext) throws EvaluationException {
         return this.getEvaluatable().evaluate(evaluationContext);
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Condition.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Condition.java
index e6a095e..3c64e93 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Condition.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Condition.java
@@ -28,20 +28,20 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
 
 /**
- * Condition extends {@link com.att.research.xacmlatt.pdp.policy.PolicyComponent} to represent the XACML Condition element
+ * Condition extends {@link org.apache.openaz.xacml.pdp.policy.PolicyComponent} to represent the XACML Condition element
  * in a XACML Rule.
  *
  */
@@ -58,7 +58,7 @@
     private Expression expression;
 
     /**
-     * Creates a <code>Condition</code> with the given {@link com.att.research.xacml.api.StatusCode} and <code>String</code>
+     * Creates a <code>Condition</code> with the given {@link org.apache.openaz.xacml.api.StatusCode} and <code>String</code>
      * status message.
      *
      * @param statusCodeIn the <code>StatusCode</code> for the <code>Condition</code>
@@ -84,7 +84,7 @@
     }
 
     /**
-     * Creates a new <code>Condition</code> with the given {@link com.att.research.xacmlatt.pdp.policy.Expression} and a default
+     * Creates a new <code>Condition</code> with the given {@link org.apache.openaz.xacml.pdp.policy.Expression} and a default
      * OK <code>StatusCode</code>.
      *
      * @param expressionIn the <code>Expression</code> for the <code>Condition</code>
@@ -113,12 +113,12 @@
     }
 
     /**
-     * Evaluates the <code>Expression</code> in this <code>Condition</code> in the given {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext}.
+     * Evaluates the <code>Expression</code> in this <code>Condition</code> in the given {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext}.
      * and validates that the result is a boolean.
      *
      * @param evaluationContext the <code>EvaluationContext</code> in which to evaluate this <code>Expression</code>
      * @param policyDefaults the {@link com.att.research.xacml.pdp.policy.PolicyDefaults} to use in evaluating this <code>Expression</code>
-     * @return a {@link com.att.research.xacmlatt.pdp.policy.ExpressionResult}
+     * @return a {@link org.apache.openaz.xacml.pdp.policy.ExpressionResult}
      */
     public ExpressionResultBoolean evaluate(EvaluationContext evaluationContext, PolicyDefaults policyDefaults) throws EvaluationException {
         if (!this.validate()) {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Expression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Expression.java
index bdfc0ca..16074ff 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Expression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Expression.java
@@ -28,14 +28,14 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
 
 /**
- * Expression extends {@link com.att.research.xacmlatt.pdp.policy.PolicyComponent} to represent a XACML ExpressionType element.
+ * Expression extends {@link org.apache.openaz.xacml.pdp.policy.PolicyComponent} to represent a XACML ExpressionType element.
  *
  */
 public abstract class Expression extends PolicyComponent {
@@ -52,11 +52,11 @@
     }
 
     /**
-     * Evaluates this <code>Expression</code> in the given {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext}.
+     * Evaluates this <code>Expression</code> in the given {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext}.
      *
      * @param evaluationContext the <code>EvaluationContext</code> in which to evaluate this <code>Expression</code>
      * @param policyDefaults the {@link com.att.research.xacml.pdp.policy.PolicyDefaults} to use in evaluating this <code>Expression</code>
-     * @return a {@link com.att.research.xacmlatt.pdp.policy.ExpressionResult}
+     * @return a {@link org.apache.openaz.xacml.pdp.policy.ExpressionResult}
      */
     public abstract ExpressionResult evaluate(EvaluationContext evaluationContext, PolicyDefaults policyDefaults) throws EvaluationException;
 }
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ExpressionResult.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ExpressionResult.java
index a349bb3..c59dc5f 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ExpressionResult.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ExpressionResult.java
@@ -28,13 +28,13 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.Iterator;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdStatus;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.std.StdStatus;
 
 /**
  * ExpressionResult is the object returned by the <code>evaluate</code> method of {@link Expression}
@@ -148,7 +148,7 @@
     }
 
     /**
-     * Creates a new <code>ExpressionResult</code> with the given {@link com.att.research.xacml.api.Status}.
+     * Creates a new <code>ExpressionResult</code> with the given {@link org.apache.openaz.xacml.api.Status}.
      *
      * @param statusIn the <code>Status</code> of this <code>ExpressionResult</code>
      */
@@ -175,7 +175,7 @@
     }
 
     /**
-     * Gets the single {@link com.att.research.xacml.api.AttributeValue} from this <code>ExpressionResult</code>.  If this
+     * Gets the single {@link org.apache.openaz.xacml.api.AttributeValue} from this <code>ExpressionResult</code>.  If this
      * <code>ExpressionResult</code> represents a bag, the first element in the bag is returned.
      *
      * @return a single <code>AttributeValue</code> from this <code>ExpressionResult</code>
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ExpressionResultBoolean.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ExpressionResultBoolean.java
index b29447a..fda74e9 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ExpressionResultBoolean.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ExpressionResultBoolean.java
@@ -28,12 +28,12 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.datatypes.DataTypeBoolean;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.datatypes.DataTypeBoolean;
 
 /**
  * ExpressionResultBoolean extends {@link ExpressionResult} to represent predicates.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgument.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgument.java
index 61219cd..e73a3ef 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgument.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgument.java
@@ -28,19 +28,19 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Status;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Status;
 
 /**
- * FunctionArgument is the interface implemented by objects that can serve as arguments to a {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition}
+ * FunctionArgument is the interface implemented by objects that can serve as arguments to a {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition}
  * <code>evaluate</code> call.
  *
  */
 public interface FunctionArgument {
     /**
-     * Gets the {@link com.att.research.xacml.api.Status} from the evaluation of this <code>FunctionArgument</code>.
+     * Gets the {@link org.apache.openaz.xacml.api.Status} from the evaluation of this <code>FunctionArgument</code>.
      *
      * @return the <code>Status</code> from the evaluation of this <code>FunctionArgument</code>>
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentAttributeValue.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentAttributeValue.java
index 44822f5..14dbacf 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentAttributeValue.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentAttributeValue.java
@@ -28,15 +28,15 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdStatus;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.std.StdStatus;
 
 /**
  * FunctionArgumentAttributeValue implements {@link FunctionArgument} for a single
- * {@link com.att.research.xacml.api.AttributeValue}
+ * {@link org.apache.openaz.xacml.api.AttributeValue}
  *
  */
 public class FunctionArgumentAttributeValue implements FunctionArgument {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentBag.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentBag.java
index 5e84bde..f2d8292 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentBag.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentBag.java
@@ -28,13 +28,13 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.Iterator;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdStatus;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.std.StdStatus;
 
 /**
  * FunctionArgumentBag implements the {@link FunctionArgument} interface for
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentExpression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentExpression.java
index 721556a..7319e9d 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentExpression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionArgumentExpression.java
@@ -28,14 +28,14 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
  * FunctionArgumentExpression implements the {@link FunctionArgument} interface for
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionDefinition.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionDefinition.java
index a27806c..55ec175 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionDefinition.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionDefinition.java
@@ -28,12 +28,12 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.List;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
 
 /**
  * FunctionDefinition is the interface that objects representing XACML functions found in Match and Apply elements in Policies, PolicySets
@@ -42,7 +42,7 @@
  */
 public interface FunctionDefinition {
     /**
-     * Gets the {@link com.att.research.xacml.api.Identifier} for this <code>FunctionDefinition</code>.
+     * Gets the {@link org.apache.openaz.xacml.api.Identifier} for this <code>FunctionDefinition</code>.
      *
      * @return the <code>Identifier</code> for this <code>FunctionDefinition</code>.
      */
@@ -66,7 +66,7 @@
     /**
      * Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of{@link FunctionArgument}s.
      *
-     * @param evaluationContext the {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext} to use in the evaluation
+     * @param evaluationContext the {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext} to use in the evaluation
      * @param arguments the <code>List</code> of <code>FunctionArgument</code>s for the evaluation
      * @return an {@link ExpressionResult} with the results of the call
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionDefinitionFactory.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionDefinitionFactory.java
index a7ed598..378fb9f 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionDefinitionFactory.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/FunctionDefinitionFactory.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.Properties;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
-import com.att.research.xacmlatt.pdp.util.ATTPDPProperties;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.util.OpenAZPDPProperties;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
 
 /**
- * FunctionDefinitionFactory is an abstract class for mapping function {@link com.att.research.xacml.api.Identifier} ids to
+ * FunctionDefinitionFactory is an abstract class for mapping function {@link org.apache.openaz.xacml.api.Identifier} ids to
  * {@link FunctionDefinition} objects.
  *
  */
 public abstract class FunctionDefinitionFactory {
-    private static final String	FACTORYID					= ATTPDPProperties.PROP_FUNCTIONDEFINITIONFACTORY;
-    private static final String DEFAULT_FACTORY_CLASSNAME	= "com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory";
+    private static final String	FACTORYID					= OpenAZPDPProperties.PROP_FUNCTIONDEFINITIONFACTORY;
+    private static final String DEFAULT_FACTORY_CLASSNAME	= "org.apache.openaz.xacml.pdp.std.StdFunctionDefinitionFactory";
 
     protected FunctionDefinitionFactory() {
     }
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Match.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Match.java
index 4bef1fb..ae7fe69 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Match.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Match.java
@@ -28,30 +28,30 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.XACML;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
-import com.att.research.xacmlatt.pdp.eval.Matchable;
-import com.att.research.xacmlatt.pdp.policy.expressions.AttributeRetrievalBase;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.XACML;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.pdp.eval.Matchable;
+import org.apache.openaz.xacml.pdp.policy.expressions.AttributeRetrievalBase;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.util.FactoryException;
 
 /**
- * Match extends {@link com.att.research.xacmlatt.pdp.policy.PolicyComponent} and implements the
- * {@link com.att.research.xacmlatt.pdp.eval.Matchable} interface to represent a XACML Match element.
+ * Match extends {@link org.apache.openaz.xacml.pdp.policy.PolicyComponent} and implements the
+ * {@link org.apache.openaz.xacml.pdp.eval.Matchable} interface to represent a XACML Match element.
  *
  */
 public class Match extends PolicyComponent implements Matchable {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ObligationExpression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ObligationExpression.java
index 17a35eb..5271965 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ObligationExpression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/ObligationExpression.java
@@ -28,22 +28,22 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdMutableObligation;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.std.StdMutableObligation;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
  * ObligationExpression extends {@link PolicyComponent} to implement the XACML
@@ -118,13 +118,13 @@
     }
 
     /**
-     * Evaluates this <code>ObligationExpression</code> in the given {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext}
-     * to get an {@link com.att.research.xacml.api.Obligation} to include in a PDP result.
+     * Evaluates this <code>ObligationExpression</code> in the given {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext}
+     * to get an {@link org.apache.openaz.xacml.api.Obligation} to include in a PDP result.
      *
      * @param evaluationContext the <code>EvaluationContext</code> in which to evaluate this <code>ObligationExpression</code>
      * @param policyDefaults the <code>PolicyDefaults</code> to apply to the evaluation
      * @return a new <code>Obliagion</code> from this <code>ObligationExpression</code>
-     * @throws com.att.research.xacmlatt.pdp.eval.EvaluationException if there is an error evaluating any of the <code>AttributeAssignmentExpression</code>s
+     * @throws org.apache.openaz.xacml.pdp.eval.EvaluationException if there is an error evaluating any of the <code>AttributeAssignmentExpression</code>s
      */
     public Obligation evaluate(EvaluationContext evaluationContext, PolicyDefaults policyDefaults) throws EvaluationException {
         if (!this.validate()) {
@@ -154,7 +154,7 @@
      * @param policyDefaults
      * @param listObligationExpressions
      * @return
-     * @throws com.att.research.xacmlatt.pdp.eval.EvaluationException
+     * @throws org.apache.openaz.xacml.pdp.eval.EvaluationException
      */
     public static List<Obligation> evaluate(EvaluationContext evaluationContext, PolicyDefaults policyDefaults, Decision decision, Collection<ObligationExpression> listObligationExpressions) throws EvaluationException {
         List<Obligation> listObligations	= new ArrayList<Obligation>();
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Policy.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Policy.java
index a1f863c..2b89663 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Policy.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Policy.java
@@ -29,27 +29,27 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.trace.StdTraceEvent;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.trace.StdTraceEvent;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
- * Policy extends {@link com.att.research.xacmlatt.pdp.policy.PolicyDef} to represent a XACML 3.0 Policy element.
+ * Policy extends {@link org.apache.openaz.xacml.pdp.policy.PolicyDef} to represent a XACML 3.0 Policy element.
  *
  */
 public class Policy extends PolicyDef {
@@ -112,7 +112,7 @@
     }
 
     /**
-     * Gets an <code>Iterator</code> over the {@link com.att.research.xacmlatt.pdp.policy.TargetedCombinerParameter}s for
+     * Gets an <code>Iterator</code> over the {@link org.apache.openaz.xacml.pdp.policy.TargetedCombinerParameter}s for
      * the {@link Rule}s in this <code>Policy</code>.
      *
      * @return an <code>Iterator</code> over the <code>TargetedCombinerParameter</code>s for this <code>Policy</code>.
@@ -150,7 +150,7 @@
     }
 
     /**
-     * Gets an <code>Iterator</code> over the {@link com.att.research.xacmlatt.pdp.policy.VariableDefinition}s in this <code>Policy</code>.
+     * Gets an <code>Iterator</code> over the {@link org.apache.openaz.xacml.pdp.policy.VariableDefinition}s in this <code>Policy</code>.
      *
      * @return an <code>Iterator</code> over the <code>VariableDefinition</code>s in this <code>Policy</code>
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyComponent.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyComponent.java
index 91ac189..e8f2359 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyComponent.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyComponent.java
@@ -28,10 +28,10 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
  * PolicyComponent is the base class for all pieces of a XACML Policy or PolicySet that could potentially have errors associated
@@ -43,7 +43,7 @@
     private String		statusMessage;
 
     /**
-     * Creates a new <code>PolicyComponent</code> with the given {@link com.att.research.xacml.api.StatusCode} and
+     * Creates a new <code>PolicyComponent</code> with the given {@link org.apache.openaz.xacml.api.StatusCode} and
      * <code>String</code> detailed message.  If the <code>StatusCode</code> is null, a default OK status code is used.
      *
      * @param statusCodeIn the <code>StatusCode</code> for the new <code>PolicyComponent</code>
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyDef.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyDef.java
index f3260fc..618587d 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyDef.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyDef.java
@@ -28,32 +28,32 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.IdReference;
-import com.att.research.xacml.api.IdReferenceMatch;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.Version;
-import com.att.research.xacml.api.VersionMatch;
-import com.att.research.xacml.std.StdIdReference;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.IdReference;
+import org.apache.openaz.xacml.api.IdReferenceMatch;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.Version;
+import org.apache.openaz.xacml.api.VersionMatch;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.std.StdIdReference;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
- * PolicyDef extends {@link com.att.research.xacmlatt.pdp.policy.PolicySetChild} with members and methods common
+ * PolicyDef extends {@link org.apache.openaz.xacml.pdp.policy.PolicySetChild} with members and methods common
  * to XACML 3.0 Policies and PolicySets.
  *
  */
@@ -179,7 +179,7 @@
     }
 
     /**
-     * Gets the {@link com.att.research.xacmlatt.pdp.policy.PolicyIssuer} for this <code>PolicyDef</code>.
+     * Gets the {@link org.apache.openaz.xacml.pdp.policy.PolicyIssuer} for this <code>PolicyDef</code>.
      *
      * @return the <code>PolicyIssuer</code> for this <code>PolicyDef</code>
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyDefaults.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyDefaults.java
index 8fc5bee..98538a3 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyDefaults.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyDefaults.java
@@ -28,11 +28,11 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.net.URI;
 
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.XACML;
 
 /**
  * PolicyDefaults represents the default values associated with a XACML 3.0 Policy or PolicySet that may
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinder.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinder.java
index 3ee2285..0628575 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinder.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinder.java
@@ -28,29 +28,29 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.IdReferenceMatch;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.api.IdReferenceMatch;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
 
 /**
  * PolicyFinder is the interface for objects that can locate XACML Policies and PolicySets by identifier and contains the root
  * Policy or Policy set.  The interface is designed to allow for finders that can retrieve a root policy from a repository based on
- * matching a {@link com.att.research.xacml.api.Request}.
+ * matching a {@link org.apache.openaz.xacml.api.Request}.
  *
  */
 public interface PolicyFinder {
     /**
      * Gets the root {@link PolicyDef} from the policy store
      * configured by the particular implementation of the <code>PolicyFinderFactory</code> class that
-     * is applicable to the {@link com.att.research.xacml.api.Request} in the given {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext}.
+     * is applicable to the {@link org.apache.openaz.xacml.api.Request} in the given {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext}.
      *
      * @return a <code>PolicyFinderResult</code> with the root <code>PolicyDef</code>
      */
     public PolicyFinderResult<PolicyDef> getRootPolicyDef(EvaluationContext evaluationContext);
 
     /**
-     * Gets the {@link Policy} that matches the given {@link com.att.research.xacml.api.IdReferenceMatch}.
+     * Gets the {@link Policy} that matches the given {@link org.apache.openaz.xacml.api.IdReferenceMatch}.
      *
      * @param idReferenceMatch the <code>IdReferenceMatch</code> to search for
      * @return a <code>PolicyFinderResult</code> with the <code>Policy</code> matching the given <code>IdReferenceMatch</code>
@@ -58,7 +58,7 @@
     public PolicyFinderResult<Policy> getPolicy(IdReferenceMatch idReferenceMatch);
 
     /**
-     * Gets the {@link PolicySet} that matches the given {@link com.att.research.xacml.api.IdReferenceMatch}.
+     * Gets the {@link PolicySet} that matches the given {@link org.apache.openaz.xacml.api.IdReferenceMatch}.
      *
      * @param idReferenceMatch the <code>IdReferenceMatch</code> to search for
      * @return a <code>PolicyFinderResult</code> with the <code>PolicySet</code> matching the given <code>IdReferenceMatch</code>.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinderFactory.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinderFactory.java
index 77b51b8..305830a 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinderFactory.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinderFactory.java
@@ -28,13 +28,13 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.Properties;
 
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
-import com.att.research.xacmlatt.pdp.util.ATTPDPProperties;
+import org.apache.openaz.xacml.pdp.util.OpenAZPDPProperties;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
 
 /**
  * PolicyFinderFactory provides methods for loading XACML 3.0 policies and policy sets that are used
@@ -42,8 +42,8 @@
  *
  */
 public abstract class PolicyFinderFactory {
-    private static final String	FACTORYID					= ATTPDPProperties.PROP_POLICYFINDERFACTORY;
-    private static final String DEFAULT_FACTORY_CLASSNAME	= "com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory";
+    private static final String	FACTORYID					= OpenAZPDPProperties.PROP_POLICYFINDERFACTORY;
+    private static final String DEFAULT_FACTORY_CLASSNAME	= "org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory";
 
     protected PolicyFinderFactory() {
     }
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinderResult.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinderResult.java
index a73bf1d..e4e14d8 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinderResult.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyFinderResult.java
@@ -28,18 +28,18 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.Status;
+import org.apache.openaz.xacml.api.Status;
 
 /**
- * PolicyFinderResult is the interface for return values of the methods in the {@link com.att.research.xacmlatt.pdp.policy.PolicyFinderFactory} interface.
+ * PolicyFinderResult is the interface for return values of the methods in the {@link org.apache.openaz.xacml.pdp.policy.PolicyFinderFactory} interface.
  *
  * @param <T> the class extending {@link PolicyDef} contained as a result in this <code>PolicyFinderResult</code>
  */
 public interface PolicyFinderResult<T extends PolicyDef> {
     /**
-     * Gets the {@link com.att.research.xacml.api.Status} of the method call.
+     * Gets the {@link org.apache.openaz.xacml.api.Status} of the method call.
      *
      * @return the <code>Status</code> of the method call
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIdReference.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIdReference.java
index d997189..aa31e5e 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIdReference.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIdReference.java
@@ -28,14 +28,14 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
 
 /**
- * PolicyIdReference extends {@link com.att.research.xacmlatt.pdp.policy.PolicyIdReferenceBase} for
+ * PolicyIdReference extends {@link org.apache.openaz.xacml.pdp.policy.PolicyIdReferenceBase} for
  * {@link Policy} objects with an implementation of the <code>ensureReferencee</code>
  * method to find a <code>Policy</code>.
  *
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIdReferenceBase.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIdReferenceBase.java
index b8a938c..90e56e4 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIdReferenceBase.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIdReferenceBase.java
@@ -28,17 +28,17 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.IdReferenceMatch;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.IdReferenceMatch;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
  * PolicyIdReferenceBase extends {@link PolicySetChild} to implement a XACML PolicyIdReference element.
@@ -68,7 +68,7 @@
      *
      * @param evaluationContext the <code>EvaluationContext</code> to search for the referencee
      * @return the <code>T</code> referencee if found, else null
-     * @throws com.att.research.xacmlatt.pdp.eval.EvaluationException if there is an error attempting to locate the referenced <code>T</code>.
+     * @throws org.apache.openaz.xacml.pdp.eval.EvaluationException if there is an error attempting to locate the referenced <code>T</code>.
      */
     protected abstract T ensureReferencee(EvaluationContext evaluationContext) throws EvaluationException;
 
@@ -92,7 +92,7 @@
     }
 
     /**
-     * Gets the {@link com.att.research.xacml.api.IdReferenceMatch} for this <code>PolicyIdReferenceBase</code>.
+     * Gets the {@link org.apache.openaz.xacml.api.IdReferenceMatch} for this <code>PolicyIdReferenceBase</code>.
      *
      * @return the <code>IdReferenceMatch</code> for this <code>PolicyIdReference</code>.
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIssuer.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIssuer.java
index 8f9ffed..32a8e49 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIssuer.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicyIssuer.java
@@ -28,21 +28,20 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.std.StdStatusCode;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatusCode;
-
 /**
- * PolicyIssuer extends {@link com.att.research.xacmlatt.pdp.policy.PolicyComponent} to represent the XACML 3.0
+ * PolicyIssuer extends {@link org.apache.openaz.xacml.pdp.policy.PolicyComponent} to represent the XACML 3.0
  * PolicyIssuer element in Policies and PolicySets.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySet.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySet.java
index 7d8b9f8..a7f4090 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySet.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySet.java
@@ -28,26 +28,26 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.trace.Traceable;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.trace.StdTraceEvent;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.trace.Traceable;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.trace.StdTraceEvent;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
  * PolicySet extends {@link PolicyDef} to represent a XACML PolicySet element.
@@ -114,7 +114,7 @@
     }
 
     /**
-     * Gets an <code>Iterator</code> over the {@link com.att.research.xacmlatt.pdp.policy.TargetedCombinerParameter}s
+     * Gets an <code>Iterator</code> over the {@link org.apache.openaz.xacml.pdp.policy.TargetedCombinerParameter}s
      * for {@link Policy} elements in this
      * <code>PolicySet</code>.
      *
@@ -170,7 +170,7 @@
     }
 
     /**
-     * Gets the {@link com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm} for <code>PolicySetChild</code> children for this <code>PolicySet</code>.
+     * Gets the {@link org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm} for <code>PolicySetChild</code> children for this <code>PolicySet</code>.
      *
      * @return the <code>CombiningAlgorithm</code> for <code>PolicySetChild</code> children for this <code>PolicySet</code>.
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySetChild.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySetChild.java
index 8b7036d..ac83e16 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySetChild.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySetChild.java
@@ -28,14 +28,14 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.trace.Traceable;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacmlatt.pdp.eval.Evaluatable;
-import com.att.research.xacmlatt.pdp.eval.Matchable;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.trace.Traceable;
+import org.apache.openaz.xacml.pdp.eval.Evaluatable;
+import org.apache.openaz.xacml.pdp.eval.Matchable;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
  * PolicySetChild extends {@link com.att.research.xacmlatt.pdp.PolicyComponent} to represent XACML 3.0 Policies, PolicySets, PolicyReferences,
@@ -48,7 +48,7 @@
     private PolicySet parent;
 
     /**
-     * Creates a new <code>PolicySetChild</code> with the given given {@link com.att.research.xacml.api.StatusCode}
+     * Creates a new <code>PolicySetChild</code> with the given given {@link org.apache.openaz.xacml.api.StatusCode}
      * and <code>String</code> status message.
      *
      * @param statusCodeIn the <code>StatusCode</code> for the new <code>PolicySetChild</code>
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySetIdReference.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySetIdReference.java
index 1078c1b..6699787 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySetIdReference.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/PolicySetIdReference.java
@@ -28,14 +28,14 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
 
 /**
- * PolicySetIdReference extends {@link com.att.research.xacmlatt.pdp.policy.PolicyIdReferenceBase} for
+ * PolicySetIdReference extends {@link org.apache.openaz.xacml.pdp.policy.PolicyIdReferenceBase} for
  * {@link com.att.research.xacmlatt.pdp.PolicySet} objects to implement the <code>ensureReferencee</code>
  * method to find <code>PolicySet</code>s.
  *
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Rule.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Rule.java
index 0e5645c..201b233 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Rule.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Rule.java
@@ -28,33 +28,33 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.trace.Traceable;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.trace.StdTraceEvent;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.eval.Evaluatable;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
-import com.att.research.xacmlatt.pdp.eval.Matchable;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.trace.Traceable;
+import org.apache.openaz.xacml.pdp.eval.Evaluatable;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.pdp.eval.Matchable;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.trace.StdTraceEvent;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
- * Rule extends {@link com.att.research.xacmlatt.pdp.policy.PolicyComponent} to represent a XACML Rule within a Policy.  It implements
- * {@link com.att.research.xacmlatt.pdp.eval.Matchable} and {@link com.att.research.xacmlatt.pdp.eval.Evaluatable} for matching and evaluation
+ * Rule extends {@link org.apache.openaz.xacml.pdp.policy.PolicyComponent} to represent a XACML Rule within a Policy.  It implements
+ * {@link org.apache.openaz.xacml.pdp.eval.Matchable} and {@link org.apache.openaz.xacml.pdp.eval.Evaluatable} for matching and evaluation
  * a request.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/RuleEffect.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/RuleEffect.java
index 39a58c7..4d380ba 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/RuleEffect.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/RuleEffect.java
@@ -28,9 +28,9 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Decision;
 
 /**
  * RuleEffect is an enumeration of the XACML decision effects that a {@link Rule} may apply
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Target.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Target.java
index 9a32110..0357a68 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Target.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Target.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
-import com.att.research.xacmlatt.pdp.eval.Matchable;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.pdp.eval.Matchable;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
- * Target extends {@link com.att.research.xacmlatt.pdp.policy.PolicyComponent} to implement XACML 3.0 Target elements for
+ * Target extends {@link org.apache.openaz.xacml.pdp.policy.PolicyComponent} to implement XACML 3.0 Target elements for
  * Policies, PolicySets, and Rules.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/TargetedCombinerParameter.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/TargetedCombinerParameter.java
index 70c221f..ae9b721 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/TargetedCombinerParameter.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/TargetedCombinerParameter.java
@@ -28,10 +28,10 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.StatusCode;
 
 /**
  * TargetedCombinerParameter extends {@link CombinerParameter} to include a lazy
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/TargetedCombinerParameterMap.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/TargetedCombinerParameterMap.java
index 3fa2086..c00a1a0 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/TargetedCombinerParameterMap.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/TargetedCombinerParameterMap.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/VariableDefinition.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/VariableDefinition.java
index 03bd6f7..3266f50 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/VariableDefinition.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/VariableDefinition.java
@@ -28,10 +28,10 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
  * VariableDefinition extends {@link PolicyComponent} to represent a XACML VariableDefinition element.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/VariableMap.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/VariableMap.java
index fdb9001..25bd336 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/VariableMap.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/VariableMap.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -37,10 +37,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.att.research.xacml.util.StringUtils;
+import org.apache.openaz.xacml.util.StringUtils;
 
 /**
- * VariableMap is a collection of {@link com.att.research.xacmlatt.pdp.policy.VariableDefinition}s that are accessible by
+ * VariableMap is a collection of {@link org.apache.openaz.xacml.pdp.policy.VariableDefinition}s that are accessible by
  * the variable identifier.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAdviceExpression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAdviceExpression.java
index 5db421d..ffb1b5a 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAdviceExpression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAdviceExpression.java
@@ -28,28 +28,27 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.AdviceExpression;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.RuleEffect;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.AdviceExpression;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.RuleEffect;
-
 /**
- * DOMAdviceExpression extends {@link com.att.research.xacmlatt.pdp.policy.AdviceExpression} with methods for creation
+ * DOMAdviceExpression extends {@link org.apache.openaz.xacml.pdp.policy.AdviceExpression} with methods for creation
  * from {@link org.w3c.dom.Node}s.
  *
  */
@@ -63,7 +62,7 @@
      * Creates a new <code>AdviceExpression</code> by parsing the given <code>Node</code> representing a XACML AdviceExpression element.
      *
      * @param nodeAdviceExpression the <code>Node</code> representing the XACML AdviceExpression element
-     * @param policy the {@link com.att.research.xacmlatt.pdp.policy.Policy} encompassing the AdviceExpression element
+     * @param policy the {@link org.apache.openaz.xacml.pdp.policy.Policy} encompassing the AdviceExpression element
      * @return a new <code>AdviceExpression</code> parsed from the given <code>Node</code>
      * @throws DOMStructureException if there is an error parsing the <code>Node</code>
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAllOf.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAllOf.java
index 94c3566..6f9d304 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAllOf.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAllOf.java
@@ -28,23 +28,22 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.AllOf;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.AllOf;
-
 /**
- * DOMAllOf extends {@link com.att.research.xacmlatt.pdp.policy.AllOf} with methods for creation from
+ * DOMAllOf extends {@link org.apache.openaz.xacml.pdp.policy.AllOf} with methods for creation from
  * DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAnyOf.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAnyOf.java
index 7013e5d..3110233 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAnyOf.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAnyOf.java
@@ -28,23 +28,22 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.AnyOf;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.AnyOf;
-
 /**
- * DOMAnyOf extends {@link com.att.research.xacmlatt.pdp.policy.AnyOf} with methods for creation
+ * DOMAnyOf extends {@link org.apache.openaz.xacml.pdp.policy.AnyOf} with methods for creation
  * from DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMApply.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMApply.java
index e5e97c1..fcb25c2 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMApply.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMApply.java
@@ -28,24 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.expressions.Apply;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.expressions.Apply;
-
 /**
- * DOMApply extends {@link com.att.research.xacmlatt.pdp.policy.expressions.Apply} with methods for creation from
+ * DOMApply extends {@link org.apache.openaz.xacml.pdp.policy.expressions.Apply} with methods for creation from
  * DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeAssignmentExpression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeAssignmentExpression.java
index f33a08e..cb322ef 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeAssignmentExpression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeAssignmentExpression.java
@@ -28,24 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.AttributeAssignmentExpression;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.AttributeAssignmentExpression;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-
 /**
- * DOMAttributeAssignmentExpression extends {@link com.att.research.xacmlatt.pdp.policy.AttributeAssignmentExpression} with
+ * DOMAttributeAssignmentExpression extends {@link org.apache.openaz.xacml.pdp.policy.AttributeAssignmentExpression} with
  * methods for creation from {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeDesignator.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeDesignator.java
index 3ccb4fc..3c97966 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeDesignator.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeDesignator.java
@@ -28,22 +28,21 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.expressions.AttributeDesignator;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.expressions.AttributeDesignator;
-
 /**
- * DOMAttributeDesignator extends {@link com.att.research.xacmlatt.pdp.policy.expressions.AttributeDesignator} with methods
+ * DOMAttributeDesignator extends {@link org.apache.openaz.xacml.pdp.policy.expressions.AttributeDesignator} with methods
  * for creation from DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeSelector.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeSelector.java
index 0385158..8492339 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeSelector.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMAttributeSelector.java
@@ -28,23 +28,22 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.expressions.AttributeSelector;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.expressions.AttributeSelector;
-
 /**
- * DOMAttributeSelector extends {@link com.att.research.xacmlatt.pdp.policy.expressions.AttributeSelector} with methods
+ * DOMAttributeSelector extends {@link org.apache.openaz.xacml.pdp.policy.expressions.AttributeSelector} with methods
  * for creation from DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMCombinerParameter.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMCombinerParameter.java
index 958c928..12d1204 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMCombinerParameter.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMCombinerParameter.java
@@ -28,27 +28,26 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMAttributeValue;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMAttributeValue;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-
 /**
- * DOMCombinerParameter extends {@link com.att.research.xacmlatt.pdp.policy.CombinerParameter} with methods for
+ * DOMCombinerParameter extends {@link org.apache.openaz.xacml.pdp.policy.CombinerParameter} with methods for
  * creation from DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMDocumentRepair.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMDocumentRepair.java
index 620b468..c48e181 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMDocumentRepair.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMDocumentRepair.java
@@ -28,21 +28,20 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-
 /**
- * DOMDocumentRepair extends {@link com.att.research.xacml.std.dom.DOMDocumentRepair} to repair Policy documents as well as
+ * DOMDocumentRepair extends {@link org.apache.openaz.xacml.std.dom.DOMDocumentRepair} to repair Policy documents as well as
  * Request and Response documents.
  *
  */
-public class DOMDocumentRepair extends com.att.research.xacml.std.dom.DOMDocumentRepair {
+public class DOMDocumentRepair extends org.apache.openaz.xacml.std.dom.DOMDocumentRepair {
     protected boolean repairPolicy(Node nodePolicy) throws DOMStructureException {
         return DOMPolicy.repair(nodePolicy);
     }
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMExpression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMExpression.java
index c427dfa..8fab00d 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMExpression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMExpression.java
@@ -28,28 +28,27 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.Expression;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.expressions.AttributeValueExpression;
+import org.apache.openaz.xacml.pdp.policy.expressions.Function;
+import org.apache.openaz.xacml.pdp.policy.expressions.VariableReference;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMAttributeValue;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMAttributeValue;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.Expression;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.expressions.AttributeValueExpression;
-import com.att.research.xacmlatt.pdp.policy.expressions.Function;
-import com.att.research.xacmlatt.pdp.policy.expressions.VariableReference;
-
 /**
- * DOMExpression extends {@link com.att.research.xacmlatt.pdp.policy.Expression} with methods for creation
+ * DOMExpression extends {@link org.apache.openaz.xacml.pdp.policy.Expression} with methods for creation
  * from DOM {@link org.w3c.dom.Node}s.
  *
  */
@@ -74,7 +73,7 @@
      * Creates a new <code>Expression</code> of the appropriate sub-type based on the name of the given <code>Node</code>.
      *
      * @param nodeExpression the <code>Node</code> to parse
-     * @param policy the {@link com.att.research.xacmlatt.pdp.policy.Policy} containing the Expression element
+     * @param policy the {@link org.apache.openaz.xacml.pdp.policy.Policy} containing the Expression element
      * @return a new <code>Expression</code> parsed from the given <code>Node</code>
      * @throws DOMStructureException if there is an error parsing the <code>Node</code>
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMMatch.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMMatch.java
index 273f75e..cee77ce 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMMatch.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMMatch.java
@@ -28,24 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.Match;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMAttributeValue;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMAttributeValue;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.Match;
-
 /**
- * DOMMatch extends {@link com.att.research.xacmlatt.pdp.policy.Match} with methods for creation from
+ * DOMMatch extends {@link org.apache.openaz.xacml.pdp.policy.Match} with methods for creation from
  * DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMObligationExpression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMObligationExpression.java
index 32dd9d8..6c1731d 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMObligationExpression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMObligationExpression.java
@@ -28,28 +28,27 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.ObligationExpression;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.RuleEffect;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.ObligationExpression;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.RuleEffect;
-
 /**
- * DOMObligationExpression extends {@link com.att.research.xacmlatt.pdp.policy.ObligationExpression} with methods
+ * DOMObligationExpression extends {@link org.apache.openaz.xacml.pdp.policy.ObligationExpression} with methods
  * for creation from {@link org.w3c.dom.Node}s.
  *
  */
@@ -63,7 +62,7 @@
      * Creates a new <code>ObligationExpression</code> by parsing the given <code>Node</code> representing a XACML ObligationExpression element.
      *
      * @param nodeObligationExpression the <code>Node</code> representing the XACML ObligationExpression element
-     * @param policy the {@link com.att.research.xacmlatt.pdp.policy.Policy} encompassing the ObligationExpression element
+     * @param policy the {@link org.apache.openaz.xacml.pdp.policy.Policy} encompassing the ObligationExpression element
      * @return a new <code>ObligationExpression</code> parsed from the given <code>Node</code>
      * @throws DOMStructureException if there is an error parsing the <code>Node</code>
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicy.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicy.java
index 0d58b6a..f17fb4e 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicy.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicy.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import java.io.File;
 import java.util.Iterator;
@@ -38,28 +38,27 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithmFactory;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.pdp.policy.PolicySet;
+import org.apache.openaz.xacml.pdp.policy.Rule;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.StringUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithmFactory;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.PolicyDefaults;
-import com.att.research.xacmlatt.pdp.policy.PolicySet;
-import com.att.research.xacmlatt.pdp.policy.Rule;
-
 /**
- * DOMPolicy extends {@link com.att.research.xacmlatt.pdp.policy.Policy} with methods for creation from a
+ * DOMPolicy extends {@link org.apache.openaz.xacml.pdp.policy.Policy} with methods for creation from a
  * DOM {@link org.w3c.dom.Node}.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyCombinerParameter.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyCombinerParameter.java
index fc531ca..230a65e 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyCombinerParameter.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyCombinerParameter.java
@@ -28,27 +28,26 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.pdp.policy.TargetedCombinerParameter;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMAttributeValue;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMAttributeValue;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
-import com.att.research.xacmlatt.pdp.policy.TargetedCombinerParameter;
-
 /**
- * DOMPolicyCombinerParameter extends {@link com.att.research.xacmlatt.pdp.policy.TargetedCombinerParameter} for
- * {@link com.att.research.xacmlatt.pdp.policy.Policy}s with methods for creation from DOM {@link org.w3c.dom.Node}s.
+ * DOMPolicyCombinerParameter extends {@link org.apache.openaz.xacml.pdp.policy.TargetedCombinerParameter} for
+ * {@link org.apache.openaz.xacml.pdp.policy.Policy}s with methods for creation from DOM {@link org.w3c.dom.Node}s.
  *
  */
 public class DOMPolicyCombinerParameter extends TargetedCombinerParameter<Identifier, PolicySetChild> {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java
index fb23d10..2240e35 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import java.io.File;
 import java.io.InputStream;
@@ -36,17 +36,16 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.PolicyDef;
+import org.apache.openaz.xacml.pdp.policy.PolicySet;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.PolicyDef;
-import com.att.research.xacmlatt.pdp.policy.PolicySet;
-
 /**
- * DOMPolicyDef extends {@link com.att.research.xacmlatt.pdp.policy.PolicyDef} with methods for loading them from a <code>File</code>.
+ * DOMPolicyDef extends {@link org.apache.openaz.xacml.pdp.policy.PolicyDef} with methods for loading them from a <code>File</code>.
  *
  */
 public abstract class DOMPolicyDef {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDefaults.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDefaults.java
index 46df81b..f269ef1 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDefaults.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDefaults.java
@@ -29,25 +29,24 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import java.net.URI;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.PolicyDefaults;
-
 /**
- * DOMPolicyDefaults extends {@link com.att.research.xacmlatt.pdp.policy.PolicyDefaults} with methods for creation from
+ * DOMPolicyDefaults extends {@link org.apache.openaz.xacml.pdp.policy.PolicyDefaults} with methods for creation from
  * DOM {@org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyIdReference.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyIdReference.java
index 9dc829c..c8fa442 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyIdReference.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyIdReference.java
@@ -28,19 +28,18 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
+import org.apache.openaz.xacml.pdp.policy.PolicyIdReference;
+import org.apache.openaz.xacml.pdp.policy.PolicySet;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMIdReferenceMatch;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMIdReferenceMatch;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacmlatt.pdp.policy.PolicyIdReference;
-import com.att.research.xacmlatt.pdp.policy.PolicySet;
-
 /**
- * DOMPolicyIdReference extends {@link com.att.research.xacmlatt.pdp.policy.PolicyIdReference} with methods for creation
+ * DOMPolicyIdReference extends {@link org.apache.openaz.xacml.pdp.policy.PolicyIdReference} with methods for creation
  * from DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyIssuer.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyIssuer.java
index e3ab3ba..bdd0da7 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyIssuer.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyIssuer.java
@@ -28,24 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.PolicyIssuer;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMAttribute;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMAttribute;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.PolicyIssuer;
-
 /**
  * DOMPolicyIssuer extends {@link com.att.research.xacmlatt.pdp.policy.PolicyIsser} with methods for creation from
  * DOM {@link org.w3c.dom.Node}s.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyRepair.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyRepair.java
index 6b6edd1..fc903b9 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyRepair.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyRepair.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -39,13 +39,12 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.dom.DOMUtil;
-
 /**
  * DOMPolicyRepair is an application for reading a XACML Policy or PolicySet document and ensuring it has the required attributes and then writing
  * the repaired Policy or PolicySet to an output file.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySet.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySet.java
index a11b107..5ad821d 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySet.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySet.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import java.io.File;
 import java.util.Iterator;
@@ -38,27 +38,26 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithmFactory;
+import org.apache.openaz.xacml.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.pdp.policy.PolicySet;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.StringUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithmFactory;
-import com.att.research.xacmlatt.pdp.policy.PolicyDefaults;
-import com.att.research.xacmlatt.pdp.policy.PolicySet;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
-
 /**
- * DOMPolicySet extends {@link com.att.research.xacmlatt.pdp.policy.PolicySet} with methods for creation
+ * DOMPolicySet extends {@link org.apache.openaz.xacml.pdp.policy.PolicySet} with methods for creation
  * from DOM {@link org.w3c.dom.Node}s.
  *
  */
@@ -72,7 +71,7 @@
      * Creates a new <code>PolicySet</code> by parsing the given <code>Node</code> representing a XACML PolicySet element.
      *
      * @param nodePolicySet the <code>Node</code> representing the XACML PolicySetelement
-     * @param policyDefaultsParent the {@link com.att.research.xacmlatt.pdp.policy.PolicyDefaults} from the parent element
+     * @param policyDefaultsParent the {@link org.apache.openaz.xacml.pdp.policy.PolicyDefaults} from the parent element
      * @return a new <code>PolicySet</code> parsed from the given <code>Node</code>
      * @throws DOMStructureException if there is an error parsing the <code>Node</code>
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySetCombinerParameter.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySetCombinerParameter.java
index 155c9a9..e287a47 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySetCombinerParameter.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySetCombinerParameter.java
@@ -28,27 +28,26 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.pdp.policy.TargetedCombinerParameter;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMAttributeValue;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMAttributeValue;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
-import com.att.research.xacmlatt.pdp.policy.TargetedCombinerParameter;
-
 /**
- * DOMPolicySetCombinerParameter extends {@link com.att.research.xacmlatt.pdp.policy.TargetedCombinerParameter} for
- * {@link com.att.research.xacmlatt.pdp.policy.PolicySet}s with methods for creation from DOM {@link org.w3c.dom.Node}s.
+ * DOMPolicySetCombinerParameter extends {@link org.apache.openaz.xacml.pdp.policy.TargetedCombinerParameter} for
+ * {@link org.apache.openaz.xacml.pdp.policy.PolicySet}s with methods for creation from DOM {@link org.w3c.dom.Node}s.
  *
  */
 public class DOMPolicySetCombinerParameter extends TargetedCombinerParameter<Identifier, PolicySetChild> {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySetIdReference.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySetIdReference.java
index 23b4de8..2224f06 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySetIdReference.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicySetIdReference.java
@@ -28,19 +28,18 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
+import org.apache.openaz.xacml.pdp.policy.PolicySet;
+import org.apache.openaz.xacml.pdp.policy.PolicySetIdReference;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMIdReferenceMatch;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMIdReferenceMatch;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacmlatt.pdp.policy.PolicySet;
-import com.att.research.xacmlatt.pdp.policy.PolicySetIdReference;
-
 /**
- * DOMPolicySetIdReference extends {@link com.att.research.xacmlatt.pdp.policy.PolicySetIdReference} with methods for creation
+ * DOMPolicySetIdReference extends {@link org.apache.openaz.xacml.pdp.policy.PolicySetIdReference} with methods for creation
  * from DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMRule.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMRule.java
index 2af2722..c83f0de 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMRule.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMRule.java
@@ -28,29 +28,28 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import java.util.Iterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.Condition;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.Rule;
+import org.apache.openaz.xacml.pdp.policy.RuleEffect;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.Condition;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.Rule;
-import com.att.research.xacmlatt.pdp.policy.RuleEffect;
-
 /**
- * DOMRule extends {@link com.att.research.xacmlatt.pdp.policy.Rule} with methods for creation from
+ * DOMRule extends {@link org.apache.openaz.xacml.pdp.policy.Rule} with methods for creation from
  * DOM {@link org.w3c.dom.Node}s.
  *
  */
@@ -64,7 +63,7 @@
      * Creates a new <code>Rule</code> by parsing the given <code>Node</code> representing a XACML Rule element.
      *
      * @param nodeRule the <code>Node</code> representing the XACML Rule element
-     * @param policy the {@link com.att.research.xacmlatt.pdp.policy.Policy} encompassing the Rule element
+     * @param policy the {@link org.apache.openaz.xacml.pdp.policy.Policy} encompassing the Rule element
      * @return a new <code>Rule</code> parsed from the given <code>Node</code>
      * @throws DOMStructureException if there is an error parsing the <code>Node</code>
      */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMRuleCombinerParameters.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMRuleCombinerParameters.java
index b20c7c6..f5d0505 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMRuleCombinerParameters.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMRuleCombinerParameters.java
@@ -28,25 +28,24 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.Rule;
+import org.apache.openaz.xacml.pdp.policy.TargetedCombinerParameter;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMAttributeValue;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMAttributeValue;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.Rule;
-import com.att.research.xacmlatt.pdp.policy.TargetedCombinerParameter;
-
 /**
- * DOMRuleCombinerParameters extends {@link com.att.research.xacmlatt.pdp.policy.TargetedCombinerParameter} with methods
+ * DOMRuleCombinerParameters extends {@link org.apache.openaz.xacml.pdp.policy.TargetedCombinerParameter} with methods
  * for creation from DOM {@link org.w3c.dom.Node}s.
  *
  */
@@ -57,7 +56,7 @@
     }
 
     /**
-     * Creates a new <code>TargetedCombinerParameter</code> for {@link com.att.research.xacmlatt.pdp.policy.Rule}s by parsing the
+     * Creates a new <code>TargetedCombinerParameter</code> for {@link org.apache.openaz.xacml.pdp.policy.Rule}s by parsing the
      * given <code>Node</code> representing a XACML RuleCombinerParameters element.
      *
      * @param nodeRuleCombinerParameters the <code>Node</code> representing the XACML RuleCombinerParameters element.
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMTarget.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMTarget.java
index 6c53b6d..b93712a 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMTarget.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMTarget.java
@@ -28,23 +28,22 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.Target;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.Target;
-
 /**
- * DOMTarget extends {@link com.att.research.xacmlatt.pdp.policy.Target} with methods for creation from
+ * DOMTarget extends {@link org.apache.openaz.xacml.pdp.policy.Target} with methods for creation from
  * DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMVariableDefinition.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMVariableDefinition.java
index f02676b..9d7e89c 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMVariableDefinition.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMVariableDefinition.java
@@ -28,23 +28,22 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.VariableDefinition;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.VariableDefinition;
-
 /**
- * DOMVariableDefinition extends {@link com.att.research.xacmlatt.pdp.policy.VariableDefinition} with methods
+ * DOMVariableDefinition extends {@link org.apache.openaz.xacml.pdp.policy.VariableDefinition} with methods
  * for creation from DOM {@link org.w3c.dom.Node}s.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/package-info.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/package-info.java
index bc8e302..7557c4c 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/package-info.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/package-info.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.policy.dom;
+package org.apache.openaz.xacml.pdp.policy.dom;
 
 /**
  * com.att.research.xacmlatt.pdp.policy.dom contains class definitions that extend {@link com.att.research.xacmlatt.pdp.policy} classes
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/Apply.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/Apply.java
index f39d4d2..5bc53d3 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/Apply.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/Apply.java
@@ -28,30 +28,30 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.expressions;
+package org.apache.openaz.xacml.pdp.policy.expressions;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.policy.Expression;
-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;
-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentExpression;
-import com.att.research.xacmlatt.pdp.policy.FunctionDefinition;
-import com.att.research.xacmlatt.pdp.policy.FunctionDefinitionFactory;
-import com.att.research.xacmlatt.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.policy.Expression;
+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;
+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;
+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentExpression;
+import org.apache.openaz.xacml.pdp.policy.FunctionDefinition;
+import org.apache.openaz.xacml.pdp.policy.FunctionDefinitionFactory;
+import org.apache.openaz.xacml.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.util.FactoryException;
 
 /**
- * Apply extends {@link com.att.research.xacmlatt.pdp.policy.Expression} to implement the XACML Apply Expression element.
+ * Apply extends {@link org.apache.openaz.xacml.pdp.policy.Expression} to implement the XACML Apply Expression element.
  *
  */
 public class Apply extends Expression {
@@ -97,7 +97,7 @@
     }
 
     /**
-     * Gets and caches the {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} matching the
+     * Gets and caches the {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} matching the
      * <code>Identifier</code> for the FunctionId in this <code>Apply</code>.
      *
      * @return the <code>FunctionDefinition</code> for the <code>Identifier</code> for the Function Id for this <code>Apply</code>
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeDesignator.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeDesignator.java
index 6f6634d..464afa7 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeDesignator.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeDesignator.java
@@ -28,30 +28,30 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.expressions;
+package org.apache.openaz.xacml.pdp.policy.expressions;
 
 import java.util.Collection;
 
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.MissingAttributeDetail;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.StatusDetail;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.api.pip.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.StdMutableMissingAttributeDetail;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.StdStatusDetail;
-import com.att.research.xacml.std.pip.StdPIPRequest;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.policy.Bag;
-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
-import com.att.research.xacmlatt.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.MissingAttributeDetail;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.StatusDetail;
+import org.apache.openaz.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.api.pip.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.policy.Bag;
+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;
+import org.apache.openaz.xacml.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.std.StdMutableMissingAttributeDetail;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.StdStatusDetail;
+import org.apache.openaz.xacml.std.pip.StdPIPRequest;
 
 /**
  * AttributeDesignator extends {@link com.att.research.xacmlatt.pdp.policy.expression.AttributeRetrievalBase} to represent the
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeRetrievalBase.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeRetrievalBase.java
index 942310d..ccfd090 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeRetrievalBase.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeRetrievalBase.java
@@ -28,21 +28,21 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.expressions;
+package org.apache.openaz.xacml.pdp.policy.expressions;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.StatusDetail;
-import com.att.research.xacml.api.XACML;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacmlatt.pdp.policy.Expression;
-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.StatusDetail;
+import org.apache.openaz.xacml.api.XACML;
+import org.apache.openaz.xacml.pdp.policy.Expression;
+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
 
 /**
- * AttributeRetrievalBase extends {@link com.att.research.xacmlatt.pdp.policy.PolicyComponent} and
- * implements {@link com.att.research.xacmlatt.pdp.eval.Evaluatable} to serve as an abstract base class
+ * AttributeRetrievalBase extends {@link org.apache.openaz.xacml.pdp.policy.PolicyComponent} and
+ * implements {@link org.apache.openaz.xacml.pdp.eval.Evaluatable} to serve as an abstract base class
  * for the {@link com.att.research.xacmlatt.pdp.policy.AttributeSelector} and {@link com.att.research.xacmlatt.pdp.policy.AttributeDesignator}
  * classes.
  *
@@ -71,7 +71,7 @@
     }
 
     /**
-     * Gets the {@link com.att.research.xacml.api.Identifier} for the category associated with this
+     * Gets the {@link org.apache.openaz.xacml.api.Identifier} for the category associated with this
      * <code>AttributeRetrievalBase</code>.
      *
      * @return the <code>Identifier</code> for the category of this <code>AttributeRetrievalBase</code>.
@@ -172,7 +172,7 @@
     }
 
     /**
-     * Creates the appropriate {@link com.att.research.xacmlatt.pdp.policy.ExpressionResult} for an empty list based
+     * Creates the appropriate {@link org.apache.openaz.xacml.pdp.policy.ExpressionResult} for an empty list based
      * on the <code>getMustBePresent</code> value.
      *
      * @return an appropriate <code>ExpressionResult</code>
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeSelector.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeSelector.java
index f2672d0..f57916e 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeSelector.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeSelector.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.expressions;
+package org.apache.openaz.xacml.pdp.policy.expressions;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -40,34 +40,33 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.DataType;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.DataTypeFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.RequestAttributes;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.policy.Bag;
+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;
+import org.apache.openaz.xacml.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.std.datatypes.NodeNamespaceContext;
+import org.apache.openaz.xacml.std.datatypes.XPathExpressionWrapper;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
+import org.apache.openaz.xacml.util.FactoryException;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.DataType;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.DataTypeFactory;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.RequestAttributes;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacml.std.datatypes.NodeNamespaceContext;
-import com.att.research.xacml.std.datatypes.XPathExpressionWrapper;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.policy.Bag;
-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
-import com.att.research.xacmlatt.pdp.policy.PolicyDefaults;
-
 /**
- * AttributeSelector extends {@link com.att.research.xacmlatt.pdp.policy.expressions.AttributeRetrievalBase} to implement
+ * AttributeSelector extends {@link org.apache.openaz.xacml.pdp.policy.expressions.AttributeRetrievalBase} to implement
  * the XACML AttributeSelector element.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeValueExpression.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeValueExpression.java
index 0252485..b62f810 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeValueExpression.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/AttributeValueExpression.java
@@ -28,20 +28,20 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.expressions;
+package org.apache.openaz.xacml.pdp.policy.expressions;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.policy.Expression;
-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
-import com.att.research.xacmlatt.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.policy.Expression;
+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;
+import org.apache.openaz.xacml.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
- * AttributeValueExpression extends {@link com.att.research.xacmlatt.pdp.policy.Expression} to represent XACML
+ * AttributeValueExpression extends {@link org.apache.openaz.xacml.pdp.policy.Expression} to represent XACML
  * AttributeValue elements in an Expression context.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/Function.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/Function.java
index 235235e..a7ef204 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/Function.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/Function.java
@@ -28,25 +28,25 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.expressions;
+package org.apache.openaz.xacml.pdp.policy.expressions;
 
 import java.net.URI;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.policy.Expression;
-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
-import com.att.research.xacmlatt.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.policy.Expression;
+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;
+import org.apache.openaz.xacml.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
 
 /**
- * Function extends {@link com.att.research.xacmlatt.pdp.policy.Expression} to implement the XACML Function element.
+ * Function extends {@link org.apache.openaz.xacml.pdp.policy.Expression} to implement the XACML Function element.
  *
  */
 public class Function extends Expression {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/VariableReference.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/VariableReference.java
index e4e7733..ec7d834 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/VariableReference.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/VariableReference.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.policy.expressions;
+package org.apache.openaz.xacml.pdp.policy.expressions;
 
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.trace.Traceable;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.trace.StdTraceEvent;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.policy.Expression;
-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.PolicyDefaults;
-import com.att.research.xacmlatt.pdp.policy.VariableDefinition;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.trace.Traceable;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.policy.Expression;
+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.PolicyDefaults;
+import org.apache.openaz.xacml.pdp.policy.VariableDefinition;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.trace.StdTraceEvent;
 
 /**
- * VariableReference extends {@link com.att.research.xacmlatt.pdp.policy.Expression} to implement the XACML VariableReference
+ * VariableReference extends {@link org.apache.openaz.xacml.pdp.policy.Expression} to implement the XACML VariableReference
  * element.
  *
  */
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/package-info.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/package-info.java
index cbbf0fc..e89d17a 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/package-info.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/expressions/package-info.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.policy.expressions;
+package org.apache.openaz.xacml.pdp.policy.expressions;
 
 /**
  * com.att.research.xacmlatt.pdp.policy.expressions contains class definitions that represent specific XACML elements sub-typed from
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/package-info.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/package-info.java
index 656c8a0..4633e5f 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/package-info.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/package-info.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.policy;
+package org.apache.openaz.xacml.pdp.policy;
 
 /**
  * com.att.research.xacmlatt.pdp.policy contains class definitions that represent a XACML 3.0 Policy such that it can be
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdCombiningAlgorithmFactory.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdCombiningAlgorithmFactory.java
index b0731cc..70e957a 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdCombiningAlgorithmFactory.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdCombiningAlgorithmFactory.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithmFactory;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
-import com.att.research.xacmlatt.pdp.policy.Rule;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithmFactory;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.pdp.policy.Rule;
 
 /**
- * StdCombiningAlgorithmFactory extends {@link com.att.research.xacmlatt.pdp.policy.CombiningAlgorithmFactory} to implement
- * a mapping from {@link com.att.research.xacml.api.Identifier}s to
- * the standard {@link com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm} implementations.
+ * StdCombiningAlgorithmFactory extends {@link org.apache.openaz.xacml.pdp.policy.CombiningAlgorithmFactory} to implement
+ * a mapping from {@link org.apache.openaz.xacml.api.Identifier}s to
+ * the standard {@link org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm} implementations.
  *
  */
 public class StdCombiningAlgorithmFactory extends CombiningAlgorithmFactory {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdCombiningAlgorithms.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdCombiningAlgorithms.java
index 0d1b384..06d13d4 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdCombiningAlgorithms.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdCombiningAlgorithms.java
@@ -28,29 +28,29 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
-import com.att.research.xacml.api.XACML1;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
-import com.att.research.xacmlatt.pdp.policy.Rule;
-import com.att.research.xacmlatt.pdp.std.combiners.CombinedPermitOverrides;
-import com.att.research.xacmlatt.pdp.std.combiners.DenyOverrides;
-import com.att.research.xacmlatt.pdp.std.combiners.DenyUnlessPermit;
-import com.att.research.xacmlatt.pdp.std.combiners.FirstApplicable;
-import com.att.research.xacmlatt.pdp.std.combiners.LegacyDenyOverridesPolicy;
-import com.att.research.xacmlatt.pdp.std.combiners.LegacyDenyOverridesRule;
-import com.att.research.xacmlatt.pdp.std.combiners.LegacyPermitOverridesPolicy;
-import com.att.research.xacmlatt.pdp.std.combiners.LegacyPermitOverridesRule;
-import com.att.research.xacmlatt.pdp.std.combiners.OnlyOneApplicable;
-import com.att.research.xacmlatt.pdp.std.combiners.PermitOverrides;
-import com.att.research.xacmlatt.pdp.std.combiners.PermitUnlessDeny;
-import com.att.research.xacmlatt.pdp.util.ATTPDPProperties;
+import org.apache.openaz.xacml.api.XACML1;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.pdp.policy.Rule;
+import org.apache.openaz.xacml.pdp.std.combiners.CombinedPermitOverrides;
+import org.apache.openaz.xacml.pdp.std.combiners.DenyOverrides;
+import org.apache.openaz.xacml.pdp.std.combiners.DenyUnlessPermit;
+import org.apache.openaz.xacml.pdp.std.combiners.FirstApplicable;
+import org.apache.openaz.xacml.pdp.std.combiners.LegacyDenyOverridesPolicy;
+import org.apache.openaz.xacml.pdp.std.combiners.LegacyDenyOverridesRule;
+import org.apache.openaz.xacml.pdp.std.combiners.LegacyPermitOverridesPolicy;
+import org.apache.openaz.xacml.pdp.std.combiners.LegacyPermitOverridesRule;
+import org.apache.openaz.xacml.pdp.std.combiners.OnlyOneApplicable;
+import org.apache.openaz.xacml.pdp.std.combiners.PermitOverrides;
+import org.apache.openaz.xacml.pdp.std.combiners.PermitUnlessDeny;
+import org.apache.openaz.xacml.pdp.util.OpenAZPDPProperties;
 
 /**
- * StdCombiningAlgorithms contains single instances of each of the {@link com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm}
- * implementations in the {@link com.att.research.xacmlatt.pdp.std.combiners} package.
+ * StdCombiningAlgorithms contains single instances of each of the {@link org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm}
+ * implementations in the {@link org.apache.openaz.xacml.pdp.std.combiners} package.
  *
  */
 public class StdCombiningAlgorithms {
@@ -138,6 +138,6 @@
     // Custom AT&T Policy Combing Algorithms
     //
     public static final CombiningAlgorithm<PolicySetChild> CA_POLICY_COMBINED_PERMIT_OVERRIDES
-        = new CombinedPermitOverrides<PolicySetChild>(ATTPDPProperties.ID_POLICY_COMBINEDPERMITOVERRIDES);
+        = new CombinedPermitOverrides<PolicySetChild>(OpenAZPDPProperties.ID_POLICY_COMBINEDPERMITOVERRIDES);
 
 }
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdEvaluationContext.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdEvaluationContext.java
index 18a2fb9..2a12d29 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdEvaluationContext.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdEvaluationContext.java
@@ -28,27 +28,27 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
-import com.att.research.xacml.api.IdReferenceMatch;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.pip.*;
-import com.att.research.xacml.api.trace.TraceEngine;
-import com.att.research.xacml.api.trace.TraceEngineFactory;
-import com.att.research.xacml.api.trace.TraceEvent;
-import com.att.research.xacml.std.pip.engines.RequestEngine;
-import com.att.research.xacml.std.pip.finders.RequestFinder;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.policy.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.IdReferenceMatch;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.pip.*;
+import org.apache.openaz.xacml.api.trace.TraceEngine;
+import org.apache.openaz.xacml.api.trace.TraceEngineFactory;
+import org.apache.openaz.xacml.api.trace.TraceEvent;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.policy.*;
+import org.apache.openaz.xacml.std.pip.engines.RequestEngine;
+import org.apache.openaz.xacml.std.pip.finders.RequestFinder;
+import org.apache.openaz.xacml.util.FactoryException;
 
 import java.util.Collection;
 import java.util.Properties;
 
 /**
- * StdEvaluationContext implements the {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext} interface using
+ * StdEvaluationContext implements the {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext} interface using
  * default factories to load the XACML policies, and get the PIP engines.
  *
  */
@@ -61,8 +61,8 @@
     private TraceEngine traceEngine;
 
     /**
-     * Creates a new <code>StdEvaluationContext</code> with the given {@link com.att.research.xacml.api.Request} and
-     * {@link com.att.research.xacmlatt.pdp.policy.PolicyDef}.
+     * Creates a new <code>StdEvaluationContext</code> with the given {@link org.apache.openaz.xacml.api.Request} and
+     * {@link org.apache.openaz.xacml.pdp.policy.PolicyDef}.
      *
      * @param requestIn the <code>Request</code>
      * @param policyDef the <code>PolicyDef</code>
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdEvaluationContextFactory.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdEvaluationContextFactory.java
index 6229fe8..2ed28d4 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdEvaluationContextFactory.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdEvaluationContextFactory.java
@@ -28,26 +28,25 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.pip.PIPFinder;
-import com.att.research.xacml.api.pip.PIPFinderFactory;
-import com.att.research.xacml.api.trace.TraceEngine;
-import com.att.research.xacml.api.trace.TraceEngineFactory;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContextFactory;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinder;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinderFactory;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.pip.PIPFinder;
+import org.apache.openaz.xacml.api.pip.PIPFinderFactory;
+import org.apache.openaz.xacml.api.trace.TraceEngine;
+import org.apache.openaz.xacml.api.trace.TraceEngineFactory;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContextFactory;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinder;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinderFactory;
 
 /**
- * StdEvaluationContextFactory extends {@link com.att.research.xacmlatt.pdp.eval.EvaluationContextFactory} to implement
- * the <code>getEvaluationContext</code> method with a standard {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext}.
+ * StdEvaluationContextFactory extends {@link org.apache.openaz.xacml.pdp.eval.EvaluationContextFactory} to implement
+ * the <code>getEvaluationContext</code> method with a standard {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext}.
  *
  */
 public class StdEvaluationContextFactory extends EvaluationContextFactory {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdFunctionDefinitionFactory.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdFunctionDefinitionFactory.java
index c6ce117..a0ce465 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdFunctionDefinitionFactory.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdFunctionDefinitionFactory.java
@@ -28,19 +28,19 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.policy.FunctionDefinition;
-import com.att.research.xacmlatt.pdp.policy.FunctionDefinitionFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.policy.FunctionDefinition;
+import org.apache.openaz.xacml.pdp.policy.FunctionDefinitionFactory;
 
 /**
- * StdFunctionDefinitionFactory is the default {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinitionFactory} implementation
+ * StdFunctionDefinitionFactory is the default {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinitionFactory} implementation
  * used if no other <code>FunctionDefinitionFactory</code> implementation is supplied.  It contains all of the standard XACML 3.0
  * functions.
  *
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdFunctions.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdFunctions.java
index 1753ebb..6b05221 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdFunctions.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdFunctions.java
@@ -28,54 +28,54 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
 import java.math.BigInteger;
 import java.net.URI;
 
 import javax.security.auth.x500.X500Principal;
 
-import com.att.research.xacml.api.XACML1;
-import com.att.research.xacml.api.XACML2;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.datatypes.Base64Binary;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacml.std.datatypes.HexBinary;
-import com.att.research.xacml.std.datatypes.IPAddress;
-import com.att.research.xacml.std.datatypes.ISO8601Date;
-import com.att.research.xacml.std.datatypes.ISO8601DateTime;
-import com.att.research.xacml.std.datatypes.ISO8601Time;
-import com.att.research.xacml.std.datatypes.RFC2396DomainName;
-import com.att.research.xacml.std.datatypes.RFC822Name;
-import com.att.research.xacml.std.datatypes.XPathDayTimeDuration;
-import com.att.research.xacml.std.datatypes.XPathYearMonthDuration;
-import com.att.research.xacmlatt.pdp.policy.FunctionDefinition;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionAccessPermitted;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionArithmetic;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionBag;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionBagIsIn;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionBagOneAndOnly;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionBagSize;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionComparison;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionDateTimeArithmetic;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionEquality;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHigherOrderBag;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionLogical;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionNumberTypeConversion;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionRFC822NameMatch;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionRegexpMatch;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionSet;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionStringConversion;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionStringEqualIgnoreCase;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionStringFunctions;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionStringNormalize;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionTimeInRange;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionURIStringConcatenate;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionX500NameMatch;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionXPath;
+import org.apache.openaz.xacml.api.XACML1;
+import org.apache.openaz.xacml.api.XACML2;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.pdp.policy.FunctionDefinition;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionAccessPermitted;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionArithmetic;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBag;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBagIsIn;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBagOneAndOnly;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBagSize;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionComparison;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionDateTimeArithmetic;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionEquality;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHigherOrderBag;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionLogical;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionNumberTypeConversion;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionRFC822NameMatch;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionRegexpMatch;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionSet;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionStringConversion;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionStringEqualIgnoreCase;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionStringFunctions;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionStringNormalize;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionTimeInRange;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionURIStringConcatenate;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionX500NameMatch;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionXPath;
+import org.apache.openaz.xacml.std.datatypes.Base64Binary;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.std.datatypes.HexBinary;
+import org.apache.openaz.xacml.std.datatypes.IPAddress;
+import org.apache.openaz.xacml.std.datatypes.ISO8601Date;
+import org.apache.openaz.xacml.std.datatypes.ISO8601DateTime;
+import org.apache.openaz.xacml.std.datatypes.ISO8601Time;
+import org.apache.openaz.xacml.std.datatypes.RFC2396DomainName;
+import org.apache.openaz.xacml.std.datatypes.RFC822Name;
+import org.apache.openaz.xacml.std.datatypes.XPathDayTimeDuration;
+import org.apache.openaz.xacml.std.datatypes.XPathYearMonthDuration;
 
 /**
- * StdFunctions contains the {@link com.att.research.xacml.api.Identifier} values for the standard XACML functions.
+ * StdFunctions contains the {@link org.apache.openaz.xacml.api.Identifier} values for the standard XACML functions.
  *
  */
 @SuppressWarnings("deprecation")
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinder.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinder.java
index 7f993c0..fd6765b 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinder.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinder.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -44,25 +44,24 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.IdReferenceMatch;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Version;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.PolicyDef;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinder;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinderResult;
-import com.att.research.xacmlatt.pdp.policy.PolicySet;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
-import com.att.research.xacmlatt.pdp.policy.dom.DOMPolicyDef;
+import org.apache.openaz.xacml.api.IdReferenceMatch;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Version;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.PolicyDef;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinder;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinderResult;
+import org.apache.openaz.xacml.pdp.policy.PolicySet;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.pdp.policy.dom.DOMPolicyDef;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
- * StdPolicyFinder implements the {@link com.att.research.xacmlatt.pdp.policy.PolicyFinder} interface to look up policies
+ * StdPolicyFinder implements the {@link org.apache.openaz.xacml.pdp.policy.PolicyFinder} interface to look up policies
  * by their internal ID or an externally visible ID.
  *
  */
@@ -189,7 +188,7 @@
     }
 
     /**
-     * Looks up the given {@link com.att.research.xacml.api.Identifier} in the map first.  If not found, and the <code>Identifier</code> contains
+     * Looks up the given {@link org.apache.openaz.xacml.api.Identifier} in the map first.  If not found, and the <code>Identifier</code> contains
      * a URL, then attempts to retrieve the document from the URL and caches it.
      *
      * @param idReferenceMatch the <code>IdReferenceMatch</code> to look up
@@ -232,7 +231,7 @@
     }
 
     /**
-     * Looks up the given {@link com.att.research.xacml.api.Identifier} in the map first.  If not found, and the <code>Identifier</code> contains
+     * Looks up the given {@link org.apache.openaz.xacml.api.Identifier} in the map first.  If not found, and the <code>Identifier</code> contains
      * a URL, then attempts to retrieve the document from the URL and caches it.
      *
      * @param idReferenceMatch the <code>IdReferenceMatch</code> to look up
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinderFactory.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinderFactory.java
index 226ab3f..e651ed7 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinderFactory.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinderFactory.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,30 +44,30 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithmFactory;
+import org.apache.openaz.xacml.pdp.policy.Policy;
+import org.apache.openaz.xacml.pdp.policy.PolicyDef;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinder;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinderFactory;
+import org.apache.openaz.xacml.pdp.policy.PolicySet;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.pdp.policy.Target;
+import org.apache.openaz.xacml.pdp.policy.dom.DOMPolicyDef;
+import org.apache.openaz.xacml.pdp.util.OpenAZPDPProperties;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.StdVersion;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.StdVersion;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.XACMLProperties;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithmFactory;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.PolicyDef;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinder;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinderFactory;
-import com.att.research.xacmlatt.pdp.policy.PolicySet;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
-import com.att.research.xacmlatt.pdp.policy.Target;
-import com.att.research.xacmlatt.pdp.policy.dom.DOMPolicyDef;
-import com.att.research.xacmlatt.pdp.util.ATTPDPProperties;
 import com.google.common.base.Splitter;
 
 /**
- * StdPolicyFinderFactory extends {@link com.att.research.xacmlatt.pdp.policy.PolicyFinderFactory} with the
+ * StdPolicyFinderFactory extends {@link org.apache.openaz.xacml.pdp.policy.PolicyFinderFactory} with the
  * <code>getPolicyFinder</code> method to get a single instance of the {@link StdPolicyFinder}.  The
- * root {@link com.att.research.xacmlatt.pdp.policy.PolicyDef} is loaded from a file whose name is specified as a system property or
+ * root {@link org.apache.openaz.xacml.pdp.policy.PolicyDef} is loaded from a file whose name is specified as a system property or
  * in the $java.home/lib/xacml.properties property set.
  *
  */
@@ -176,7 +176,7 @@
             //
             // Check for property that combines root policies into one policyset
             //
-            String combiningAlgorithm = properties.getProperty(ATTPDPProperties.PROP_POLICYFINDERFACTORY_COMBINEROOTPOLICIES);
+            String combiningAlgorithm = properties.getProperty(OpenAZPDPProperties.PROP_POLICYFINDERFACTORY_COMBINEROOTPOLICIES);
             if (combiningAlgorithm != null) {
                 try {
                     logger.info("Combining root policies with " + combiningAlgorithm);
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinderResult.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinderResult.java
index 9864cdb..a5cadae 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinderResult.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdPolicyFinderResult.java
@@ -28,17 +28,17 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacmlatt.pdp.policy.PolicyDef;
-import com.att.research.xacmlatt.pdp.policy.PolicyFinderResult;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.pdp.policy.PolicyDef;
+import org.apache.openaz.xacml.pdp.policy.PolicyFinderResult;
+import org.apache.openaz.xacml.std.StdStatus;
 
 /**
- * StdPolicyFinderResult implements the {@link com.att.research.xacmlatt.pdp.policy.PolicyFinderResult} interface.
+ * StdPolicyFinderResult implements the {@link org.apache.openaz.xacml.pdp.policy.PolicyFinderResult} interface.
  *
- * @param <T> the java class extending {@link com.att.research.xacmlatt.pdp.policy.PolicyDef} held by the <code>StdPolicyFinderResult</code>
+ * @param <T> the java class extending {@link org.apache.openaz.xacml.pdp.policy.PolicyDef} held by the <code>StdPolicyFinderResult</code>
  */
 public class StdPolicyFinderResult<T extends PolicyDef> implements PolicyFinderResult<T> {
     private Status status;
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdProperties.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdProperties.java
index 625cd82..636f626 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdProperties.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/StdProperties.java
@@ -28,11 +28,11 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
-import com.att.research.xacmlatt.pdp.util.ATTPDPProperties;
+import org.apache.openaz.xacml.pdp.util.OpenAZPDPProperties;
 
-public class StdProperties extends ATTPDPProperties {
+public class StdProperties extends OpenAZPDPProperties {
     protected StdProperties() {
     }
 
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/CombinedPermitOverrides.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/CombinedPermitOverrides.java
index 3864b3e..937b588 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/CombinedPermitOverrides.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/CombinedPermitOverrides.java
@@ -28,18 +28,18 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
 
 /**
  *
@@ -50,7 +50,7 @@
  *
  * @param <T>
  */
-public class CombinedPermitOverrides<T extends com.att.research.xacmlatt.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
+public class CombinedPermitOverrides<T extends org.apache.openaz.xacml.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
 
     public CombinedPermitOverrides(Identifier identifierIn) {
         super(identifierIn);
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/CombiningAlgorithmBase.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/CombiningAlgorithmBase.java
index fbb1fc0..148f5a4 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/CombiningAlgorithmBase.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/CombiningAlgorithmBase.java
@@ -28,12 +28,12 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.policy.CombiningAlgorithm;
 
-public abstract class CombiningAlgorithmBase<T extends com.att.research.xacmlatt.pdp.eval.Evaluatable> implements CombiningAlgorithm<T> {
+public abstract class CombiningAlgorithmBase<T extends org.apache.openaz.xacml.pdp.eval.Evaluatable> implements CombiningAlgorithm<T> {
     private Identifier id;
 
     public CombiningAlgorithmBase(Identifier identifierIn) {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/DenyOverrides.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/DenyOverrides.java
index e962a80..b690de1 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/DenyOverrides.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/DenyOverrides.java
@@ -28,27 +28,27 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
 
 /**
  * DenyOverrides implements the XACML 3.0 "deny-overrides" combining algorithm for both policies and rules.
  *
  *
- * @param <T> the java class for the {@link com.att.research.xacmlatt.pdp.eval.Evaluatable}
+ * @param <T> the java class for the {@link org.apache.openaz.xacml.pdp.eval.Evaluatable}
  * @param <U> the java class for the identifier
  */
-public class DenyOverrides<T extends com.att.research.xacmlatt.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
+public class DenyOverrides<T extends org.apache.openaz.xacml.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
 
     public DenyOverrides(Identifier identifierIn) {
         super(identifierIn);
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/DenyUnlessPermit.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/DenyUnlessPermit.java
index ec440a2..b826b18 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/DenyUnlessPermit.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/DenyUnlessPermit.java
@@ -28,27 +28,27 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
 
 /**
  * DenyUnlessPermit implements the XACML 3.0 "deny-unless-permit" combining algorithm for both policies and rules.
  *
  *
- * @param <T> the java class for the {@link com.att.research.xacmlatt.pdp.eval.Evaluatable}
+ * @param <T> the java class for the {@link org.apache.openaz.xacml.pdp.eval.Evaluatable}
  * @param <U> the java class for the identifier
  */
-public class DenyUnlessPermit<T extends com.att.research.xacmlatt.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
+public class DenyUnlessPermit<T extends org.apache.openaz.xacml.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
 
     public DenyUnlessPermit(Identifier identifierIn) {
         super(identifierIn);
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/FirstApplicable.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/FirstApplicable.java
index 1fa285a..5ae3094 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/FirstApplicable.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/FirstApplicable.java
@@ -28,27 +28,27 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
 
 /**
- * PermitOverrides extends {@link com.att.research.xacmlatt.pdp.std.combiners.CombiningAlgorithmBase} to implement the
+ * PermitOverrides extends {@link org.apache.openaz.xacml.pdp.std.combiners.CombiningAlgorithmBase} to implement the
  * XACML 1.0 "first-applicable" combining algorithm for policies and rules.
  *
  *
  * @param <T> the java class of the object to be combined
  */
-public class FirstApplicable<T extends com.att.research.xacmlatt.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
+public class FirstApplicable<T extends org.apache.openaz.xacml.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
 
     public FirstApplicable(Identifier identifierIn) {
         super(identifierIn);
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyDenyOverridesPolicy.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyDenyOverridesPolicy.java
index b710c68..667b8f3 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyDenyOverridesPolicy.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyDenyOverridesPolicy.java
@@ -28,26 +28,26 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.std.StdStatus;
 
 /**
  * DenyOverrides implements the XACML 1.0 "deny-overrides" combining algorithm for policies and policy sets.
  *
  *
- * @param <T> the java class for the {@link com.att.research.xacmlatt.pdp.eval.Evaluatable}
+ * @param <T> the java class for the {@link org.apache.openaz.xacml.pdp.eval.Evaluatable}
  * @param <U> the java class for the identifier
  */
 public class LegacyDenyOverridesPolicy extends CombiningAlgorithmBase<PolicySetChild> {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyDenyOverridesRule.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyDenyOverridesRule.java
index e203baa..02300d4 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyDenyOverridesRule.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyDenyOverridesRule.java
@@ -28,26 +28,26 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
-import com.att.research.xacmlatt.pdp.policy.Rule;
-import com.att.research.xacmlatt.pdp.policy.RuleEffect;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.pdp.policy.Rule;
+import org.apache.openaz.xacml.pdp.policy.RuleEffect;
 
 /**
  * DenyOverrides implements the XACML 1.0 "deny-overrides" combining algorithm for rules.
  *
  *
- * @param <T> the java class for the {@link com.att.research.xacmlatt.pdp.eval.Evaluatable}
+ * @param <T> the java class for the {@link org.apache.openaz.xacml.pdp.eval.Evaluatable}
  * @param <U> the java class for the identifier
  */
 public class LegacyDenyOverridesRule extends CombiningAlgorithmBase<Rule> {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyPermitOverridesPolicy.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyPermitOverridesPolicy.java
index ab098da..2fd8953 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyPermitOverridesPolicy.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyPermitOverridesPolicy.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
 
 /**
  * LegacyPermitOverridesPolicy extends {@link com.att.research.xacmlatt.pdp.policy.combiners.CombiningAlgorithmBase} for
- * {@link com.att.research.xacmlatt.pdp.policy.PolicySetChild} elements implementing the XACML 1.0 permit-overrides policy combining algorithm.
+ * {@link org.apache.openaz.xacml.pdp.policy.PolicySetChild} elements implementing the XACML 1.0 permit-overrides policy combining algorithm.
  *
  */
 public class LegacyPermitOverridesPolicy extends CombiningAlgorithmBase<PolicySetChild> {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyPermitOverridesRule.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyPermitOverridesRule.java
index 4464cec..9e515b0 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyPermitOverridesRule.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/LegacyPermitOverridesRule.java
@@ -28,24 +28,24 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
-import com.att.research.xacmlatt.pdp.policy.Rule;
-import com.att.research.xacmlatt.pdp.policy.RuleEffect;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.pdp.policy.Rule;
+import org.apache.openaz.xacml.pdp.policy.RuleEffect;
 
 /**
  * LegacyPermitOverridesRule extends {@link com.att.research.xacmlatt.pdp.policy.combiners.CombiningAlgorithmBase} for
- * {@link com.att.research.xacmlatt.pdp.policy.Rule}s to implement the XACML 1.0 permit-overrides rule combining algorithm.
+ * {@link org.apache.openaz.xacml.pdp.policy.Rule}s to implement the XACML 1.0 permit-overrides rule combining algorithm.
  *
  */
 public class LegacyPermitOverridesRule extends CombiningAlgorithmBase<Rule> {
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/OnlyOneApplicable.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/OnlyOneApplicable.java
index ff0a224..e296f55 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/OnlyOneApplicable.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/OnlyOneApplicable.java
@@ -28,25 +28,25 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.eval.MatchResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
-import com.att.research.xacmlatt.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.eval.MatchResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.pdp.policy.PolicySetChild;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
 
 /**
- * OnlyOneApplicable extends {@link com.att.research.xacmlatt.pdp.std.combiners.CombiningAlgorithmBase} to implement the
+ * OnlyOneApplicable extends {@link org.apache.openaz.xacml.pdp.std.combiners.CombiningAlgorithmBase} to implement the
  * XACML 1.0 "only-one-applicable" combining algorithm for policies and rules.
  *
  *
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/PermitOverrides.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/PermitOverrides.java
index 95eab1f..bef2265 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/PermitOverrides.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/PermitOverrides.java
@@ -28,27 +28,27 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
 
 /**
- * PermitOverrides extends {@link com.att.research.xacmlatt.pdp.std.combiners.CombiningAlgorithmBase} to implement the
+ * PermitOverrides extends {@link org.apache.openaz.xacml.pdp.std.combiners.CombiningAlgorithmBase} to implement the
  * XACML 3.0 Permit-overrides combining algorithm for policies and rules.
  *
  *
  * @param <T> the java class of the object to be combined
  */
-public class PermitOverrides<T extends com.att.research.xacmlatt.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
+public class PermitOverrides<T extends org.apache.openaz.xacml.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
 
     public PermitOverrides(Identifier identifierIn) {
         super(identifierIn);
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/PermitUnlessDeny.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/PermitUnlessDeny.java
index 73fccb7..20ea376 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/PermitUnlessDeny.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/PermitUnlessDeny.java
@@ -28,27 +28,27 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
-import com.att.research.xacmlatt.pdp.eval.EvaluationException;
-import com.att.research.xacmlatt.pdp.eval.EvaluationResult;
-import com.att.research.xacmlatt.pdp.policy.CombinerParameter;
-import com.att.research.xacmlatt.pdp.policy.CombiningElement;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;
+import org.apache.openaz.xacml.pdp.eval.EvaluationException;
+import org.apache.openaz.xacml.pdp.eval.EvaluationResult;
+import org.apache.openaz.xacml.pdp.policy.CombinerParameter;
+import org.apache.openaz.xacml.pdp.policy.CombiningElement;
 
 /**
  * PermitUnlessDeny implements the XACML 3.0 "permit-unless-deny" combining algorithm for both policies and rules.
  *
  *
- * @param <T> the java class for the {@link com.att.research.xacmlatt.pdp.eval.Evaluatable}
+ * @param <T> the java class for the {@link org.apache.openaz.xacml.pdp.eval.Evaluatable}
  * @param <U> the java class for the identifier
  */
-public class PermitUnlessDeny<T extends com.att.research.xacmlatt.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
+public class PermitUnlessDeny<T extends org.apache.openaz.xacml.pdp.eval.Evaluatable> extends CombiningAlgorithmBase<T> {
 
     public PermitUnlessDeny(Identifier identifierIn) {
         super(identifierIn);
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/package-info.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/package-info.java
index 858ccef..ec5f2f8 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/package-info.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/combiners/package-info.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.std.combiners;
+package org.apache.openaz.xacml.pdp.std.combiners;
 
 /**
  * com.att.research.xacmlatt.pdp.std.combiners contains implementations of the {@link com.att.research.xacmlatt.pdp.policy.CombiningAlgorithm}
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/ConvertedArgument.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/ConvertedArgument.java
index 1763193..f57b379 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/ConvertedArgument.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/ConvertedArgument.java
@@ -28,28 +28,28 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

 

 /**

- * A ConvertedArgument is the result of processing an {@link com.att.research.xacmlatt.pdp.policy.FunctionArgument}

+ * A ConvertedArgument is the result of processing an {@link org.apache.openaz.xacml.pdp.policy.FunctionArgument}

  * to validate its correctness and to convert it into an object of the required type.

  * It is returned by the <code>validateArguments</code> method in

- * {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHomogeneousSimple}

+ * {@link org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHomogeneousSimple}

  * and should only be used by other Functions in that same package.

  * This is a data holder with no processing.

  * It contains two elements:

  * <UL>

  * <LI>

- * A {@link com.att.research.xacml.api.Status} object, and

+ * A {@link org.apache.openaz.xacml.api.Status} object, and

  * <LI>

  * An object containing the value of the FunctionArgument processed by validateArguments.

  * This object will only exist if status.isOk() (or the isOk() method in this class that calls status.isOk()) is true.

@@ -162,7 +162,7 @@
      *

      * @param listFunctionArguments the <code>List</code> of <code>FunctionArgument</code>s to validate

      * @param convertedValues the <code>List</code> of <code>U</code> that the converted value is added to.

-     * @return a {@link com.att.research.xacml.api.Status} indication with an error if the arguments are not valid,

+     * @return a {@link org.apache.openaz.xacml.api.Status} indication with an error if the arguments are not valid,

      * 			or an object of the correct DataType containing the value.

      */

     @SuppressWarnings("unchecked")	// to suppress warning on bag conversion

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionAccessPermitted.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionAccessPermitted.java
index 33b4258..6218839 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionAccessPermitted.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionAccessPermitted.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 

 import java.io.ByteArrayInputStream;

@@ -38,23 +38,22 @@
 

 import javax.xml.parsers.DocumentBuilderFactory;

 

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Request;

+import org.apache.openaz.xacml.api.RequestAttributes;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdRequest;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.dom.DOMRequestAttributes;

+import org.apache.openaz.xacml.std.dom.DOMStructureException;

 import org.w3c.dom.Node;

 

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Request;

-import com.att.research.xacml.api.RequestAttributes;

-import com.att.research.xacml.std.StdRequest;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.dom.DOMRequestAttributes;

-import com.att.research.xacml.std.dom.DOMStructureException;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-

 /**

- * FunctionDefinitionAccessPermitted implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionAccessPermitted implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML access-permitted predicate.

  *

  * WARNING: This code is unfinished.  Initially we did not complete the implementation because we did not understand how to handle XML Namespaces

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionArithmetic.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionArithmetic.java
index 2abf5af..a09c16a 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionArithmetic.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionArithmetic.java
@@ -28,27 +28,27 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.math.BigInteger;

 import java.util.ArrayList;

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.api.XACML;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.api.XACML;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionArithmetic extends {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

+ * FunctionDefinitionArithmetic extends {@link org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

  * implement the XACML Arithmetic predicates as functions taking one or two arguments of the same data type and returning a single value of the same type.

  *

  * In Java there is no way to do arithmetic operations generically, so we need to have individual code for each operation on each class within this class.

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBag.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBag.java
index e98572a..a7d298b 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBag.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBag.java
@@ -28,19 +28,19 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.List;

 

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

 

 /**

- * FunctionDefinitionBag implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionBag implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML 'type'-bag predicates as functions taking 0, 1 or multiple arguments of the same data type and returning a <code>Bag</code>.

  *

  * In the first implementation of XACML we had separate files for each XACML Function.

@@ -82,11 +82,11 @@
     }

 

     /**

-     * Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of{@link com.att.research.xacmlatt.pdp.policy.FunctionArgument}s.

+     * Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of{@link org.apache.openaz.xacml.pdp.policy.FunctionArgument}s.

      *

-     * @param evaluationContext the {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext} to use in the evaluation

+     * @param evaluationContext the {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext} to use in the evaluation

      * @param arguments the <code>List</code> of <code>FunctionArgument</code>s for the evaluation

-     * @return an {@link com.att.research.xacmlatt.pdp.policy.ExpressionResult} with the results of the call

+     * @return an {@link org.apache.openaz.xacml.pdp.policy.ExpressionResult} with the results of the call

      */

     @Override

     public ExpressionResult evaluate(EvaluationContext evaluationContext, List<FunctionArgument> arguments) {

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagIsIn.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagIsIn.java
index 842d8da..454bcf9 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagIsIn.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagIsIn.java
@@ -28,24 +28,24 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.Iterator;

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionBagIsIn implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionBagIsIn implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML 'type'-is-in predicates as functions taking two arguments, the first of <code>type</code> and the second of type <code>Bag</code>,

  * and returning a <code>Boolean</code> for whether the first argument is contained in the second.

  *

@@ -90,11 +90,11 @@
     }

 

     /**

-     * Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of{@link com.att.research.xacmlatt.pdp.policy.FunctionArgument}s.

+     * Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of{@link org.apache.openaz.xacml.pdp.policy.FunctionArgument}s.

      *

-     * @param evaluationContext the {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext} to use in the evaluation

+     * @param evaluationContext the {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext} to use in the evaluation

      * @param arguments the <code>List</code> of <code>FunctionArgument</code>s for the evaluation

-     * @return an {@link com.att.research.xacmlatt.pdp.policy.ExpressionResult} with the results of the call

+     * @return an {@link org.apache.openaz.xacml.pdp.policy.ExpressionResult} with the results of the call

      */

     @Override

     public ExpressionResult evaluate(EvaluationContext evaluationContext, List<FunctionArgument> arguments) {

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagOneAndOnly.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagOneAndOnly.java
index f1ccc9e..373ad74 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagOneAndOnly.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagOneAndOnly.java
@@ -28,22 +28,22 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

 

 /**

- * FunctionDefinitionBagOneAndOnly implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionBagOneAndOnly implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML 'type'-one-and-only predicates as functions taking one <code>Bag</code> argument and returning the single element in that bag of the 'type'.

  *

  * In the first implementation of XACML we had separate files for each XACML Function.

@@ -86,11 +86,11 @@
     }

 

     /**

-     * Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of{@link com.att.research.xacmlatt.pdp.policy.FunctionArgument}s.

+     * Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of{@link org.apache.openaz.xacml.pdp.policy.FunctionArgument}s.

      *

-     * @param evaluationContext the {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext} to use in the evaluation

+     * @param evaluationContext the {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext} to use in the evaluation

      * @param arguments the <code>List</code> of <code>FunctionArgument</code>s for the evaluation

-     * @return an {@link com.att.research.xacmlatt.pdp.policy.ExpressionResult} with the results of the call

+     * @return an {@link org.apache.openaz.xacml.pdp.policy.ExpressionResult} with the results of the call

      */

     @Override

     public ExpressionResult evaluate(EvaluationContext evaluationContext, List<FunctionArgument> arguments) {

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagSize.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagSize.java
index f82038f..6d77371 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagSize.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagSize.java
@@ -28,26 +28,26 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.math.BigInteger;

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.XACML;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.XACML;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionBagSize implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionBagSize implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML 'type'-bag-size predicates as functions taking one <code>Bag</code> argument and returning an <code>Integer</code>

  * representing the number of elements in the bag.

  *

@@ -89,11 +89,11 @@
     }

 

     /**

-     * Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of{@link com.att.research.xacmlatt.pdp.policy.FunctionArgument}s.

+     * Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of{@link org.apache.openaz.xacml.pdp.policy.FunctionArgument}s.

      *

-     * @param evaluationContext the {@link com.att.research.xacmlatt.pdp.eval.EvaluationContext} to use in the evaluation

+     * @param evaluationContext the {@link org.apache.openaz.xacml.pdp.eval.EvaluationContext} to use in the evaluation

      * @param arguments the <code>List</code> of <code>FunctionArgument</code>s for the evaluation

-     * @return an {@link com.att.research.xacmlatt.pdp.policy.ExpressionResult} with the results of the call

+     * @return an {@link org.apache.openaz.xacml.pdp.policy.ExpressionResult} with the results of the call

      */

     @Override

     public ExpressionResult evaluate(EvaluationContext evaluationContext, List<FunctionArgument> arguments) {

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBase.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBase.java
index e6933af..830f177 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBase.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBase.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.datatypes.DataTypeBoolean;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionDefinition;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionDefinition;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.datatypes.DataTypeBoolean;

 

 

 /**

  * /**

- * FunctionDefinitionBase provides a common base for {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition}s.

+ * FunctionDefinitionBase provides a common base for {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition}s.

  * The child classes derived from this are of two types:

  * <UL>

- * <LI> Functions returning a single simple value of a type defined in {@link com.att.research.xacml.std.datatypes.DataTypes}.

+ * <LI> Functions returning a single simple value of a type defined in {@link org.apache.openaz.xacml.std.datatypes.DataTypes}.

  * 	These functions will all derive from {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionSimple}.

  * <LI> Functions returning a single bag with elements of a single type.

  * <UL>

@@ -87,7 +87,7 @@
     protected static final ExpressionResult			ER_FALSE	= ExpressionResult.newSingle(DataTypeBoolean.AV_FALSE);

 

     /**

-     * Creates a new <code>FunctionDefinitionBase</code> with the {@link com.att.research.xacml.api.Identifier} <code>idIn</code> as

+     * Creates a new <code>FunctionDefinitionBase</code> with the {@link org.apache.openaz.xacml.api.Identifier} <code>idIn</code> as

      * the function id.

      *

      * @param idIn the <code>Identifier</code> for this <code>FunctionDefinitionBase</code>

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionComparison.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionComparison.java
index e51b624..d5ba343 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionComparison.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionComparison.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionComparison implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionComparison implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML comparison predicates as functions taking two arguments of the same type

  * and returning a <code>Boolean</code>.

  *

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionDateTimeArithmetic.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionDateTimeArithmetic.java
index 59a08de..eb50f72 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionDateTimeArithmetic.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionDateTimeArithmetic.java
@@ -28,24 +28,24 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 

 import java.util.List;

 

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.DataTypeException;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.IDateTime;

-import com.att.research.xacml.std.datatypes.ISO8601Duration;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.DataTypeException;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.IDateTime;

+import org.apache.openaz.xacml.std.datatypes.ISO8601Duration;

 

 /**

- * FunctionDefinitionDateTimeArithmetic implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionDateTimeArithmetic implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML Date and Time Arithmetic predicates.

  *

  * In the first implementation of XACML we had separate files for each XACML Function.

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionEquality.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionEquality.java
index b0db551..038bb58 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionEquality.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionEquality.java
@@ -28,22 +28,22 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionEquality extends {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

+ * FunctionDefinitionEquality extends {@link org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

  * implement the XACML Equality predicates as functions taking two arguments of the same data type and returning a <code>Boolean</code>.

  *

  * In the first implementation of XACML we had separate files for each XACML Function.

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHigherOrderBag.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHigherOrderBag.java
index 1003580..12c9c90 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHigherOrderBag.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHigherOrderBag.java
@@ -28,30 +28,30 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.net.URI;

 import java.util.ArrayList;

 import java.util.Iterator;

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.std.IdentifierImpl;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.policy.FunctionDefinition;

-import com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.policy.FunctionDefinition;

+import org.apache.openaz.xacml.pdp.std.StdFunctionDefinitionFactory;

+import org.apache.openaz.xacml.std.IdentifierImpl;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionSet implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionSet implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML Set predicates as functions taking two arguments of <code>Bag</code> the same primitive type

  * and returning either a <code>Boolean</code> or a <code>Bag</code> of the same primitive type.

  * <P>

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHomogeneousSimple.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHomogeneousSimple.java
index 09e2b5f..3aa2106 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHomogeneousSimple.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHomogeneousSimple.java
@@ -28,16 +28,16 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.List;

 

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

 

 /**

  * FunctionDefinitionHomogeneousSimple extends {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionSimple}

@@ -59,7 +59,7 @@
  *

  *

  * @param <O> the java class for the value of the Output return result from the <code>FunctionDefinition</code>

- * @param <I> the java class for the value of the Input {@link com.att.research.xacmlatt.pdp.policy.FunctionArgument}s in the <code>evaluate</code> method

+ * @param <I> the java class for the value of the Input {@link org.apache.openaz.xacml.pdp.policy.FunctionArgument}s in the <code>evaluate</code> method

  */

 public abstract class FunctionDefinitionHomogeneousSimple<O,I> extends FunctionDefinitionBase<O,I> {

 

@@ -97,7 +97,7 @@
      * This combines both the argument list length check and the evaluation of all arguments on that list.

      *

      * @param listFunctionArguments the <code>List</code> of <code>FunctionArgument</code>s to validate

-     * @return a {@link com.att.research.xacml.api.Status} indication with an error if the arguments are not valid

+     * @return a {@link org.apache.openaz.xacml.api.Status} indication with an error if the arguments are not valid

      */

     public Status validateArguments(List<FunctionArgument> listFunctionArguments, List<I> convertedValues) {

         /*

@@ -136,7 +136,7 @@
      * Validates the given <code>List</code> of <code>FunctionArgument</code>s has the correct count.

      *

      * @param listFunctionArguments the <code>List</code> of <code>FunctionArgument</code>s to validate

-     * @return a {@link com.att.research.xacml.api.Status} indication with an error if the arguments are not valid

+     * @return a {@link org.apache.openaz.xacml.api.Status} indication with an error if the arguments are not valid

      */

     public Status validateArgumentListLength(List<FunctionArgument> listFunctionArguments) {

         /*

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionLogical.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionLogical.java
index d0abc01..5948fa2 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionLogical.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionLogical.java
@@ -28,21 +28,21 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionLogical extends {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

+ * FunctionDefinitionLogical extends {@link org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

  * implement the XACML Logic predicates as functions taking zero, one, or multiple arguments of type <code>Boolean</code> and returning a <code>Boolean</code>.

  *

  * In the first implementation of XACML we had separate files for each XACML Function.

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionNumberTypeConversion.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionNumberTypeConversion.java
index 40c040b..a19ea60 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionNumberTypeConversion.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionNumberTypeConversion.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.math.BigInteger;

 import java.util.ArrayList;

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.api.XACML;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.api.XACML;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

 

 /**

  * FunctionDefinitionNumberTypeConversion extends {@link FunctionDefinitionHomogeneousSimple} to

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRFC822NameMatch.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRFC822NameMatch.java
index e48ca57..a85fee6 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRFC822NameMatch.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRFC822NameMatch.java
@@ -28,22 +28,22 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.List;

 

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.RFC822Name;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.RFC822Name;

 

 /**

- * FunctionDefinitionRFC822NameMatch extends {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

+ * FunctionDefinitionRFC822NameMatch extends {@link org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

  * implement the XACML RFC822Name match predicate as functions taking one <code>String</code> and one <code>RFC822Name</code> arguments

  * and returning a single <code>Boolean</code> value.

  *

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRegexpMatch.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRegexpMatch.java
index 018ce3f..e7c5029 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRegexpMatch.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRegexpMatch.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 

 import java.util.List;

 

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.DataTypeException;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.DataTypeException;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionRegexMatch implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionRegexMatch implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML 'type'-regex-match predicates as functions taking two arguments, the first of <code>String</code>,

  * representing a regular expression, and the second of the type for that specific predicate,

  * and returning a <code>Boolean</code> for whether the regular expression matches the string representation of the second argument.

@@ -55,7 +55,7 @@
  * 		string-regexp-match

  * 		anyURI-regexp-match

  * 		x500Name-regexp-match

- * 		rfc822Name-regexp-match (in sub-class {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition.FunctionDefinitionRegexpMatchRFC822} )

+ * 		rfc822Name-regexp-match (in sub-class {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition.FunctionDefinitionRegexpMatchRFC822} )

  * 		ipAddress-regexp-match

  * 		dnsName-regexp-match

  *

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSet.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSet.java
index 48de925..9d87e7a 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSet.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSet.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

 

 /**

- * FunctionDefinitionSet implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionSet implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML Set predicates as functions taking two arguments of <code>Bag</code> the same primitive type

  * and returning either a <code>Boolean</code> or a <code>Bag</code> of the same primitive type.

  * <P>

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringConversion.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringConversion.java
index e4b82f1..b16c0aa 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringConversion.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringConversion.java
@@ -28,24 +28,24 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionNumberTypeConversion extends {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

+ * FunctionDefinitionNumberTypeConversion extends {@link org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

  * implement the XACML predicates for converting <code>String</code> to <code>DataType<?></code> and vice versa.

  *

  * In the first implementation of XACML we had separate files for each XACML Function.

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCase.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCase.java
index f22ad2d..fb22097 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCase.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCase.java
@@ -28,10 +28,10 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

  * FunctionDefinitionStringEqualIgnoreCase extends {@link FunctionDefinitionEquality} for

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringFunctions.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringFunctions.java
index fef253f..4e28205 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringFunctions.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringFunctions.java
@@ -28,27 +28,27 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 

 import java.math.BigInteger;

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.DataTypeException;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.XACML;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.DataTypeException;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.XACML;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionStringFunctions implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionStringFunctions implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML String Functions predicates except for the conversions between <code>String</code> and <code>DataType</code>

  * which are contained in <code>FunctionDefinitionStringConversion</code>.

  * The functions in this file do not have a lot in common except that the return data type is known and the input argument types are

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringNormalize.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringNormalize.java
index d41b52e..293963c 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringNormalize.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringNormalize.java
@@ -28,25 +28,25 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.api.XACML;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypeString;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.api.XACML;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypeString;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionStringNormalize extends {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

+ * FunctionDefinitionStringNormalize extends {@link org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

  * implement the XACML String normalization predicates as functions taking one <code>String</code> arg and returning a single value of the same type.

  *

  * In the first implementation of XACML we had separate files for each XACML Function.

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionTimeInRange.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionTimeInRange.java
index a68f195..372d9b2 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionTimeInRange.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionTimeInRange.java
@@ -28,24 +28,24 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.ISO8601Time;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.ISO8601Time;

 

 /**

- * FunctionDefinitionTimeInRange implements {@link com.att.research.xacmlatt.pdp.policy.FunctionDefinition} to

+ * FunctionDefinitionTimeInRange implements {@link org.apache.openaz.xacml.pdp.policy.FunctionDefinition} to

  * implement the XACML time-in-range predicates as a function taking three arguments of type <code>Time</code>

  * and returning a <code>Boolean</code>.

  *

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionURIStringConcatenate.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionURIStringConcatenate.java
index 0cc5ebe..77b52be 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionURIStringConcatenate.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionURIStringConcatenate.java
@@ -28,22 +28,22 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.net.URI;

 import java.util.List;

 

-import com.att.research.xacml.api.DataTypeException;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.api.XACML;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.DataTypeException;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.api.XACML;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

  * FunctionDefinitionURIStringConcatenate extends {@link FunctionDefinitionHomogeneousSimple} to

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionX500NameMatch.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionX500NameMatch.java
index 0787c26..6841cae 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionX500NameMatch.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionX500NameMatch.java
@@ -28,23 +28,23 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import javax.security.auth.x500.X500Principal;

 

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 

 /**

- * FunctionDefinitionX500NameMatch extends {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

+ * FunctionDefinitionX500NameMatch extends {@link org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

  * implement the XACML X500Name match predicate as functions taking two <code>X500Name</code> arguments and returning a single <code>Boolean</code> value.

  *

  * In the first implementation of XACML we had separate files for each XACML Function.

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionXPath.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionXPath.java
index 6664539..bb21e2c 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionXPath.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionXPath.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import java.math.BigInteger;

 import java.util.ArrayList;

@@ -37,26 +37,25 @@
 

 import javax.xml.xpath.XPathExpression;

 

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.DataType;

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.RequestAttributes;

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.api.XACML;

+import org.apache.openaz.xacml.pdp.eval.EvaluationContext;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.StdStatusCode;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.XPathExpressionWrapper;

 import org.w3c.dom.NodeList;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.DataType;

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.RequestAttributes;

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.api.XACML;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.StdStatusCode;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.XPathExpressionWrapper;

-import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-

 

 /**

- * FunctionDefinitionXPath extends {@link com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

+ * FunctionDefinitionXPath extends {@link org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHomogeneousSimple} to

  * implement the XACML XPath predicates as functions taking one or two <code>XPathExpression</code> arguments and returning

  * either an <code>Integer</code> or a <code>Boolean</code>.

  *

diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/package-info.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/package-info.java
index 434e932..fe3ba0d 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/package-info.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/functions/package-info.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.std.functions;
+package org.apache.openaz.xacml.pdp.std.functions;
 
 /**
  * com.att.research.xacmlatt.pdp.policy.expressions contains class definitions that represent specific XACML function
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/package-info.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/package-info.java
index a012eee..0208ee5 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/package-info.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/std/package-info.java
@@ -29,7 +29,7 @@
  *                     All Rights Reserved
  */
 
-package com.att.research.xacmlatt.pdp.std;
+package org.apache.openaz.xacml.pdp.std;
 
 /**
  * com.att.research.xacmlatt.pdp.std contains classes that provide reference implementations of various extensible components
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/util/OpenAZPDPProperties.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/util/OpenAZPDPProperties.java
index 9883d02..7ade75b 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/util/OpenAZPDPProperties.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/util/OpenAZPDPProperties.java
@@ -28,22 +28,22 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacmlatt.pdp.util;
+package org.apache.openaz.xacml.pdp.util;
 
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
-public class ATTPDPProperties extends XACMLProperties {
-    public static final String PROP_EVALUATIONCONTEXTFACTORY	= "xacml.att.evaluationContextFactory";
-    public static final String PROP_COMBININGALGORITHMFACTORY	= "xacml.att.combiningAlgorithmFactory";
-    public static final String PROP_FUNCTIONDEFINITIONFACTORY	= "xacml.att.functionDefinitionFactory";
-    public static final String PROP_POLICYFINDERFACTORY			= "xacml.att.policyFinderFactory";
-    public static final String PROP_POLICYFINDERFACTORY_COMBINEROOTPOLICIES = "xacml.att.policyFinderFactory.combineRootPolicies";
+public class OpenAZPDPProperties extends XACMLProperties {
+    public static final String PROP_EVALUATIONCONTEXTFACTORY	= "xacml.openaz.evaluationContextFactory";
+    public static final String PROP_COMBININGALGORITHMFACTORY	= "xacml.openaz.combiningAlgorithmFactory";
+    public static final String PROP_FUNCTIONDEFINITIONFACTORY	= "xacml.openaz.functionDefinitionFactory";
+    public static final String PROP_POLICYFINDERFACTORY			= "xacml.openaz.policyFinderFactory";
+    public static final String PROP_POLICYFINDERFACTORY_COMBINEROOTPOLICIES = "xacml.openaz.policyFinderFactory.combineRootPolicies";
 
-    public static final Identifier ID_POLICY_COMBINEDPERMITOVERRIDES = new IdentifierImpl("urn:com:att:xacml:3.0:policy-combining-algorithm:combined-permit-overrides");
+    public static final Identifier ID_POLICY_COMBINEDPERMITOVERRIDES = new IdentifierImpl("urn:org:apache:openaz:xacml:3.0:policy-combining-algorithm:combined-permit-overrides");
 
-    protected ATTPDPProperties() {
+    protected OpenAZPDPProperties() {
     }
 
 }
diff --git a/openaz-xacml-pdp/xacml.properties b/openaz-xacml-pdp/xacml.properties
index 8394be9..b46b095 100755
--- a/openaz-xacml-pdp/xacml.properties
+++ b/openaz-xacml-pdp/xacml.properties
@@ -1,26 +1,26 @@
 # Default XACML Properties File
 # Standard API Factories
 #
-xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
-xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
-xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
-xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
+xacml.dataTypeFactory=org.apache.openaz.xacml.std.StdDataTypeFactory
+xacml.pdpEngineFactory=org.apache.openaz.xacmlatt.pdp.ATTPDPEngineFactory
+xacml.pepEngineFactory=org.apache.openaz.xacml.std.pep.StdEngineFactory
+xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
 
 # If there is a standard set of PIPEngines:
 # xacml.pip.engines=engine1,engine2,...,engineN
-# engine1.classname=com.att.research.xacmlpip.OraclePIP
+# engine1.classname=org.apache.openaz.xacmlpip.OraclePIP
 # engine1.prop1=foo
 # engine1.prop2=bar
 # ...
-# engine2.classname=com.att.research.xacmlpip.ActiveDirectoryPIP
+# engine2.classname=org.apache.openaz.xacmlpip.ActiveDirectoryPIP
 # ...
 
-# AT&T PDP Implementation Factories
+# OpenAZ PDP Implementation Factories
 #
-xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
-xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory
-xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
+xacml.openaz.evaluationContextFactory=org.apache.openaz.xacml.pdp.std.StdEvaluationContextFactory
+xacml.openaz.combiningAlgorithmFactory=org.apache.openaz.xacml.pdp.std.StdCombiningAlgorithmFactory
+xacml.openaz.functionDefinitionFactory=org.apache.openaz.xacml.pdp.std.StdFunctionDefinitionFactory
+xacml.openaz.policyFinderFactory=org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory
 
 # If there is a standard policy for the engine:
 # xacml.att.stdPolicyFinderFactory.rootPolicyFile=/etc/stdpolicyset.xml
diff --git a/openaz-xacml-rest/pom.xml b/openaz-xacml-rest/pom.xml
index 2398075..7f6d0e9 100644
--- a/openaz-xacml-rest/pom.xml
+++ b/openaz-xacml-rest/pom.xml
@@ -18,14 +18,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>openaz</artifactId>
-        <groupId>org.openliberty.openaz</groupId>
+        <groupId>org.apache.openaz</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openaz-xacml-rest</artifactId>
     <dependencies>
         <dependency>
-            <groupId>org.openliberty.openaz</groupId>
+            <groupId>org.apache.openaz</groupId>
             <artifactId>openaz-xacml</artifactId>
         </dependency>
         <dependency>
diff --git a/openaz-xacml-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLRest.java b/openaz-xacml-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLRest.java
index b42a104..7d25895 100644
--- a/openaz-xacml-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLRest.java
+++ b/openaz-xacml-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLRest.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacml.rest;
+package org.apache.openaz.xacml.rest;
 
 import java.io.IOException;
 import java.util.Enumeration;
@@ -41,8 +41,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
 /**
  * This static class is used by both the PDP and PAP servlet's. It contains some common
diff --git a/openaz-xacml-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLRestProperties.java b/openaz-xacml-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLRestProperties.java
index f8052af..cc0f206 100644
--- a/openaz-xacml-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLRestProperties.java
+++ b/openaz-xacml-rest/src/main/java/org/apache/openaz/xacml/rest/XACMLRestProperties.java
@@ -28,9 +28,9 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package com.att.research.xacml.rest;
+package org.apache.openaz.xacml.rest;
 
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.util.XACMLProperties;
 
 /**
  * These are XACML Properties that are relevant to the RESTful API interface for
diff --git a/openaz-xacml-test/pom.xml b/openaz-xacml-test/pom.xml
index a1cf9ab..0a3711a 100644
--- a/openaz-xacml-test/pom.xml
+++ b/openaz-xacml-test/pom.xml
@@ -18,7 +18,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>openaz</artifactId>
-        <groupId>org.openliberty.openaz</groupId>
+        <groupId>org.apache.openaz</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseConformanceTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseConformanceTest.java
index 4f1bca1..ddd1a1b 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseConformanceTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseConformanceTest.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.dom;

+package org.apache.openaz.xacml.pdp.std.dom;

 

 import static org.junit.Assert.fail;

 

@@ -38,11 +38,10 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.Response;

+import org.apache.openaz.xacml.std.dom.DOMResponse;

 import org.junit.Test;

 

-import com.att.research.xacml.api.Response;

-import com.att.research.xacml.std.dom.DOMResponse;

-

 /**

  * Tests for handling the XML version of the XACML Response object.

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseTest.java
index 28d39ec..bd664be 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseTest.java
@@ -28,15 +28,15 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.dom;

+package org.apache.openaz.xacml.pdp.std.dom;

 

-import com.att.research.xacml.api.*;

-import com.att.research.xacml.std.*;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.StringNamespaceContext;

-import com.att.research.xacml.std.datatypes.XPathExpressionWrapper;

-import com.att.research.xacml.std.dom.DOMResponse;

-import com.att.research.xacml.std.dom.DOMStructureException;

+import org.apache.openaz.xacml.api.*;

+import org.apache.openaz.xacml.std.*;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.StringNamespaceContext;

+import org.apache.openaz.xacml.std.datatypes.XPathExpressionWrapper;

+import org.apache.openaz.xacml.std.dom.DOMResponse;

+import org.apache.openaz.xacml.std.dom.DOMStructureException;

 import org.junit.Test;

 

 import java.text.ParseException;

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionAccessPermittedTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionAccessPermittedTest.java
index c25f277..3ce4db7 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionAccessPermittedTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionAccessPermittedTest.java
@@ -18,22 +18,24 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

-import com.att.research.xacml.api.Request;

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.StdMutableRequest;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.dom.DOMRequest;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdEvaluationContext;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.api.Request;

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdEvaluationContext;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionAccessPermitted;

+import org.apache.openaz.xacml.std.StdMutableRequest;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.dom.DOMRequest;

 import org.junit.Ignore;

 import org.junit.Test;

 

 import javax.xml.namespace.NamespaceContext;

+

 import java.io.BufferedWriter;

 import java.io.File;

 import java.io.FileWriter;

@@ -301,7 +303,7 @@
             try {

                 requestDoubleContent = DOMRequest.load(tFile);

                 tFile.delete();

-            } catch (com.att.research.xacml.std.dom.DOMStructureException e) {

+            } catch (org.apache.openaz.xacml.std.dom.DOMStructureException e) {

                 // this is what it should do, so just continue

             } catch (Exception e) {

                 fail("Unexpected exception for bad XML, e="+e);

@@ -346,7 +348,7 @@
             try {

                 requestContentMisplaced = DOMRequest.load(tFile);

                 tFile.delete();

-            } catch (com.att.research.xacml.std.dom.DOMStructureException e) {

+            } catch (org.apache.openaz.xacml.std.dom.DOMStructureException e) {

                 // this is what it should do, so just continue

             } catch (Exception e) {

                 fail("Unexpected exception for bad XML, e="+e);

@@ -362,7 +364,7 @@
             try {

                 requestMalformedContent = DOMRequest.load(tFile);

                 tFile.delete();

-            } catch (com.att.research.xacml.std.dom.DOMStructureException e) {

+            } catch (org.apache.openaz.xacml.std.dom.DOMStructureException e) {

                 // this is what it should do, so just continue

             } catch (Exception e) {

                 fail("Unexpected exception for bad XML, e="+e);

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionArithmeticTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionArithmeticTest.java
index 876da98..6127f36 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionArithmeticTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionArithmeticTest.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -39,15 +39,15 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionArithmetic;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagIsInTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagIsInTest.java
index 09bfb56..f56a366 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagIsInTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagIsInTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -28,18 +28,18 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentBag;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBagIsIn;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentBag;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagOneAndOnlyTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagOneAndOnlyTest.java
index b384085..54ee0f5 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagOneAndOnlyTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagOneAndOnlyTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -28,17 +28,17 @@
 import java.util.List;

 import java.math.BigInteger;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentBag;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBagOneAndOnly;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentBag;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagSizeTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagSizeTest.java
index 0f7caa7..38df279 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagSizeTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagSizeTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -28,17 +28,17 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentBag;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBagSize;

+import org.apache.openaz.xacml.std.StdAttributeValue;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.StdAttributeValue;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentBag;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagTest.java
index 03fdabc..e36e7f8 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBagTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -31,17 +31,17 @@
 import java.util.Iterator;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBag;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBaseTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBaseTest.java
index b68e9d5..6297f2b 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBaseTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionBaseTest.java
@@ -28,20 +28,20 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

 import static org.junit.Assert.assertTrue;

 

+import org.apache.openaz.xacml.api.Identifier;

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.FunctionDefinition;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBag;

 import org.junit.Test;

 

-import com.att.research.xacml.api.Identifier;

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacmlatt.pdp.policy.FunctionDefinition;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test functions in the abstract FunctionDefinitionSimpleTest class.

  * Functions are tested by creating instances of other classes that should have appropriate properties to verify all variations of the responses expected.

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionComparisonTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionComparisonTest.java
index 46e4dd4..aca950a 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionComparisonTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionComparisonTest.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -40,18 +40,19 @@
 import java.util.Date;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionComparison;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionTimeInRange;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.ISO8601Date;

+import org.apache.openaz.xacml.std.datatypes.ISO8601DateTime;

+import org.apache.openaz.xacml.std.datatypes.ISO8601Time;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.ISO8601Date;

-import com.att.research.xacml.std.datatypes.ISO8601DateTime;

-import com.att.research.xacml.std.datatypes.ISO8601Time;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test FunctionDefinitionComparison

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionDateTimeArithmeticTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionDateTimeArithmeticTest.java
index e735d3c..2b88ced 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionDateTimeArithmeticTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionDateTimeArithmeticTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -28,21 +28,21 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionDateTimeArithmetic;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.ISO8601Date;

+import org.apache.openaz.xacml.std.datatypes.ISO8601DateTime;

+import org.apache.openaz.xacml.std.datatypes.ISO8601Time;

+import org.apache.openaz.xacml.std.datatypes.ISO8601TimeZone;

+import org.apache.openaz.xacml.std.datatypes.XPathDayTimeDuration;

+import org.apache.openaz.xacml.std.datatypes.XPathYearMonthDuration;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.ISO8601Date;

-import com.att.research.xacml.std.datatypes.ISO8601DateTime;

-import com.att.research.xacml.std.datatypes.ISO8601Time;

-import com.att.research.xacml.std.datatypes.ISO8601TimeZone;

-import com.att.research.xacml.std.datatypes.XPathDayTimeDuration;

-import com.att.research.xacml.std.datatypes.XPathYearMonthDuration;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionEqualityTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionEqualityTest.java
index 9ff5e52..4a02170 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionEqualityTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionEqualityTest.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -44,22 +44,22 @@
 

 import javax.security.auth.x500.X500Principal;

 

+import org.apache.openaz.xacml.api.XACML1;

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionEquality;

+import org.apache.openaz.xacml.std.datatypes.Base64Binary;

+import org.apache.openaz.xacml.std.datatypes.DataTypeRFC822Name;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.HexBinary;

+import org.apache.openaz.xacml.std.datatypes.RFC822Name;

+import org.apache.openaz.xacml.std.datatypes.XPathDayTimeDuration;

+import org.apache.openaz.xacml.std.datatypes.XPathYearMonthDuration;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML1;

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.Base64Binary;

-import com.att.research.xacml.std.datatypes.DataTypeRFC822Name;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.HexBinary;

-import com.att.research.xacml.std.datatypes.RFC822Name;

-import com.att.research.xacml.std.datatypes.XPathDayTimeDuration;

-import com.att.research.xacml.std.datatypes.XPathYearMonthDuration;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test FunctionDefinitionEquality, all of its super-classes, and all XACML functions supported by that class.

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHigherOrderBagTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHigherOrderBagTest.java
index 52977cb..054878c 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHigherOrderBagTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHigherOrderBagTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -29,18 +29,18 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentBag;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionHigherOrderBag;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentBag;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHomogeneousSimpleTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHomogeneousSimpleTest.java
index a3a30e4..26411d8 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHomogeneousSimpleTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionHomogeneousSimpleTest.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -38,16 +38,16 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.Status;

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentBag;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionEquality;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.Status;

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentBag;

-

 /**

  * FunctionDefinitionHomogeneousSimple is an abstract class, so we have to test it by creating a sub-class.

  * The constructor is tested by default when an instance of the sub-class is created for other tests.

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionLogicalTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionLogicalTest.java
index 6a727d6..3733fb1 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionLogicalTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionLogicalTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -28,15 +28,15 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionLogical;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionNumberTypeConversionTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionNumberTypeConversionTest.java
index 0d9d059..fd0176b 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionNumberTypeConversionTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionNumberTypeConversionTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -29,15 +29,15 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionNumberTypeConversion;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Tests for various classes containing only one function.

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRegexpMatchTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRegexpMatchTest.java
index 1350c37..2a01685 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRegexpMatchTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionRegexpMatchTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -31,18 +31,18 @@
 

 import javax.security.auth.x500.X500Principal;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionRegexpMatch;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.IPAddress;

+import org.apache.openaz.xacml.std.datatypes.RFC2396DomainName;

+import org.apache.openaz.xacml.std.datatypes.RFC822Name;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.IPAddress;

-import com.att.research.xacml.std.datatypes.RFC2396DomainName;

-import com.att.research.xacml.std.datatypes.RFC822Name;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSetTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSetTest.java
index b8a004b..0f340d4 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSetTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSetTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -31,18 +31,18 @@
 import java.util.Iterator;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.AttributeValue;

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentBag;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionSet;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.AttributeValue;

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentBag;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSpecialMatchTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSpecialMatchTest.java
index ce43a27..0664376 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSpecialMatchTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionSpecialMatchTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -30,17 +30,18 @@
 

 import javax.security.auth.x500.X500Principal;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.Bag;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentBag;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionRFC822NameMatch;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionX500NameMatch;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.Bag;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentBag;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringConversionTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringConversionTest.java
index 9c9efed..aacdd3f 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringConversionTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringConversionTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -35,27 +35,27 @@
 

 import javax.security.auth.x500.X500Principal;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionStringConversion;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.IPAddress;

+import org.apache.openaz.xacml.std.datatypes.IPv4Address;

+import org.apache.openaz.xacml.std.datatypes.IPv6Address;

+import org.apache.openaz.xacml.std.datatypes.ISO8601Date;

+import org.apache.openaz.xacml.std.datatypes.ISO8601DateTime;

+import org.apache.openaz.xacml.std.datatypes.ISO8601Time;

+import org.apache.openaz.xacml.std.datatypes.ISO8601TimeZone;

+import org.apache.openaz.xacml.std.datatypes.PortRange;

+import org.apache.openaz.xacml.std.datatypes.RFC2396DomainName;

+import org.apache.openaz.xacml.std.datatypes.RFC822Name;

+import org.apache.openaz.xacml.std.datatypes.XPathDayTimeDuration;

+import org.apache.openaz.xacml.std.datatypes.XPathYearMonthDuration;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.IPAddress;

-import com.att.research.xacml.std.datatypes.IPv4Address;

-import com.att.research.xacml.std.datatypes.IPv6Address;

-import com.att.research.xacml.std.datatypes.ISO8601Date;

-import com.att.research.xacml.std.datatypes.ISO8601DateTime;

-import com.att.research.xacml.std.datatypes.ISO8601Time;

-import com.att.research.xacml.std.datatypes.ISO8601TimeZone;

-import com.att.research.xacml.std.datatypes.PortRange;

-import com.att.research.xacml.std.datatypes.RFC2396DomainName;

-import com.att.research.xacml.std.datatypes.RFC822Name;

-import com.att.research.xacml.std.datatypes.XPathDayTimeDuration;

-import com.att.research.xacml.std.datatypes.XPathYearMonthDuration;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Tests for converting objects to/from Strings.

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCaseTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCaseTest.java
index e416d63..23c4f57 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCaseTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCaseTest.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -38,15 +38,15 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionEquality;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Only one function to test here.  Code copy/pasted from FunctionDefinitionEqualityTest

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringFunctionsTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringFunctionsTest.java
index d5615d6..373e924 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringFunctionsTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringFunctionsTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -29,15 +29,15 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionStringFunctions;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringNormalizeTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringNormalizeTest.java
index 4adaa8e..79ecb15 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringNormalizeTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionStringNormalizeTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -28,15 +28,15 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionStringNormalize;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionURIStringConcatenateTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionURIStringConcatenateTest.java
index 9e13807..12feac9 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionURIStringConcatenateTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionURIStringConcatenateTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -29,15 +29,15 @@
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.openaz.xacml.api.XACML2;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionURIStringConcatenate;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

 import org.junit.Test;

 

-import com.att.research.xacml.api.XACML2;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionXPathTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionXPathTest.java
index 73c0760..65a103d 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionXPathTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/functions/FunctionDefinitionXPathTest.java
@@ -18,7 +18,7 @@
  *

  */

 

-package com.att.research.xacmlatt.pdp.std.functions;

+package org.apache.openaz.xacml.pdp.std.functions;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -37,22 +37,22 @@
 import javax.xml.xpath.XPath;

 import javax.xml.xpath.XPathFactory;

 

+import org.apache.openaz.xacml.api.Request;

+import org.apache.openaz.xacml.api.XACML3;

+import org.apache.openaz.xacml.pdp.policy.ExpressionResult;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgument;

+import org.apache.openaz.xacml.pdp.policy.FunctionArgumentAttributeValue;

+import org.apache.openaz.xacml.pdp.std.StdEvaluationContext;

+import org.apache.openaz.xacml.pdp.std.StdFunctions;

+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionXPath;

+import org.apache.openaz.xacml.std.IdentifierImpl;

+import org.apache.openaz.xacml.std.StdRequest;

+import org.apache.openaz.xacml.std.StdStatus;

+import org.apache.openaz.xacml.std.datatypes.DataTypes;

+import org.apache.openaz.xacml.std.datatypes.XPathExpressionWrapper;

+import org.apache.openaz.xacml.std.dom.DOMRequest;

 import org.junit.Test;

 

-import com.att.research.xacml.api.Request;

-import com.att.research.xacml.api.XACML3;

-import com.att.research.xacml.std.IdentifierImpl;

-import com.att.research.xacml.std.StdRequest;

-import com.att.research.xacml.std.StdStatus;

-import com.att.research.xacml.std.datatypes.DataTypes;

-import com.att.research.xacml.std.datatypes.XPathExpressionWrapper;

-import com.att.research.xacml.std.dom.DOMRequest;

-import com.att.research.xacmlatt.pdp.policy.ExpressionResult;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgument;

-import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;

-import com.att.research.xacmlatt.pdp.std.StdEvaluationContext;

-import com.att.research.xacmlatt.pdp.std.StdFunctions;

-

 /**

  * Test of PDP Functions (See XACML core spec section A.3)

  *

@@ -359,7 +359,7 @@
             try {

                 requestDoubleContent = DOMRequest.load(tFile);

                 tFile.delete();

-            } catch (com.att.research.xacml.std.dom.DOMStructureException e) {

+            } catch (org.apache.openaz.xacml.std.dom.DOMStructureException e) {

                 // this is what it should do, so just continue

             } catch (Exception e) {

                 fail("Unexpected exception for bad XML, e="+e);

@@ -375,7 +375,7 @@
             try {

                 requestContentMisplaced = DOMRequest.load(tFile);

                 tFile.delete();

-            } catch (com.att.research.xacml.std.dom.DOMStructureException e) {

+            } catch (org.apache.openaz.xacml.std.dom.DOMStructureException e) {

                 // this is what it should do, so just continue

             } catch (Exception e) {

                 fail("Unexpected exception for bad XML, e="+e);

@@ -391,7 +391,7 @@
             try {

                 requestMalformedContent = DOMRequest.load(tFile);

                 tFile.delete();

-            } catch (com.att.research.xacml.std.dom.DOMStructureException e) {

+            } catch (org.apache.openaz.xacml.std.dom.DOMStructureException e) {

                 // this is what it should do, so just continue

             } catch (Exception e) {

                 fail("Unexpected exception for bad XML, e="+e);

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestCategoryTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestCategoryTest.java
index 00b5c9f..0c1575c 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestCategoryTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestCategoryTest.java
@@ -28,17 +28,16 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.json;

+package org.apache.openaz.xacml.pdp.std.json;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.fail;

 

+import org.apache.openaz.xacml.api.Request;

+import org.apache.openaz.xacml.std.json.JSONRequest;

+import org.apache.openaz.xacml.std.json.JSONStructureException;

 import org.junit.Test;

 

-import com.att.research.xacml.api.Request;

-import com.att.research.xacml.std.json.JSONRequest;

-import com.att.research.xacml.std.json.JSONStructureException;

-

 /**

  * Test JSON Request convert to object - Category sub-component.  Does not include "Default" Categories (Subject, Action, Resource, Environment).

  * Basic existance/absence of Category is tested in RequestMainTest.

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestConformanceTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestConformanceTest.java
index c50b4c1..af3890f 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestConformanceTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestConformanceTest.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.json;

+package org.apache.openaz.xacml.pdp.std.json;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.fail;

@@ -45,14 +45,13 @@
 import javax.xml.transform.dom.DOMSource;

 import javax.xml.transform.stream.StreamResult;

 

+import org.apache.openaz.xacml.api.Request;

+import org.apache.openaz.xacml.api.RequestAttributes;

+import org.apache.openaz.xacml.api.RequestReference;

+import org.apache.openaz.xacml.std.dom.DOMRequest;

+import org.apache.openaz.xacml.std.json.JSONRequest;

+import org.apache.openaz.xacml.std.json.JSONStructureException;

 import org.junit.Test;

-

-import com.att.research.xacml.api.Request;

-import com.att.research.xacml.api.RequestAttributes;

-import com.att.research.xacml.api.RequestReference;

-import com.att.research.xacml.std.dom.DOMRequest;

-import com.att.research.xacml.std.json.JSONRequest;

-import com.att.research.xacml.std.json.JSONStructureException;

 /**

  * Test JSON Request convert to object - Conformance tests

  *

diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestDefaultCategoryTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestDefaultCategoryTest.java
index 3f56148..cc3dec3 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestDefaultCategoryTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestDefaultCategoryTest.java
@@ -28,16 +28,15 @@
  *              Unpublished and Not for Publication

  *                     All Rights Reserved

  */

-package com.att.research.xacmlatt.pdp.std.json;

+package org.apache.openaz.xacml.pdp.std.json;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.fail;

 

+import org.apache.openaz.xacml.