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.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 - Default Category object tests
*
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestMainTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestMainTest.java
index 003b031..849e5d8 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestMainTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/RequestMainTest.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.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 - High-level Request-as-a-whole tests including test that fills in all fields with multiple values (where appropriate)
*
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/ResponseConformanceTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/ResponseConformanceTest.java
index cb04734..5a548a4 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/ResponseConformanceTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/ResponseConformanceTest.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;
@@ -38,18 +38,17 @@
import java.util.Collection;
import java.util.List;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.IdReference;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.std.dom.DOMResponse;
+import org.apache.openaz.xacml.std.json.JSONResponse;
+import org.apache.openaz.xacml.util.ListUtil;
import org.junit.Test;
-
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.IdReference;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.std.dom.DOMResponse;
-import com.att.research.xacml.std.json.JSONResponse;
-import com.att.research.xacml.util.ListUtil;
/**
* Test JSON Response convert to object - Conformance tests
*
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/ResponseTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/ResponseTest.java
index bd39eba..d8e2122 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/ResponseTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/json/ResponseTest.java
@@ -28,9 +28,10 @@
* 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.assertTrue;
import static org.junit.Assert.fail;
import java.text.ParseException;
@@ -40,34 +41,36 @@
import java.util.List;
import java.math.BigInteger;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdAttribute;
+import org.apache.openaz.xacml.std.StdAttributeCategory;
+import org.apache.openaz.xacml.std.StdAttributeValue;
+import org.apache.openaz.xacml.std.StdIdReference;
+import org.apache.openaz.xacml.std.StdMutableAdvice;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.StdMutableAttributeAssignment;
+import org.apache.openaz.xacml.std.StdMutableMissingAttributeDetail;
+import org.apache.openaz.xacml.std.StdMutableObligation;
+import org.apache.openaz.xacml.std.StdMutableResponse;
+import org.apache.openaz.xacml.std.StdMutableResult;
+import org.apache.openaz.xacml.std.StdMutableStatus;
+import org.apache.openaz.xacml.std.StdMutableStatusDetail;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.StdVersion;
+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.json.JSONResponse;
+import org.apache.openaz.xacml.std.json.JSONStructureException;
import org.junit.Test;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Decision;
-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.StdAttribute;
-import com.att.research.xacml.std.StdAttributeCategory;
-import com.att.research.xacml.std.StdAttributeValue;
-import com.att.research.xacml.std.StdIdReference;
-import com.att.research.xacml.std.StdMutableAdvice;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.StdMutableAttributeAssignment;
-import com.att.research.xacml.std.StdMutableMissingAttributeDetail;
-import com.att.research.xacml.std.StdMutableObligation;
-import com.att.research.xacml.std.StdMutableResponse;
-import com.att.research.xacml.std.StdMutableResult;
-import com.att.research.xacml.std.StdMutableStatus;
-import com.att.research.xacml.std.StdMutableStatusDetail;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.StdVersion;
-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.json.JSONResponse;
-import com.att.research.xacml.std.json.JSONStructureException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
/**
* Test JSON Responses
@@ -405,8 +408,16 @@
try {
jsonResponse = JSONResponse.toString(response, false);
System.out.println(jsonResponse);
+
+ String expectedJson = "{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusMessage\":\"some status message\",\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\\\\\\\" AttributeId=\\\\\\\"urn:oasis:names:tc:xacml:2.0:action:purpose\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\" Issuer=\\\\\\\"an Issuer\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">doh</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">5432</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">meh</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"},{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"}},\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer2\",\"Value\":\"Ned\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]},{\"Id\":\"urn:oasis:names:tc:xacml:1.0:subject-category:intermediary-subject\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer3\",\"Value\":\"Maggie\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer4\",\"Value\":\"Homer\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Deny\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"advice-issuer1\",\"Value\":\"Apu\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"advice-issuerNoCategory\",\"Value\":\"Crusty\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]},{\"Status\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"Value\":\"childChildChildStatusCode\"},\"Value\":\"childChildStatusCode\"},\"Value\":\"child1StatusCode\"},\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"}},\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"},{\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrNoIssuer\"}]},{\"CategoryId\":\"secondCategory\",\"Attribute\":[{\"Issuer\":\"AIssue2\",\"Value\":\"Apu2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent12\"},{\"Issuer\":\"CIssue2\",\"Value\":\"Der2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent32\"}]}],\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\",\"Version\":\"1.2.3\"},{\"Id\":\"idRef2_NoVersion\"}],\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\",\"Version\":\"4.5.6.7.8.9.0\"},{\"Id\":\"idSetRef2_NoVersion\"}]}}]}";
+
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+
//System.out.println(JSONResponse.toString(response, true));
- assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusMessage\":\"some status message\",\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\\\\\\\" AttributeId=\\\\\\\"urn:oasis:names:tc:xacml:2.0:action:purpose\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\" Issuer=\\\\\\\"an Issuer\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">doh</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">5432</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">meh</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"},{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"}},\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer2\",\"Value\":\"Ned\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]},{\"Id\":\"urn:oasis:names:tc:xacml:1.0:subject-category:intermediary-subject\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer3\",\"Value\":\"Maggie\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer4\",\"Value\":\"Homer\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Deny\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"advice-issuer1\",\"Value\":\"Apu\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"advice-issuerNoCategory\",\"Value\":\"Crusty\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]},{\"Status\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"Value\":\"childChildChildStatusCode\"},\"Value\":\"childChildStatusCode\"},\"Value\":\"child1StatusCode\"},\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"}},\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"},{\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrNoIssuer\"}]},{\"CategoryId\":\"secondCategory\",\"Attribute\":[{\"Issuer\":\"AIssue2\",\"Value\":\"Apu2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent12\"},{\"Issuer\":\"CIssue2\",\"Value\":\"Der2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent32\"}]}],\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\",\"Version\":\"1.2.3\"},{\"Id\":\"idRef2_NoVersion\"}],\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\",\"Version\":\"4.5.6.7.8.9.0\"},{\"Id\":\"idSetRef2_NoVersion\"}]}}]}", jsonResponse);
+// assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusMessage\":\"some status message\",\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\\\\\\\" AttributeId=\\\\\\\"urn:oasis:names:tc:xacml:2.0:action:purpose\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\" Issuer=\\\\\\\"an Issuer\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">doh</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">5432</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">meh</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"},{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"}},\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer2\",\"Value\":\"Ned\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]},{\"Id\":\"urn:oasis:names:tc:xacml:1.0:subject-category:intermediary-subject\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer3\",\"Value\":\"Maggie\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer4\",\"Value\":\"Homer\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Deny\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"advice-issuer1\",\"Value\":\"Apu\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"advice-issuerNoCategory\",\"Value\":\"Crusty\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]},{\"Status\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"Value\":\"childChildChildStatusCode\"},\"Value\":\"childChildStatusCode\"},\"Value\":\"child1StatusCode\"},\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"}},\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"},{\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrNoIssuer\"}]},{\"CategoryId\":\"secondCategory\",\"Attribute\":[{\"Issuer\":\"AIssue2\",\"Value\":\"Apu2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent12\"},{\"Issuer\":\"CIssue2\",\"Value\":\"Der2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent32\"}]}],\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\",\"Version\":\"1.2.3\"},{\"Id\":\"idRef2_NoVersion\"}],\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\",\"Version\":\"4.5.6.7.8.9.0\"},{\"Id\":\"idSetRef2_NoVersion\"}]}}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -870,7 +881,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -893,7 +909,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">meh</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">meh</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">meh</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -917,7 +938,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">meh</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">nu?</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">meh</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">nu?</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">meh</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\">nu?</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -940,13 +966,30 @@
result.setDecision(Decision.INDETERMINATE);
response.add(result);
try {
+// System.out.println(JSONResponse.toString(response, true));
jsonResponse = JSONResponse.toString(response, false);
+ /*
+ *
+ * PLD - chnaged this to integer, why was this a string?
+ */
+ String expectedJson = "{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">1111</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+
+ System.out.println("Tree");
+ System.out.println(tree);
+ System.out.println(treeExpected);
+ System.out.println("Done");
+
+ assertTrue(tree.equals(treeExpected));
// assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">1111</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}", jsonResponse);
} catch (Exception e) {
java.io.StringWriter sw = new java.io.StringWriter();
java.io.PrintWriter pw = new java.io.PrintWriter(sw);
e.printStackTrace(pw);
-
+
+// System.err.println(jsonResponse);
fail("operation failed, e="+e + sw.toString());
}
@@ -970,7 +1013,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">1111</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">2222</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">1111</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">2222</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:missing-attribute\"},\"StatusDetail\":\"<MissingAttributeDetail Category=\\\\\\\"urn:oasis:names:tc:xacml:1.0:action\\\\\\\" AttributeId=\\\\\\\"mad\\\\\\\" DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#string\\\\\\\"><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">1111</AttributeValue><AttributeValue DataType=\\\\\\\"http://www.w3.org/2001/XMLSchema#integer\\\\\\\">2222</AttributeValue></MissingAttributeDetail>\"},\"Decision\":\"Indeterminate\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1101,7 +1149,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"StatusCode\":{\"Value\":\"child1StatusCode\"},\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"},\"StatusMessage\":\"I'm ok, you're ok\"},\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Status\":{\"StatusCode\":{\"StatusCode\":{\"Value\":\"child1StatusCode\"},\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"},\"StatusMessage\":\"I'm ok, you're ok\"},\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"StatusCode\":{\"Value\":\"child1StatusCode\"},\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"},\"StatusMessage\":\"I'm ok, you're ok\"},\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1119,7 +1172,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"Value\":\"childChildChildStatusCode\"},\"Value\":\"childChildStatusCode\"},\"Value\":\"child1StatusCode\"},\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"},\"StatusMessage\":\"I'm ok, you're ok\"},\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Status\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"Value\":\"childChildChildStatusCode\"},\"Value\":\"childChildStatusCode\"},\"Value\":\"child1StatusCode\"},\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"},\"StatusMessage\":\"I'm ok, you're ok\"},\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Status\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"StatusCode\":{\"Value\":\"childChildChildStatusCode\"},\"Value\":\"childChildStatusCode\"},\"Value\":\"child1StatusCode\"},\"Value\":\"urn:oasis:names:tc:xacml:1.0:status:ok\"},\"StatusMessage\":\"I'm ok, you're ok\"},\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1154,7 +1212,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\"}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\"}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\"}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1192,7 +1255,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1213,7 +1281,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1255,7 +1328,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1275,7 +1353,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1295,7 +1378,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1315,7 +1403,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1336,7 +1429,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1382,7 +1480,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Lisa\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Maggie\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Lisa\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Maggie\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Lisa\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":\"Maggie\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1413,7 +1516,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":2222,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":3333,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":2222,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":3333,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"obligation-issuer1\",\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":2222,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"obligation-issuer1\",\"Value\":3333,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1439,7 +1547,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:hospital\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:hospital\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Obligations\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:hospital\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1475,7 +1588,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\"}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\"}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\"}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1513,7 +1631,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1534,7 +1657,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1576,7 +1704,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1596,7 +1729,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1616,7 +1754,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1636,7 +1779,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1657,7 +1805,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1702,7 +1855,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Lisa\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Maggie\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Lisa\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Maggie\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Bart\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Lisa\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":\"Maggie\",\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1733,7 +1891,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":2222,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":3333,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":2222,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":3333,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Issuer\":\"Advice-issuer1\",\"Value\":1111,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":2222,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Issuer\":\"Advice-issuer1\",\"Value\":3333,\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1759,21 +1922,17 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:hospital\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:hospital\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"AssociatedAdvice\":[{\"Id\":\"urn:oasis:names:tc:xacml:1.0:action:implied-action\",\"AttributeAssignment\":[{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:record\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"},{\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"SimpleXPathCategory\",\"XPath\":\"//md:hospital\"},\"Category\":\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\",\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"urn:oasis:names:tc:xacml:1.0:subject\"}]}]}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
}
-
-
-
-
-
-
-
-
-
// Attributes tests
@Test
public void testAttributes() {
@@ -1803,7 +1962,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1820,7 +1984,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1840,7 +2009,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"P10Y4M\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent2\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"P10Y4M\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent2\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"P10Y4M\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent2\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1908,7 +2082,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1924,7 +2103,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1943,7 +2127,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":\"Simpson\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":\"Simpson\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":\"Simpson\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1962,7 +2151,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":\"Simpson\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":\"Simpson\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":\"Bart\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":\"Simpson\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -1983,7 +2177,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":\"P10Y4M\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":\"P10Y4M\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":\"P10Y4M\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"AIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2004,7 +2203,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"P10Y4M\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"},{\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"P10Y4M\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"},{\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"P10Y4M\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"},{\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2024,7 +2228,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"AIssue\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent2\"},{\"Issuer\":\"AIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"AIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"AIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"AIssue\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent2\"},{\"Issuer\":\"AIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"AIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"AIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"BIssue\",\"Value\":\"AIssue\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#yearMonthDuration\",\"AttributeId\":\"attrIdent2\"},{\"Issuer\":\"AIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"AIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"AIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2041,7 +2250,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"xpathCategory\",\"XPath\":\"//md:record\"},\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"xpathCategory\",\"XPath\":\"//md:record\"},\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":{\"Namespaces\":[{\"Namespace\":\"referenceForMD\",\"Prefix\":\"md\"},{\"Namespace\":\"defaultURI\"}],\"XPathCategory\":\"xpathCategory\",\"XPath\":\"//md:record\"},\"DataType\":\"urn:oasis:names:tc:xacml:3.0:data-type:xpathExpression\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2070,7 +2284,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"},{\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrNoIssuer\"}]},{\"CategoryId\":\"secondCategory\",\"Attribute\":[{\"Issuer\":\"AIssue2\",\"Value\":\"Apu2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent12\"},{\"Issuer\":\"CIssue2\",\"Value\":\"Der2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent32\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"},{\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrNoIssuer\"}]},{\"CategoryId\":\"secondCategory\",\"Attribute\":[{\"Issuer\":\"AIssue2\",\"Value\":\"Apu2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent12\"},{\"Issuer\":\"CIssue2\",\"Value\":\"Der2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent32\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":\"Apu\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"},{\"Issuer\":\"CIssue\",\"Value\":765.432,\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent3\"},{\"Issuer\":\"DIssue\",\"Value\":true,\"DataType\":\"http://www.w3.org/2001/XMLSchema#boolean\",\"AttributeId\":\"attrIdent4\"},{\"Issuer\":\"EIssue\",\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrIdent5\"},{\"Value\":4567,\"DataType\":\"http://www.w3.org/2001/XMLSchema#integer\",\"AttributeId\":\"attrNoIssuer\"}]},{\"CategoryId\":\"secondCategory\",\"Attribute\":[{\"Issuer\":\"AIssue2\",\"Value\":\"Apu2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent12\"},{\"Issuer\":\"CIssue2\",\"Value\":\"Der2\",\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent32\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2094,7 +2313,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":[\"Apu\",\"Bart\",\"Homer\",\"Ned\"],\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":[\"Apu\",\"Bart\",\"Homer\",\"Ned\"],\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":[\"Apu\",\"Bart\",\"Homer\",\"Ned\"],\"DataType\":\"http://www.w3.org/2001/XMLSchema#string\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2116,7 +2340,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":[4567,765.432,4567],\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":[4567,765.432,4567],\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Category\":[{\"CategoryId\":\"firstCategory\",\"Attribute\":[{\"Issuer\":\"AIssue\",\"Value\":[4567,765.432,4567],\"DataType\":\"http://www.w3.org/2001/XMLSchema#double\",\"AttributeId\":\"attrIdent1\"}]}],\"Decision\":\"Permit\"}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2182,7 +2411,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\",\"Version\":\"1.2.3\"},{\"Id\":\"idRef2_NoVersion\"}],\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\",\"Version\":\"4.5.6.7.8.9.0\"},{\"Id\":\"idSetRef2_NoVersion\"}]}}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\",\"Version\":\"1.2.3\"},{\"Id\":\"idRef2_NoVersion\"}],\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\",\"Version\":\"4.5.6.7.8.9.0\"},{\"Id\":\"idSetRef2_NoVersion\"}]}}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\",\"Version\":\"1.2.3\"},{\"Id\":\"idRef2_NoVersion\"}],\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\",\"Version\":\"4.5.6.7.8.9.0\"},{\"Id\":\"idSetRef2_NoVersion\"}]}}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2233,7 +2467,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\",\"Version\":\"1.2.3\"}]}}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\",\"Version\":\"1.2.3\"}]}}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\",\"Version\":\"1.2.3\"}]}}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2253,7 +2492,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\",\"Version\":\"4.5.6.7.8.9.0\"}]}}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\",\"Version\":\"4.5.6.7.8.9.0\"}]}}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\",\"Version\":\"4.5.6.7.8.9.0\"}]}}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
@@ -2276,7 +2520,12 @@
response.add(result);
try {
jsonResponse = JSONResponse.toString(response, false);
- assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\"},{\"Id\":\"idRef2_NoVersion\"}],\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\"},{\"Id\":\"idSetRef2_NoVersion\"}]}}]}", jsonResponse);
+ String expectedJson = "{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\"},{\"Id\":\"idRef2_NoVersion\"}],\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\"},{\"Id\":\"idSetRef2_NoVersion\"}]}}]}";
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(jsonResponse);
+ JsonNode treeExpected = mapper.readTree(expectedJson);
+ assertTrue(tree.equals(treeExpected));
+// assertEquals("{\"Response\":[{\"Decision\":\"Permit\",\"PolicyIdentifier\":{\"PolicyIdReference\":[{\"Id\":\"idRef1\"},{\"Id\":\"idRef2_NoVersion\"}],\"PolicySetIdReference\":[{\"Id\":\"idSetRef1\"},{\"Id\":\"idSetRef2_NoVersion\"}]}}]}", jsonResponse);
} catch (Exception e) {
fail("operation failed, e="+e);
}
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/TestBase.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/TestBase.java
index 10f5076..a0704a9 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/TestBase.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/TestBase.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test;
+package org.apache.openaz.xacml.pdp.test;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -60,34 +60,34 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.entity.ContentType;
+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.Decision;
+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.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.api.pep.PEPException;
+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.StdMutableRequest;
+import org.apache.openaz.xacml.std.StdMutableRequestAttributes;
+import org.apache.openaz.xacml.std.dom.DOMRequest;
+import org.apache.openaz.xacml.std.dom.DOMResponse;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+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 org.apache.openaz.xacml.util.XACMLProperties;
-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.Decision;
-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.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.api.pep.PEPException;
-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.StdMutableRequest;
-import com.att.research.xacml.std.StdMutableRequestAttributes;
-import com.att.research.xacml.std.dom.DOMRequest;
-import com.att.research.xacml.std.dom.DOMResponse;
-import com.att.research.xacml.std.dom.DOMStructureException;
-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 com.att.research.xacml.util.XACMLProperties;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
@@ -253,7 +253,7 @@
* @param args - command line arguments
* @throws org.apache.commons.cli.ParseException
* @throws java.net.MalformedURLException
- * @throws com.att.research.xacmlatt.pdp.test.TestBase.HelpException
+ * @throws org.apache.openaz.xacml.pdp.test.TestBase.HelpException
*/
protected void parseCommands(String[] args) throws ParseException, MalformedURLException, HelpException {
//
@@ -305,7 +305,7 @@
/**
* Using the command line options that were parsed, configures our test instance.
*
- * @throws com.att.research.xacml.util.FactoryException
+ * @throws org.apache.openaz.xacml.util.FactoryException
*/
protected void configure() throws FactoryException {
//
@@ -430,7 +430,7 @@
* requests directory issue each request to the PDP engine.
*
* @throws java.io.IOException
- * @throws com.att.research.xacml.util.FactoryException
+ * @throws org.apache.openaz.xacml.util.FactoryException
*
*/
public void run() throws IOException, FactoryException {
@@ -610,9 +610,9 @@
* @param file - Request file. Eg. Request-01-Permit.json
* @param group - This is the parsed out string of the request file that defines if it is a Permit/Deny/Generate etc.
* @return
- * @throws com.att.research.xacml.std.json.JSONStructureException
- * @throws com.att.research.xacml.std.dom.DOMStructureException
- * @throws com.att.research.xacml.api.pep.PEPException
+ * @throws org.apache.openaz.xacml.std.json.JSONStructureException
+ * @throws org.apache.openaz.xacml.std.dom.DOMStructureException
+ * @throws org.apache.openaz.xacml.api.pep.PEPException
*/
protected Request generateRequest(Path file, String group) throws JSONStructureException, DOMStructureException, PEPException {
//
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/annotations/TestAnnotation.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/annotations/TestAnnotation.java
index f6c8e7e..079fc0e 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/annotations/TestAnnotation.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/annotations/TestAnnotation.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.annotations;
+package org.apache.openaz.xacml.pdp.test.annotations;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -45,25 +45,24 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.Response;
-import com.att.research.xacml.std.annotations.RequestParser;
-import com.att.research.xacml.std.annotations.XACMLAction;
-import com.att.research.xacml.std.annotations.XACMLAttribute;
-import com.att.research.xacml.std.annotations.XACMLEnvironment;
-import com.att.research.xacml.std.annotations.XACMLMultiRequest;
-import com.att.research.xacml.std.annotations.XACMLRequest;
-import com.att.research.xacml.std.annotations.XACMLRequestReference;
-import com.att.research.xacml.std.annotations.XACMLResource;
-import com.att.research.xacml.std.annotations.XACMLSubject;
-import com.att.research.xacml.std.datatypes.HexBinary;
-import com.att.research.xacml.std.datatypes.IPAddress;
-import com.att.research.xacml.std.datatypes.IPv4Address;
-import com.att.research.xacml.std.datatypes.ISO8601DateTime;
-import com.att.research.xacml.std.datatypes.ISO8601Time;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacmlatt.pdp.test.TestBase;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.pdp.test.TestBase;
+import org.apache.openaz.xacml.std.annotations.RequestParser;
+import org.apache.openaz.xacml.std.annotations.XACMLAction;
+import org.apache.openaz.xacml.std.annotations.XACMLAttribute;
+import org.apache.openaz.xacml.std.annotations.XACMLEnvironment;
+import org.apache.openaz.xacml.std.annotations.XACMLMultiRequest;
+import org.apache.openaz.xacml.std.annotations.XACMLRequest;
+import org.apache.openaz.xacml.std.annotations.XACMLRequestReference;
+import org.apache.openaz.xacml.std.annotations.XACMLResource;
+import org.apache.openaz.xacml.std.annotations.XACMLSubject;
+import org.apache.openaz.xacml.std.datatypes.HexBinary;
+import org.apache.openaz.xacml.std.datatypes.IPAddress;
+import org.apache.openaz.xacml.std.datatypes.IPv4Address;
+import org.apache.openaz.xacml.std.datatypes.ISO8601DateTime;
+import org.apache.openaz.xacml.std.datatypes.ISO8601Time;
+import org.apache.openaz.xacml.util.FactoryException;
/**
* This example application shows how to use annotations for Java classes to create requests to send to the
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/Conformance.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/Conformance.java
index e7a85f0..5ec7859 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/Conformance.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/Conformance.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
import java.io.File;
import java.io.FileOutputStream;
@@ -40,15 +40,15 @@
import java.util.Iterator;
import java.util.List;
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.IdReference;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.Result;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.IdReference;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.api.Result;
/**
* Conformance is an application that runs a <code>ConformanceTestSet</code> and dumps results comparing the actual and
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformancePIPEngine.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformancePIPEngine.java
index a6c3d3e..5edaec2 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformancePIPEngine.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformancePIPEngine.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
import java.io.BufferedReader;
import java.io.File;
@@ -48,25 +48,24 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-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.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.std.IdentifierImpl;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.engines.ConfigurableEngine;
-import com.att.research.xacml.util.FactoryException;
+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.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.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
+import org.apache.openaz.xacml.std.pip.engines.ConfigurableEngine;
+import org.apache.openaz.xacml.util.FactoryException;
/**
- * ConformancePIPEngine implements the {@link com.att.research.xacml.api.pip.PIPFinder} interface to find attributes
+ * ConformancePIPEngine implements the {@link org.apache.openaz.xacml.api.pip.PIPFinder} interface to find attributes
* loaded from a text file containing the following fields:
* category-id,attribute-id,datatype-id,issuer,value
*
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceRepository.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceRepository.java
index 0bf9f28..594e693 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceRepository.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceRepository.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
import java.io.File;
import java.io.FileInputStream;
@@ -39,9 +39,9 @@
import java.util.List;
import java.util.Properties;
-import com.att.research.xacml.util.StringUtils;
-import com.att.research.xacml.util.XACMLProperties;
-import com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory;
+import org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory;
+import org.apache.openaz.xacml.util.StringUtils;
+import org.apache.openaz.xacml.util.XACMLProperties;
/**
* ConformanceRepository represents one or more policies for a single policy test, which will include one or more root policies, and
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceScopeResolver.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceScopeResolver.java
index 76eb3b9..9a8404a 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceScopeResolver.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceScopeResolver.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
import java.net.URI;
import java.util.ArrayList;
@@ -39,18 +39,17 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.pdp.ScopeQualifier;
-import com.att.research.xacml.api.pdp.ScopeResolver;
-import com.att.research.xacml.api.pdp.ScopeResolverException;
-import com.att.research.xacml.api.pdp.ScopeResolverResult;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.StdScopeResolverResult;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.pdp.ScopeQualifier;
+import org.apache.openaz.xacml.api.pdp.ScopeResolver;
+import org.apache.openaz.xacml.api.pdp.ScopeResolverException;
+import org.apache.openaz.xacml.api.pdp.ScopeResolverResult;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.StdScopeResolverResult;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
/**
* ConformanceScopeResolver implements {@link com.att.research.xacml.pdp.ScopeResolver} for the conformance tests
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTest.java
index d452ed8..61cccfd 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTest.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
import java.io.File;
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestEngine.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestEngine.java
index 93a51fd..d94a329 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestEngine.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestEngine.java
@@ -28,20 +28,19 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
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.Response;
-import com.att.research.xacml.api.pdp.PDPEngine;
-import com.att.research.xacml.api.pdp.PDPEngineFactory;
-import com.att.research.xacml.api.pdp.ScopeResolver;
-import com.att.research.xacml.std.dom.DOMProperties;
-import com.att.research.xacml.std.dom.DOMRequest;
-import com.att.research.xacml.std.dom.DOMResponse;
-import com.att.research.xacml.util.FactoryException;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.api.pdp.PDPEngine;
+import org.apache.openaz.xacml.api.pdp.PDPEngineFactory;
+import org.apache.openaz.xacml.api.pdp.ScopeResolver;
+import org.apache.openaz.xacml.std.dom.DOMProperties;
+import org.apache.openaz.xacml.std.dom.DOMRequest;
+import org.apache.openaz.xacml.std.dom.DOMResponse;
+import org.apache.openaz.xacml.util.FactoryException;
/**
* ConformanceTestEngine handles the creation of the PDPEngine for a ConformanceTest instance.
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestResult.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestResult.java
index 1f3132c..68a88f5 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestResult.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestResult.java
@@ -28,10 +28,10 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.Response;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.Response;
/**
* ConformanceTestResult holds all of the objects for a single conformance test run.
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestSet.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestSet.java
index 3cf9c93..4e53c31 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestSet.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ConformanceTestSet.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
import java.io.File;
import java.io.IOException;
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResponseMatchResult.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResponseMatchResult.java
index 660f983..2182e4f 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResponseMatchResult.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResponseMatchResult.java
@@ -28,18 +28,18 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.Result;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.api.Result;
/**
- * ResponseMatchResult provides information about how a {@link com.att.research.xacml.api.Response} object matches
+ * ResponseMatchResult provides information about how a {@link org.apache.openaz.xacml.api.Response} object matches
* another <code>Response</code> object.
*
*/
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResultMatchResult.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResultMatchResult.java
index 12548ab..fa84d26 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResultMatchResult.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/conformance/ResultMatchResult.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.conformance;
+package org.apache.openaz.xacml.pdp.test.conformance;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.util.ListUtil;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.util.ListUtil;
/**
- * ResultMatchResult provides information about how well a {@link com.att.research.xacml.api.Result} object matches
+ * ResultMatchResult provides information about how well a {@link org.apache.openaz.xacml.api.Result} object matches
* another <code>Result</code> object.
*
*/
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/CustomDataTypeFactory.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/CustomDataTypeFactory.java
index 40503f1..125e027 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/CustomDataTypeFactory.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/CustomDataTypeFactory.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.custom;
+package org.apache.openaz.xacml.pdp.test.custom;
import java.util.HashMap;
import java.util.Map;
-import com.att.research.xacml.api.DataType;
-import com.att.research.xacml.api.DataTypeFactory;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.api.DataType;
+import org.apache.openaz.xacml.api.DataTypeFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
public class CustomDataTypeFactory extends DataTypeFactory {
private static final Map<Identifier,DataType<?>> mapIdentifiersToDataTypes = new HashMap<Identifier,DataType<?>>();
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/CustomFunctionDefinitionFactory.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/CustomFunctionDefinitionFactory.java
index fb85cee..a28ebf9 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/CustomFunctionDefinitionFactory.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/CustomFunctionDefinitionFactory.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.custom;
+package org.apache.openaz.xacml.pdp.test.custom;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -37,12 +37,12 @@
import java.util.HashMap;
import java.util.Map;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacmlatt.pdp.policy.FunctionDefinition;
-import com.att.research.xacmlatt.pdp.policy.FunctionDefinitionFactory;
-import com.att.research.xacmlatt.pdp.std.StdFunctions;
-import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionBagOneAndOnly;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.pdp.policy.FunctionDefinition;
+import org.apache.openaz.xacml.pdp.policy.FunctionDefinitionFactory;
+import org.apache.openaz.xacml.pdp.std.StdFunctions;
+import org.apache.openaz.xacml.pdp.std.functions.FunctionDefinitionBagOneAndOnly;
+import org.apache.openaz.xacml.std.IdentifierImpl;
public class CustomFunctionDefinitionFactory extends FunctionDefinitionFactory {
private static Map<Identifier,FunctionDefinition> mapFunctionDefinitions = new HashMap<Identifier,FunctionDefinition>();
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/DataTypePrivateKey.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/DataTypePrivateKey.java
index 06867d3..9de62d0 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/DataTypePrivateKey.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/DataTypePrivateKey.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.custom;
+package org.apache.openaz.xacml.pdp.test.custom;
import java.security.PrivateKey;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.datatypes.DataTypeBase;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.datatypes.DataTypeBase;
public class DataTypePrivateKey extends DataTypeBase<PrivateKey> {
public static final Identifier DT_PRIVATEKEY = new IdentifierImpl("urn:com:att:research:xacml:custom:3.0:rsa:private");
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/DataTypePublicKey.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/DataTypePublicKey.java
index 33f77cf..0886a1d 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/DataTypePublicKey.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/DataTypePublicKey.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.custom;
+package org.apache.openaz.xacml.pdp.test.custom;
import java.security.PublicKey;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.datatypes.DataTypeBase;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.datatypes.DataTypeBase;
public class DataTypePublicKey extends DataTypeBase<PublicKey> {
public static final Identifier DT_PUBLICKEY = new IdentifierImpl("urn:com:att:research:xacml:custom:3.0:rsa:public");
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/FunctionDefinitionDecrypt.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/FunctionDefinitionDecrypt.java
index d27328f..2840725 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/FunctionDefinitionDecrypt.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/FunctionDefinitionDecrypt.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.custom;
+package org.apache.openaz.xacml.pdp.test.custom;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
@@ -41,21 +41,21 @@
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
-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.XACML3;
-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.DataTypeHexBinary;
-import com.att.research.xacml.std.datatypes.DataTypeString;
-import com.att.research.xacml.std.datatypes.HexBinary;
-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 com.att.research.xacmlatt.pdp.policy.FunctionDefinition;
-import com.att.research.xacmlatt.pdp.std.functions.ConvertedArgument;
+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.XACML3;
+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.pdp.policy.FunctionDefinition;
+import org.apache.openaz.xacml.pdp.std.functions.ConvertedArgument;
+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.DataTypeHexBinary;
+import org.apache.openaz.xacml.std.datatypes.DataTypeString;
+import org.apache.openaz.xacml.std.datatypes.HexBinary;
public class FunctionDefinitionDecrypt implements FunctionDefinition {
public static final Identifier FD_RSA_DECRYPT = new IdentifierImpl("urn:com:att:research:xacml:custom:function:3.0:rsa:decrypt");
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/TestCustom.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/TestCustom.java
index 7b2ba04..40a3a40 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/TestCustom.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/custom/TestCustom.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.custom;
+package org.apache.openaz.xacml.pdp.test.custom;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -57,22 +57,21 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-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.Request;
-import com.att.research.xacml.api.RequestAttributes;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.api.pep.PEPException;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.StdMutableRequest;
-import com.att.research.xacml.std.StdMutableRequestAttributes;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.json.JSONStructureException;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacmlatt.pdp.test.TestBase;
+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.Request;
+import org.apache.openaz.xacml.api.RequestAttributes;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.api.pep.PEPException;
+import org.apache.openaz.xacml.pdp.test.TestBase;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.StdMutableRequest;
+import org.apache.openaz.xacml.std.StdMutableRequestAttributes;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.json.JSONStructureException;
+import org.apache.openaz.xacml.util.FactoryException;
/**
* TestCustom is an application that tests the extensibility and configurability of the AT&T XACML API.
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/policy/TestPolicy.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/policy/TestPolicy.java
index 5cfdd96..cfde713 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/policy/TestPolicy.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/test/policy/TestPolicy.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacmlatt.pdp.test.policy;
+package org.apache.openaz.xacml.pdp.test.policy;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -65,20 +65,19 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-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.XACML3;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.XACMLObjectCopy;
-import com.att.research.xacml.util.XACMLPolicyAggregator;
-import com.att.research.xacml.util.XACMLPolicyScanner;
-import com.att.research.xacml.util.XACMLProperties;
-import com.att.research.xacmlatt.pdp.test.TestBase;
+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.XACML3;
+import org.apache.openaz.xacml.pdp.test.TestBase;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.XACMLObjectCopy;
+import org.apache.openaz.xacml.util.XACMLPolicyAggregator;
+import org.apache.openaz.xacml.util.XACMLPolicyScanner;
+import org.apache.openaz.xacml.util.XACMLProperties;
/**
diff --git a/openaz-xacml-test/testsets/algorithms/combinedPermitOverrides/xacml.properties b/openaz-xacml-test/testsets/algorithms/combinedPermitOverrides/xacml.properties
index f984ec7..5c25009 100755
--- a/openaz-xacml-test/testsets/algorithms/combinedPermitOverrides/xacml.properties
+++ b/openaz-xacml-test/testsets/algorithms/combinedPermitOverrides/xacml.properties
@@ -2,25 +2,25 @@
# 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.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
+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
-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
#
# When set to true, this flag tells the StdPolicyFinderFactory to combined all the root policy files into
# into one PolicySet and use the given Policy Algorithm.
#
-xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-permit-overrides
+xacml.openaz.policyFinderFactory.combineRootPolicies=urn:org:apache:openaz:xacml:3.0:policy-combining-algorithm:combined-permit-overrides
#
# Set this as the algorithm and you will see request 03 and request 06 only return one obligation.
diff --git a/openaz-xacml-test/testsets/annotation/xacml.properties b/openaz-xacml-test/testsets/annotation/xacml.properties
index dfa16e7..4b032e2 100755
--- a/openaz-xacml-test/testsets/annotation/xacml.properties
+++ b/openaz-xacml-test/testsets/annotation/xacml.properties
@@ -3,18 +3,18 @@
#
# 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.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
+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
-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
#
# NOTE: If you are testing against a RESTful PDP, then the PDP must be configured with the
diff --git a/openaz-xacml-test/testsets/conformance/xacml-perf.properties b/openaz-xacml-test/testsets/conformance/xacml-perf.properties
index 75b9639..d88f1fd 100755
--- a/openaz-xacml-test/testsets/conformance/xacml-perf.properties
+++ b/openaz-xacml-test/testsets/conformance/xacml-perf.properties
@@ -1,11 +1,11 @@
# 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.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
+xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
+#xacml.traceEngineFactory=org.apache.openaz.xacml.std.trace.LoggingTraceEngineFactory
# If there is a standard set of PIPEngines:
# xacml.pip.engines=engine1,engine2,...,engineN
@@ -19,12 +19,12 @@
ConformancePIPEngine.classname=com.att.research.xacmlatt.pdp.test.conformance.ConformancePIPEngine
ConformancePIPEngine.file=testsets/conformance/xacml3.0-ct-v.0.4/PIP.txt
-# 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-test/testsets/conformance/xacml.properties b/openaz-xacml-test/testsets/conformance/xacml.properties
index 5114d0c..331eee7 100755
--- a/openaz-xacml-test/testsets/conformance/xacml.properties
+++ b/openaz-xacml-test/testsets/conformance/xacml.properties
@@ -1,30 +1,30 @@
# 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.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
+xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
+#xacml.traceEngineFactory=org.apache.openaz.xacml.std.trace.LoggingTraceEngineFactory
# 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
# ...
xacml.pip.engines=ConformancePIPEngine
-ConformancePIPEngine.classname=com.att.research.xacmlatt.pdp.test.conformance.ConformancePIPEngine
+ConformancePIPEngine.classname=org.apache.openaz.xacmlatt.pdp.test.conformance.ConformancePIPEngine
ConformancePIPEngine.file=testsets/conformance/xacml3.0-ct-v.0.4/PIP.txt
-# 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-test/testsets/custom/category/xacml.properties b/openaz-xacml-test/testsets/custom/category/xacml.properties
index 31936d2..eb8d2b6 100755
--- a/openaz-xacml-test/testsets/custom/category/xacml.properties
+++ b/openaz-xacml-test/testsets/custom/category/xacml.properties
@@ -3,17 +3,17 @@
#
# 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
#
# NOTE: If you are testing against a RESTful PDP, then the PDP must be configured with the
diff --git a/openaz-xacml-test/testsets/custom/datatype-function/xacml.properties b/openaz-xacml-test/testsets/custom/datatype-function/xacml.properties
index b6f1c98..2ee09e8 100755
--- a/openaz-xacml-test/testsets/custom/datatype-function/xacml.properties
+++ b/openaz-xacml-test/testsets/custom/datatype-function/xacml.properties
@@ -4,21 +4,21 @@
#
# Our Customized Factories
#
-xacml.dataTypeFactory=com.att.research.xacmlatt.pdp.test.custom.CustomDataTypeFactory
-xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.test.custom.CustomFunctionDefinitionFactory
+xacml.dataTypeFactory=org.apache.openaz.xacmlatt.pdp.test.custom.CustomDataTypeFactory
+xacml.openaz.functionDefinitionFactory=org.apache.openaz.xacmlatt.pdp.test.custom.CustomFunctionDefinitionFactory
#
# Standard API Factories
#
-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.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.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.policyFinderFactory=org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory
#
# NOTE: If you are testing against a RESTful PDP, then the PDP must be configured with the
diff --git a/openaz-xacml-test/testsets/pip/configurable-csv-hyper/xacml.properties b/openaz-xacml-test/testsets/pip/configurable-csv-hyper/xacml.properties
index db3949c..3bb174a 100755
--- a/openaz-xacml-test/testsets/pip/configurable-csv-hyper/xacml.properties
+++ b/openaz-xacml-test/testsets/pip/configurable-csv-hyper/xacml.properties
@@ -12,19 +12,19 @@
# 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.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
+xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
+xacml.traceEngineFactory=org.apache.openaz.xacml.std.trace.LoggingTraceEngineFactory
+# OpenAZ PDP Implementation Factories
#
-# AT&T 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.att.policyFinderFactory=org.apache.openaz.xacmlatt.pdp.std.StdPolicyFinderFactory
#
# NOTE: If you are testing against a RESTful PDP, then the PDP must be configured with the
@@ -41,7 +41,7 @@
#
xacml.pip.engines=hyper1
-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=testsets/pip/configurable-csv-hyper/marriage.csv
@@ -50,34 +50,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=
diff --git a/openaz-xacml-test/testsets/pip/configurable-csv/xacml.properties b/openaz-xacml-test/testsets/pip/configurable-csv/xacml.properties
index 428e4fd..02e9145 100755
--- a/openaz-xacml-test/testsets/pip/configurable-csv/xacml.properties
+++ b/openaz-xacml-test/testsets/pip/configurable-csv/xacml.properties
@@ -13,19 +13,18 @@
# 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.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
+xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
+xacml.traceEngineFactory=org.apache.openaz.xacml.std.trace.LoggingTraceEngineFactory
+# OpenAZ PDP Implementation Factories
#
-# AT&T 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
#
# NOTE: If you are testing against a RESTful PDP, then the PDP must be configured with the
@@ -42,10 +41,10 @@
#
xacml.pip.engines=csv1,csv2
-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=testsets/pip/configurable-csv/adminDB/Master.txt
csv1.maxsize=4000000
csv1.delimiter=,
@@ -54,42 +53,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
@@ -99,7 +98,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=
@@ -111,15 +110,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
diff --git a/openaz-xacml-test/testsets/pip/configurable-ldap/xacml.properties b/openaz-xacml-test/testsets/pip/configurable-ldap/xacml.properties
index bd748b3..638abf5 100755
--- a/openaz-xacml-test/testsets/pip/configurable-ldap/xacml.properties
+++ b/openaz-xacml-test/testsets/pip/configurable-ldap/xacml.properties
@@ -13,19 +13,18 @@
#
# 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.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
+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
-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
#
# NOTE: If you are testing against a RESTful PDP, then the PDP must be configured with the
# policies and PIP configuration as defined below. Otherwise, this is the configuration that
@@ -41,10 +40,10 @@
#
xacml.pip.engines=ldap1
-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
@@ -57,7 +56,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
@@ -67,29 +66,29 @@
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
#
# These properties are for an attribute generator to build into requests.
diff --git a/openaz-xacml-test/testsets/pip/configurable-sql/xacml.properties b/openaz-xacml-test/testsets/pip/configurable-sql/xacml.properties
index 619aef8..ea9fa86 100755
--- a/openaz-xacml-test/testsets/pip/configurable-sql/xacml.properties
+++ b/openaz-xacml-test/testsets/pip/configurable-sql/xacml.properties
@@ -12,18 +12,18 @@
# 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.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
+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
-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
#
# NOTE: If you are testing against a RESTful PDP, then the PDP must be configured with the
@@ -40,11 +40,11 @@
#
xacml.pip.engines=sql1
-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.
@@ -62,16 +62,16 @@
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
diff --git a/openaz-xacml-test/testsets/policy/xacml.properties b/openaz-xacml-test/testsets/policy/xacml.properties
index dd3c7ef..f255b2c 100755
--- a/openaz-xacml-test/testsets/policy/xacml.properties
+++ b/openaz-xacml-test/testsets/policy/xacml.properties
@@ -1,19 +1,19 @@
# 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.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory
-# AT&T PDP Implementation Factories
+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
+xacml.traceEngineFactory=org.apache.openaz.xacml.std.trace.LoggingTraceEngineFactory
+# 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
#
# For this test suite, use the command line to specify a policy. The TestPolicy.java will load the
# property values so the PDP can find the policy.
-#
\ No newline at end of file
+#
diff --git a/openaz-xacml/pom.xml b/openaz-xacml/pom.xml
index 820f6c8..e11f77c 100644
--- a/openaz-xacml/pom.xml
+++ b/openaz-xacml/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/src/main/java/org/apache/openaz/xacml/api/Advice.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Advice.java
index d072f82..3ec2785 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Advice.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Advice.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
@@ -38,7 +38,7 @@
*/
public interface Advice {
/**
- * Gets the {@link com.att.research.xacml.api.Identifier} for this <code>Advice</code> object. The <code>Identifier</code>
+ * Gets the {@link org.apache.openaz.xacml.api.Identifier} for this <code>Advice</code> object. The <code>Identifier</code>
* uniquely identifies a XACML 3.0 AssociatedAdvice element in a Rule or Policy.
*
* @return the <code>Identifier</code> for this <code>Advice</code>.
@@ -46,7 +46,7 @@
public Identifier getId();
/**
- * Gets the {@link com.att.research.xacml.api.AttributeAssignment}s in this <code>Advice</code> object. If there
+ * Gets the {@link org.apache.openaz.xacml.api.AttributeAssignment}s in this <code>Advice</code> object. If there
* are no <code>AttributeAssignment</code>s in this <code>Advice</code>, an empty <code>Collection</code> must be returned.
* The returned <code>Collection</code> should not be modified. Implementations are free to return an immutable view to enforce this.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Attribute.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Attribute.java
index 92ba3aa..aef1e96 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Attribute.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Attribute.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
import java.util.Iterator;
@@ -39,7 +39,7 @@
*/
public interface Attribute {
/**
- * Gets the {@link com.att.research.xacml.api.Identifier} for this <code>Attribute</code> object.
+ * Gets the {@link org.apache.openaz.xacml.api.Identifier} for this <code>Attribute</code> object.
* The <code>Identifier</code> uniquely identifies a XACML 3.0 Attribute element in a Request, Policy, or Response document.
*
* @return the <code>Identifier</code> for this <code>Attribute</code>
@@ -47,14 +47,14 @@
public Identifier getAttributeId();
/**
- * Gets the {@link com.att.research.xacml.api.Identifier} for the XACML 3.0 Category of this <code>Attribute</code>.
+ * Gets the {@link org.apache.openaz.xacml.api.Identifier} for the XACML 3.0 Category of this <code>Attribute</code>.
*
* @return the <code>Identifier</code> for the XACML 3.0 Category of this <code>Attribute</code>.
*/
public Identifier getCategory();
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.AttributeValue} objects for this <code>Attribute</code>.
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeValue} objects for this <code>Attribute</code>.
* If there are no <code>AttributeValue</code>s in this <code>Attribute</code>, an empty <code>Collection</code> must be returned.
* The returned <code>Collection</code> should not be modified. Implementations are free to return an immutable view to enforce this.
*
@@ -63,7 +63,7 @@
public Collection<AttributeValue<?>> getValues();
/**
- * Finds all of the {@link com.att.research.xacml.api.AttributeValue} objects with the given {@link DataType} in
+ * Finds all of the {@link org.apache.openaz.xacml.api.AttributeValue} objects with the given {@link DataType} in
* the <code>AttributeValue</code>s for this <code>Attribute</code>. If there are no matching <code>AttributeValue</code>s, an empty
* <code>Iterator</code> must be returned.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeAssignment.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeAssignment.java
index 3c7193d..84dea38 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeAssignment.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeAssignment.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Defines the API for objects that represent XACML 3.0 AttributeAssignment elements. AttributeAssignments are used
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeCategory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeCategory.java
index ce1e649..b1dcd87 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeCategory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeCategory.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
import java.util.Iterator;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeValue.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeValue.java
index 9b9d813..9d17e98 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeValue.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/AttributeValue.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Defines the API for objects representing XACML AttributeValue elements.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataType.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataType.java
index 4160457..84f0e60 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataType.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataType.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Defines the API for objects that represent XACML 3.0 data types.
@@ -39,7 +39,7 @@
*/
public interface DataType<T> {
/**
- * Gets the {@link com.att.research.xacml.api.Identifier} representing the XACML data type id for this <code>DataType</code>.
+ * Gets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML data type id for this <code>DataType</code>.
*
* @return the <code>Identifier</code> representing the XACML data type id for this <code>DataType</code>.
*/
@@ -65,28 +65,28 @@
public String toStringValue(T source) throws DataTypeException;
/**
- * Converts the given <code>Object</code> to a {@link com.att.research.xacml.api.AttributeValue} whose value
+ * Converts the given <code>Object</code> to a {@link org.apache.openaz.xacml.api.AttributeValue} whose value
* is an instance of class <code>T</code>.
*
* @param source the source object to be converted
- * @return a new {@link com.att.research.xacml.api.AttributeValue}
+ * @return a new {@link org.apache.openaz.xacml.api.AttributeValue}
* @throws UnsupportedOperationException if the given source object cannot be converted to a <code>T</code>
*/
public AttributeValue<T> createAttributeValue(Object source) throws DataTypeException;
/**
- * Converts the given <code>Object</code> to a {@link com.att.research.xacml.api.AttributeValue} whose value
+ * Converts the given <code>Object</code> to a {@link org.apache.openaz.xacml.api.AttributeValue} whose value
* is an instance of class <code>T</code>. If not null, the <code>xpathCategory</code> is used in the newly created <code>AttributeValue</code>
*
* @param source the source object to be converted
* @param xpathCategory the <code>Identifier</code> for the XPathCategory of the new <code>AttributeValue</code>
- * @return a new {@link com.att.research.xacml.api.AttributeValue}
+ * @return a new {@link org.apache.openaz.xacml.api.AttributeValue}
* @throws UnsupportedOperationException if the given source object cannot be converted to a <code>T</code>
*/
public AttributeValue<T> createAttributeValue(Object source, Identifier xpathCategory) throws DataTypeException;
/**
- * Converts the given {@link com.att.research.xacml.api.AttributeValue} of an unknown data type to an <code>AttributeValue</code>
+ * Converts the given {@link org.apache.openaz.xacml.api.AttributeValue} of an unknown data type to an <code>AttributeValue</code>
* whose value is represented by an instance of class <code>T</code>.
*
* @param attributeValueFrom the <code>AttributeValue</code> to convert
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeException.java
index 3d4895f..54da14e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeException.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Extends <code>Exception</code> to represent errors thrown by methods in the {@link DataType} interface.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeFactory.java
index aca4ff2..bb755e6 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/DataTypeFactory.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Properties;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
/**
* Abstract class for mapping data type {@link Identifier}s to
@@ -50,7 +50,7 @@
*/
public abstract class DataTypeFactory {
private static final String FACTORYID = "xacml.dataTypeFactory";
- private static final String DEFAULT_FACTORY_CLASSNAME = "com.att.research.xacml.std.StdDataTypeFactory";
+ private static final String DEFAULT_FACTORY_CLASSNAME = "org.apache.openaz.xacml.std.StdDataTypeFactory";
/**
* Protected constructor so this class cannot be instantiated.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Decision.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Decision.java
index da36ab1..fda1453 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Decision.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Decision.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Enumeration of the XACML 3.0 decisions and extended decisions that can be returned as part of
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/IdReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/IdReference.java
index 374c271..5eb4422 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/IdReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/IdReference.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Defines the API for objects that implement XACML reference elements PolicyIdReference and PolicySetIdReference.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/IdReferenceMatch.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/IdReferenceMatch.java
index 93f8dae..6d97bf4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/IdReferenceMatch.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/IdReferenceMatch.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Defines the API for objects that represent XACML PolicyIdReference or PolicySetIdReference elements with exact, earliest, and latest version
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Identifier.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Identifier.java
index 0135f89..fe484c1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Identifier.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Identifier.java
@@ -29,12 +29,12 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.net.URI;
/**
- * Identifier is the interface for objects that represent a XACML 3.0 identifier. In most cases the {@link com.att.research.xacml.std.IdentifierImpl}
+ * Identifier is the interface for objects that represent a XACML 3.0 identifier. In most cases the {@link org.apache.openaz.xacml.std.IdentifierImpl}
* in this package will suffice as an implementation of this interface, but all use of identifiers will use the <code>Identifier</code>
* interface to allow for extensions.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/MissingAttributeDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/MissingAttributeDetail.java
index 14d133d..00b429b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/MissingAttributeDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/MissingAttributeDetail.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Obligation.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Obligation.java
index 7c0d9e0..a312ca6 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Obligation.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Obligation.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
@@ -46,7 +46,7 @@
public Identifier getId();
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s representing the XACML AttributeAssignment elements
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeAssignment}s representing the XACML AttributeAssignment elements
* for this <code>Obligation</code>.
*
* @return a <code>Collection</code> of the <code>AttributeAssignment</code>s representing the XACML AttributeAssignment elements
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Request.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Request.java
index d7e9663..73aa65b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Request.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Request.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
import java.util.Iterator;
@@ -41,7 +41,7 @@
public interface Request {
/**
- * Gets the {@link com.att.research.xacml.api.RequestDefaults} representing the XACML RequestDefaults for this <code>Request</code>.
+ * Gets the {@link org.apache.openaz.xacml.api.RequestDefaults} representing the XACML RequestDefaults for this <code>Request</code>.
*
* @return the <code>RequestDefaults</code> representing the XACML RequestDefaults for this <code>Request</code>.
*/
@@ -63,7 +63,7 @@
public boolean getCombinedDecision();
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} representing XACML Attributes elements for
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestAttributes} representing XACML Attributes elements for
* this <code>Request</code>. The <code>Collection</code> should not be modified. Implementations are free to use unmodifiable lists
* to enforce this.
*
@@ -73,16 +73,16 @@
public Collection<RequestAttributes> getRequestAttributes();
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} representing XACML Attributes elements for
- * this <code>Request</code> that contain {@link com.att.research.xacml.api.Attribute}s where <code>getIncludeInResults</code> is true.
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestAttributes} representing XACML Attributes elements for
+ * this <code>Request</code> that contain {@link org.apache.openaz.xacml.api.Attribute}s where <code>getIncludeInResults</code> is true.
*
* @return a <code>Collection</code> of <code>RequestAttributes</code> containing one or more <code>Attribute</code>s to include in results.
*/
public Collection<AttributeCategory> getRequestAttributesIncludedInResult();
/**
- * Gets an <code>Iterator</code> over all of the {@link com.att.research.xacml.api.RequestAttributes} objects
- * found in this <code>Request</code> with the given {@link com.att.research.xacml.api.Identifier} representing a XACML Category.
+ * Gets an <code>Iterator</code> over all of the {@link org.apache.openaz.xacml.api.RequestAttributes} objects
+ * found in this <code>Request</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing a XACML Category.
*
* @param category the <code>Identifier</code> representing the XACML Category of the <code>ReqestAttributes</code> to retrieve.
* @return an <code>Iterator</code> over all of the <code>RequestAttributes</code> whose Category matches the given <code>Identifier</code>
@@ -98,7 +98,7 @@
public RequestAttributes getRequestAttributesByXmlId(String xmlId);
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestReference}s representing XACML MultiRequest elements in this <code>Request</code>.
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestReference}s representing XACML MultiRequest elements in this <code>Request</code>.
*
* @return the <code>Collection</code> of <code>RequestAttributes</code> representing XACML MultiRequest elements in this <code>Request</code>.
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestAttributes.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestAttributes.java
index 3d46a12..4de1b5e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestAttributes.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestAttributes.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import javax.xml.xpath.XPathExpression;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestAttributesReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestAttributesReference.java
index 271e8a2..425bd76 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestAttributesReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestAttributesReference.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Defines the API for objects that implement XACML AttributesReference elements.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestDefaults.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestDefaults.java
index 5a5dc93..7eacf46 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestDefaults.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestDefaults.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.net.URI;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestReference.java
index f174a81..1c76418 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/RequestReference.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
@@ -39,7 +39,7 @@
*/
public interface RequestReference {
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributesReference}s contained
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestAttributesReference}s contained
* in this <code>RequestReference</code>. If there are no <code>RequestAttributesReference}s this method must return an empty <code>Collection</code>.
*
* @return the <code>Collection</code> of <code>RequestAttributesReference</code>s contained in this <code>RequestReference</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Response.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Response.java
index af3bef1..7bf8e49 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Response.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Response.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
index 3eaa2e1..7619da1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
@@ -39,24 +39,24 @@
*/
public interface Result {
/**
- * Gets the {@link com.att.research.xacml.api.Decision} associated with this <code>Result</code>.
+ * Gets the {@link org.apache.openaz.xacml.api.Decision} associated with this <code>Result</code>.
*
* @return the <code>Decision</code> associated with this <code>Result</code>.
*/
public Decision getDecision();
/**
- * Gets the {@link com.att.research.xacml.api.Status} associated with this <code>Result</code>.
+ * Gets the {@link org.apache.openaz.xacml.api.Status} associated with this <code>Result</code>.
*
* @return the <code>Status</code> associated with this <code>Result</code>
*/
public Status getStatus();
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s int this <code>Result</code>. If there
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.Obligation}s int this <code>Result</code>. If there
* are no <code>Obligation</code>s this method must return an empty <code>Collection</code>.
*
- * @return the <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s <code>Result</code>.
+ * @return the <code>Collection</code> of {@link org.apache.openaz.xacml.api.Obligation}s <code>Result</code>.
*/
public Collection<Obligation> getObligations();
@@ -69,7 +69,7 @@
public Collection<Advice> getAssociatedAdvice();
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.AttributeCategory} objects in this <code>Result</code>. If there
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeCategory} objects in this <code>Result</code>. If there
* are no <code>AttributeCategory</code> objects this method must return an empty <code>Collection</code>.
*
* @return the <code>Collection</code> of <code>AttributeCategory</code> objects in this <code>Result</code>.
@@ -77,7 +77,7 @@
public Collection<AttributeCategory> getAttributes();
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects referring to XACML 3.0 Policies
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to XACML 3.0 Policies
* that are in this <code>Result</code>.
*
* @return the <code>Collection</code> of Policy <code>IdReference</code>s in this <code>Result</code>.
@@ -85,7 +85,7 @@
public Collection<IdReference> getPolicyIdentifiers();
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects referring to XACML 3.0 PolicySets
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to XACML 3.0 PolicySets
* that are in this <code>Result</code>.
*
* @return the <code>Collection</code> of PolicySet <code>IdReference</code>s in this <code>Result</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/SemanticString.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/SemanticString.java
index 8ffd719..13f2e61 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/SemanticString.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/SemanticString.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* SemanticString is an interface for objects that have semantically significant <code>String</code> representations. It differentiates
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Status.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Status.java
index 48563cd..11da031 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Status.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Status.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Defines the API for objects that represent XACML Status elements.
@@ -36,7 +36,7 @@
*/
public interface Status {
/**
- * Gets the {@link com.att.research.xacml.api.StatusCode} for this <code>Status</code>.
+ * Gets the {@link org.apache.openaz.xacml.api.StatusCode} for this <code>Status</code>.
*
* @return the <code>StatusCode</code> for this <code>Status</code>.
*/
@@ -50,7 +50,7 @@
public String getStatusMessage();
/**
- * Gets the {@link com.att.research.xacml.api.StatusDetail} associated with this <code>Status</code> if there is any.
+ * Gets the {@link org.apache.openaz.xacml.api.StatusDetail} associated with this <code>Status</code> if there is any.
*
* @return the <code>StatusDetail</code> for this <code>Status</code> if there is any.
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusCode.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusCode.java
index 2585e97..549b38d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusCode.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusCode.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Defines the API for objects that represent XACML StatusCode values.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusDetail.java
index dcee266..c30c3ef 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/StatusDetail.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
import java.util.Collection;
@@ -38,7 +38,7 @@
*/
public interface StatusDetail {
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.MissingAttributeDetail} objects for this <code>StatusDetail</code>.
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.MissingAttributeDetail} objects for this <code>StatusDetail</code>.
* If there are no <code>MissingAttributeDetail</code>s an empty <code>Collection</code> must be returned.
*
* @return the <code>MissingAttributeDetail</code> objects for this <code>StatusDetail</code> or null if none.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Version.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Version.java
index 528cc2c..9757ad3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Version.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Version.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Version is the interface that objects that represent XACML VersionType attributes and elements implement.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/VersionMatch.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/VersionMatch.java
index 6603b97..ca2b513 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/VersionMatch.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/VersionMatch.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* VersionMatch is the interface that objects implementing references to {@link Version} objects
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML.java
index eb045d4..df54185 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML.java
@@ -29,9 +29,9 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
-import com.att.research.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.IdentifierImpl;
/**
* XACML defines a number of constants useful in processing XACML documents.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML1.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML1.java
index d327ca5..bfc811e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML1.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML1.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
-import com.att.research.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.IdentifierImpl;
/**
- * XACML1 contains the constants (<code>String</code>s, <code>URI</code>s {@link com.att.research.xacml.api.Identifier}s that are
+ * XACML1 contains the constants (<code>String</code>s, <code>URI</code>s {@link org.apache.openaz.xacml.api.Identifier}s that are
* defined in the XACML 1.0 Specification: "OASIS Standard 1.0, 18 February 2003 OASIS Standard as of 6 Feb. 2003".
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML2.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML2.java
index 863125d..01f131d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML2.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML2.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
-import com.att.research.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.IdentifierImpl;
/**
- * XACML2 contains the constants (<code>String</code>s, <code>URI</code>s {@link com.att.research.xacml.api.Identifier}s that are
+ * XACML2 contains the constants (<code>String</code>s, <code>URI</code>s {@link org.apache.openaz.xacml.api.Identifier}s that are
* defined in the XACML 2.0 Specification: "XACML 2.0 Core: eXtensible Access Control Markup Language (XACML) Version 2.0".
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML3.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML3.java
index fdcb43a..a8049ff 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML3.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/XACML3.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
-import com.att.research.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.IdentifierImpl;
/**
- * XACML3 contains the constants (<code>String</code>s, <code>URI</code>s {@link com.att.research.xacml.api.Identifier}s that are
+ * XACML3 contains the constants (<code>String</code>s, <code>URI</code>s {@link org.apache.openaz.xacml.api.Identifier}s that are
* defined in the XACML 2.0 Specification: "eXtensible Access Control Markup Language (XACML) Version 3.0".
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/package-info.java
index 851a73a..04a3b31 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api;
+package org.apache.openaz.xacml.api;
/**
* Provides the interfaces common to the XACML 3.0 Policy Enforcement Point (PEP), Policy Decision Point (PDP), and Policy Information Point (PIP) APIs.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPEngine.java
index 4ac0b76..f355ac8 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPEngine.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
import java.io.InputStream;
import java.util.Set;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPEngineFactory.java
index 9b91b7b..8cbe5d3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPEngineFactory.java
@@ -28,17 +28,17 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
import java.util.Properties;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
+import org.apache.openaz.xacml.util.XACMLProperties;
public abstract class PAPEngineFactory {
private static final String FACTORYID = XACMLProperties.PROP_PAP_PAPENGINEFACTORY;
- private static final String DEFAULT_FACTORY_CLASSNAME = "com.att.research.xacml.std.pap.StdEngineFactory";
+ private static final String DEFAULT_FACTORY_CLASSNAME = "org.apache.openaz.xacml.std.pap.StdEngineFactory";
/**
* The constructor is protected to prevent instantiation of the class.
@@ -100,7 +100,7 @@
* Creates a new <code>PAPEngine</code> based on the configured <code>PAPEngineFactory</code>.
*
* @return a new <code>PAPEngine</code>
- * @throws com.att.research.xacml.api.pap.PAPException
+ * @throws org.apache.openaz.xacml.api.pap.PAPException
*/
public abstract PAPEngine newEngine() throws FactoryException, PAPException;
@@ -108,7 +108,7 @@
* Creates a new <code>PAPEngine</code> based on the configured <code>PAPEngineFactory</code>.
*
* @return a new <code>PAPEngine</code>
- * @throws com.att.research.xacml.api.pap.PAPException
+ * @throws org.apache.openaz.xacml.api.pap.PAPException
*/
public abstract PAPEngine newEngine(Properties properties) throws FactoryException, PAPException;
}
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPException.java
index 9523b6e..4916280 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PAPException.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
public class PAPException extends Exception {
private static final long serialVersionUID = 8291987599333392339L;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDP.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDP.java
index 46136de..f1c96ab 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDP.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDP.java
@@ -28,15 +28,16 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
-import com.att.research.xacml.std.pap.StdPDP;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.util.Set;
+import org.apache.openaz.xacml.std.pap.StdPDP;
+
/*
* The following allows us to use Jackson to convert sub-types of this type into JSON and back to objects.
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPGroup.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPGroup.java
index 1fb0865..feb71e9 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPGroup.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPGroup.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
import java.util.Properties;
import java.util.Set;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPGroupStatus.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPGroupStatus.java
index cb13153..7097016 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPGroupStatus.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPGroupStatus.java
@@ -28,11 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
import java.util.Set;
-import com.att.research.xacml.std.pap.StdPDPGroupStatus;
+import org.apache.openaz.xacml.std.pap.StdPDPGroupStatus;
+
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPPIPConfig.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPPIPConfig.java
index aca88a4..c1729d2 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPPIPConfig.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPPIPConfig.java
@@ -28,11 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
import java.util.Map;
-import com.att.research.xacml.std.pap.StdPDPPIPConfig;
+import org.apache.openaz.xacml.std.pap.StdPDPPIPConfig;
+
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPPolicy.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPPolicy.java
index 3ce958a..1b52c84 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPPolicy.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPPolicy.java
@@ -28,13 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-import com.att.research.xacml.std.pap.StdPDPPolicy;
+import org.apache.openaz.xacml.std.pap.StdPDPPolicy;
+
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPStatus.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPStatus.java
index 20b5905..dcaa905 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPStatus.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/PDPStatus.java
@@ -28,11 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
import java.util.Set;
-import com.att.research.xacml.std.pap.StdPDPStatus;
+import org.apache.openaz.xacml.std.pap.StdPDPStatus;
+
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/package-info.java
index 720721e..9f4eba0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pap/package-info.java
@@ -35,4 +35,4 @@
*
*
*/
-package com.att.research.xacml.api.pap;
+package org.apache.openaz.xacml.api.pap;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngine.java
index 46dab2f..b157a2b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngine.java
@@ -29,13 +29,13 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.pdp;
+package org.apache.openaz.xacml.api.pdp;
import java.net.URI;
import java.util.Collection;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.Response;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.Response;
/**
* PEPEngine is the interface that applications use to make policy queries against a XACML 3.0 policy engine.
@@ -43,11 +43,11 @@
*/
public interface PDPEngine {
/**
- * Evaluates the given {@link com.att.research.xacml.api.Request} using this <code>PDPEngine</code>'s
+ * Evaluates the given {@link org.apache.openaz.xacml.api.Request} using this <code>PDPEngine</code>'s
* Policy Sets to determine if the given <code>Request</code> is allowed.
*
* @param pepRequest the <code>Request</code> to evaluate
- * @return a {@link com.att.research.xacml.api.Response} indicating the decision
+ * @return a {@link org.apache.openaz.xacml.api.Response} indicating the decision
*/
public Response decide(Request pepRequest) throws PDPException;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
index 277f694..5767530 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
@@ -29,14 +29,14 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.pdp;
+package org.apache.openaz.xacml.api.pdp;
import java.util.Properties;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
+import org.apache.openaz.xacml.util.XACMLProperties;
/**
* PDPEngineFactory provides the interface for creating {@link com.att.research.xacml.pep.PDPEngine} instances.
@@ -44,7 +44,7 @@
*/
public abstract class PDPEngineFactory {
private static final String FACTORYID = XACMLProperties.PROP_PDPENGINEFACTORY;
- private static final String DEFAULT_FACTORY_CLASSNAME = "com.att.research.xacmlatt.pdp.ATTPDPEngineFactory";
+ private static final String DEFAULT_FACTORY_CLASSNAME = "org.apache.openaz.xacml.pdp.ATTPDPEngineFactory";
private Decision defaultBehavior = Decision.INDETERMINATE;
private ScopeResolver scopeResolver;
@@ -142,14 +142,14 @@
}
/**
- * Creates a new <code>PDPEngine</code> using the default policy set and {@link com.att.research.xacml.api.pip.PIPFinder}.
+ * Creates a new <code>PDPEngine</code> using the default policy set and {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
*
* @return a new <code>PDPEngine</code>
*/
public abstract PDPEngine newEngine() throws FactoryException;
/**
- * Creates a new <code>PDPEngine</code> using the default policy set and {@link com.att.research.xacml.api.pip.PIPFinder}.
+ * Creates a new <code>PDPEngine</code> using the default policy set and {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
*
* @return a new <code>PDPEngine</code>
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPException.java
index 8a674d0..0f9f516 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPException.java
@@ -28,10 +28,10 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pdp;
+package org.apache.openaz.xacml.api.pdp;
/**
- * PEPException extends <code>Exception</code> to implement exceptions thrown by {@link PDPEngine} and {@link com.att.research.xacml.api.pdp.PDPEngineFactory}
+ * PEPException extends <code>Exception</code> to implement exceptions thrown by {@link PDPEngine} and {@link org.apache.openaz.xacml.api.pdp.PDPEngineFactory}
* classes.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeQualifier.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeQualifier.java
index e1e9aeb..9f4c71f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeQualifier.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeQualifier.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pdp;
+package org.apache.openaz.xacml.api.pdp;
/**
* ScopeQualifier enumerates the values of the "scope" attribute in requests.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolver.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolver.java
index 691ad0e..9dfd334 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolver.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolver.java
@@ -28,9 +28,9 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pdp;
+package org.apache.openaz.xacml.api.pdp;
-import com.att.research.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Attribute;
/**
* ScopeResolver is the interface that objects implement that can be used to resolve attribute scopes to individual
@@ -39,13 +39,13 @@
*/
public interface ScopeResolver {
/**
- * Examines the given {@link com.att.research.xacml.api.Attribute} representing a resource identifier for a hierarchical
+ * Examines the given {@link org.apache.openaz.xacml.api.Attribute} representing a resource identifier for a hierarchical
* resource and returns an <code>Iterator</code> over a set of <code>Attribute</code>s representing individual resource identifiers
- * that are part of the requested hierarchy as specified by the {@link com.att.research.xacml.api.pdp.ScopeQualifier}.
+ * that are part of the requested hierarchy as specified by the {@link org.apache.openaz.xacml.api.pdp.ScopeQualifier}.
*
* @param attributeResourceId the <code>Attribute</code> for the resource identifier
* @param scopeQualifier the <code>ScopeQualifier</code> determining which nodes are returned
- * @return a {@link com.att.research.xacml.api.pdp.ScopeResolverResult} with the results of the request
+ * @return a {@link org.apache.openaz.xacml.api.pdp.ScopeResolverResult} with the results of the request
* @throws ScopeResolverException if there is an error resolving the resource identifier to a scope.
*/
public ScopeResolverResult resolveScope(Attribute attributeResourceId, ScopeQualifier scopeQualifier) throws ScopeResolverException;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverException.java
index 53b0f95..6e7e012 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverException.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pdp;
+package org.apache.openaz.xacml.api.pdp;
/**
* ScopeResolverException is thrown by the {@link ScopeResolver} interface methods.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverResult.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverResult.java
index f07a6a8..f0039d7 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverResult.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/ScopeResolverResult.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pdp;
+package org.apache.openaz.xacml.api.pdp;
import java.util.Iterator;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.Status;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Status;
/**
* ScopeResolverResult is the interface for objects returned by the {@link ScopeResolver}'s
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/package-info.java
index 55bee7a..6bdca5a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.pdp;
+package org.apache.openaz.xacml.api.pdp;
/**
* com.att.research.xacml.api.pdp contains the XACML API for that PDP implementations must meet to be used by the standard PEP
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPEngine.java
index b854bcd..cf498ea 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPEngine.java
@@ -29,10 +29,10 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.pep;
+package org.apache.openaz.xacml.api.pep;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.Response;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.Response;
/**
* PEPEngine is the interface that applications use to make policy queries against a XACML 3.0 policy engine.
@@ -40,11 +40,11 @@
*/
public interface PEPEngine {
/**
- * Instantiates a Policy Decision Point (PDP) to evaluate the given {@link com.att.research.xacml.api.Request} using its
+ * Instantiates a Policy Decision Point (PDP) to evaluate the given {@link org.apache.openaz.xacml.api.Request} using its
* Policy Sets to determine if the given <code>Request</code> is allowed.
*
* @param pepRequest the <code>Request</code> to evaluate
- * @return a {@link com.att.research.xacml.api.Response} indicating the decision
+ * @return a {@link org.apache.openaz.xacml.api.Response} indicating the decision
*/
public Response decide(Request pepRequest) throws PEPException;
}
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPEngineFactory.java
index 072769e..b6165cd 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPEngineFactory.java
@@ -29,13 +29,13 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.pep;
+package org.apache.openaz.xacml.api.pep;
import java.util.Properties;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
+import org.apache.openaz.xacml.util.XACMLProperties;
/**
* PEPEngineFactory provides the interface for creating {@link PEPEngine} instances.
@@ -43,7 +43,7 @@
*/
public abstract class PEPEngineFactory {
private static final String FACTORYID = XACMLProperties.PROP_PEPENGINEFACTORY;
- private static final String DEFAULT_FACTORY_CLASSNAME = "com.att.research.xacml.std.pep.StdEngineFactory";
+ private static final String DEFAULT_FACTORY_CLASSNAME = "org.apache.openaz.xacml.std.pep.StdEngineFactory";
/**
* The constructor is protected to prevent instantiation of the class.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPException.java
index be3b894..e40fd8e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/PEPException.java
@@ -28,10 +28,10 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pep;
+package org.apache.openaz.xacml.api.pep;
/**
- * PEPException extends <code>Exception</code> to implement exceptions thrown by {@link PEPEngine} and {@link com.att.research.xacml.api.pep.PEPEngineFactory}
+ * PEPException extends <code>Exception</code> to implement exceptions thrown by {@link PEPEngine} and {@link org.apache.openaz.xacml.api.pep.PEPEngineFactory}
* classes.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/package-info.java
index 20f7f92..ece5930 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pep/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.pep;
+package org.apache.openaz.xacml.api.pep;
/**
* com.att.research.xacml.api.pep contains the XACML API for the PEP interface
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPEngine.java
index 22cabda..086a983 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPEngine.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pip;
+package org.apache.openaz.xacml.api.pip;
import java.util.Collection;
/**
- * PIPEngine is the interface that objects implement that do look-up of {@link com.att.research.xacml.api.Attribute}s.
+ * PIPEngine is the interface that objects implement that do look-up of {@link org.apache.openaz.xacml.api.Attribute}s.
*
*/
public interface PIPEngine {
@@ -66,8 +66,8 @@
public Collection<PIPRequest> attributesProvided();
/**
- * Retrieves <code>Attribute</code>s that match the given {@link com.att.research.xacml.api.pip.PIPRequest}.
- * The {@link com.att.research.xacml.api.pip.PIPResponse} may contain multiple <code>Attribute</code>s and they
+ * Retrieves <code>Attribute</code>s that match the given {@link org.apache.openaz.xacml.api.pip.PIPRequest}.
+ * The {@link org.apache.openaz.xacml.api.pip.PIPResponse} may contain multiple <code>Attribute</code>s and they
* do not need to match the <code>PIPRequest</code>. In this way, a <code>PIPEngine</code> may compute multiple
* related <code>Attribute</code>s at once.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPException.java
index 37b18b1..dbfb6e6 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPException.java
@@ -28,11 +28,11 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pip;
+package org.apache.openaz.xacml.api.pip;
/**
* PIPException extends <code>Exception</code> to represent errors that can occur as a result of querying a
- * {@link PIPEngine} for {@link com.att.research.xacml.api.Attribute}s.
+ * {@link PIPEngine} for {@link org.apache.openaz.xacml.api.Attribute}s.
*
*/
public class PIPException extends Exception {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinder.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinder.java
index d6bc1ba..f9c7135 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinder.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinder.java
@@ -28,19 +28,19 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pip;
+package org.apache.openaz.xacml.api.pip;
import java.util.Collection;
/**
- * PIPFinder is the interface objects implement that can query multiple sources of {@link com.att.research.xacml.api.Attribute}s based
- * on a {@link com.att.research.xacml.api.pip.PIPRequest}.
+ * PIPFinder is the interface objects implement that can query multiple sources of {@link org.apache.openaz.xacml.api.Attribute}s based
+ * on a {@link org.apache.openaz.xacml.api.pip.PIPRequest}.
*
*/
public interface PIPFinder {
/**
- * Retrieves <code>Attribute</code>s that based on the given {@link com.att.research.xacml.api.pip.PIPRequest}.
- * The {@link com.att.research.xacml.api.pip.PIPResponse} may contain multiple <code>Attribute</code>s and they
+ * Retrieves <code>Attribute</code>s that based on the given {@link org.apache.openaz.xacml.api.pip.PIPRequest}.
+ * The {@link org.apache.openaz.xacml.api.pip.PIPResponse} may contain multiple <code>Attribute</code>s and they
* do not need to match the <code>PIPRequest</code>. In this way, a <code>PIPFinder</code> may compute multiple
* related <code>Attribute</code>s at once.
*
@@ -52,9 +52,9 @@
public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException;
/**
- * Retrieves <code>Attribute</code>s that match the given {@link com.att.research.xacml.api.pip.PIPRequest}.
- * The {@link com.att.research.xacml.api.pip.PIPResponse} should only include a single {@link com.att.research.xacml.api.Attribute}
- * with {@link com.att.research.xacml.api.AttributeValue}s whose data type matches the request.
+ * Retrieves <code>Attribute</code>s that match the given {@link org.apache.openaz.xacml.api.pip.PIPRequest}.
+ * The {@link org.apache.openaz.xacml.api.pip.PIPResponse} should only include a single {@link org.apache.openaz.xacml.api.Attribute}
+ * with {@link org.apache.openaz.xacml.api.AttributeValue}s whose data type matches the request.
*
* @param pipRequest the <code>PIPRequest</code> defining which <code>Attribute</code>s should be retrieved
* @param excude the (optional) <code>PIPEngine</code> to exclude from searches for the given <code>PIPRequest</code>
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinderFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinderFactory.java
index 94f7b8f..5fbf2a4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinderFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPFinderFactory.java
@@ -28,13 +28,13 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pip;
+package org.apache.openaz.xacml.api.pip;
import java.util.Properties;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
+import org.apache.openaz.xacml.util.XACMLProperties;
/**
* PIPFinderFactory is the factory class for getting the configured {@link PIPFinder}.
@@ -42,7 +42,7 @@
*/
public abstract class PIPFinderFactory {
private static final String FACTORYID = XACMLProperties.PROP_PIPFINDERFACTORY;
- private static final String DEFAULT_FACTORY_CLASSNAME = "com.att.research.xacml.std.pip.StdPIPFinderFactory";
+ private static final String DEFAULT_FACTORY_CLASSNAME = "org.apache.openaz.xacml.std.pip.StdPIPFinderFactory";
protected Properties properties = null;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPRequest.java
index 0c5f37f..5c20054 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPRequest.java
@@ -28,9 +28,9 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pip;
+package org.apache.openaz.xacml.api.pip;
-import com.att.research.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Identifier;
/**
* PIPRequest is the interface that objects implement to represent a request to a {@link PIPEngine} to retrieve
@@ -39,7 +39,7 @@
*/
public interface PIPRequest {
/**
- * Gets the {@link com.att.research.xacml.api.Identifier} of the category of the attributes to retrieve.
+ * Gets the {@link org.apache.openaz.xacml.api.Identifier} of the category of the attributes to retrieve.
*
* @return the <code>Identifier</code> for the category of the attributes to retrieve
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPResponse.java
index 2ac7c2f..000cb3b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/PIPResponse.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.api.pip;
+package org.apache.openaz.xacml.api.pip;
import java.util.Collection;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.Status;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Status;
/**
* PIPResponse is the interface that objects implement that represent a response from a {@link PIPEngine}.
@@ -41,14 +41,14 @@
*/
public interface PIPResponse {
/**
- * Gets the {@link com.att.research.xacml.api.Status} of the request to retrieve attributes from a <code>PIPEngine</code>.
+ * Gets the {@link org.apache.openaz.xacml.api.Status} of the request to retrieve attributes from a <code>PIPEngine</code>.
*
* @return the <code>Status</code> of the request to retrieve attributes from a <code>PIPEngine</code>
*/
public Status getStatus();
/**
- * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s returned from a {@link PIPEngine}.
+ * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s returned from a {@link PIPEngine}.
* The caller must not modify the returned <code>Collection</code>. The implementation is free to enforce this with unmodifiable collections.
*
* @return The <code>Collection</code> of <code>Attribute</code>s returned or an empty list if none are found
@@ -57,7 +57,7 @@
/**
* Determines if this <code>PIPResponse</code> is simple or not. A simple <code>PIPResponse</code> contains a single
- * {@link com.att.research.xacml.api.Attribute} whose {@link com.att.research.xacml.api.AttributeValue}s are all of the same data type.
+ * {@link org.apache.openaz.xacml.api.Attribute} whose {@link org.apache.openaz.xacml.api.AttributeValue}s are all of the same data type.
*
* @return true if this <code>PIPResponse</code> is simple, else false.
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/package-info.java
index 04348dd..873ea36 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pip/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.pip;
+package org.apache.openaz.xacml.api.pip;
/**
* com.att.research.xacml.api.pip contains an API for PIP providers and PIP users
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngine.java
index 0a15bfb..a10d744 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngine.java
@@ -29,11 +29,11 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.trace;
+package org.apache.openaz.xacml.api.trace;
/**
* Defines the API for objects that serve as handlers for {@link TraceEvent}s. <code>TraceEngine</code>s
- * are instantiated with {@link com.att.research.xacml.api.trace.TraceEngineFactory} objects.
+ * are instantiated with {@link org.apache.openaz.xacml.api.trace.TraceEngineFactory} objects.
*
*/
public interface TraceEngine {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngineFactory.java
index 98533eb..215b30e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEngineFactory.java
@@ -29,13 +29,13 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.trace;
+package org.apache.openaz.xacml.api.trace;
import java.util.Properties;
-import com.att.research.xacml.util.FactoryException;
-import com.att.research.xacml.util.FactoryFinder;
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.util.FactoryException;
+import org.apache.openaz.xacml.util.FactoryFinder;
+import org.apache.openaz.xacml.util.XACMLProperties;
/**
* Provides methods for creating instances of the {@link TraceEngine} interface. This may be used by PDP, PEP, or PIP
@@ -44,7 +44,7 @@
*/
public abstract class TraceEngineFactory {
private static final String FACTORYID = XACMLProperties.PROP_TRACEENGINEFACTORY;
- private static final String DEFAULT_FACTORY_CLASSNAME = "com.att.research.xacml.std.trace.NullTraceEngineFactory";
+ private static final String DEFAULT_FACTORY_CLASSNAME = "org.apache.openaz.xacml.std.trace.NullTraceEngineFactory";
protected Properties properties = null;
@@ -57,7 +57,7 @@
/**
* Gets an instance of the <code>TraceEngineFactory</code> class using standard factory lookup methods defined by
- * the {@link com.att.research.xacml.util.FactoryFinder} class.
+ * the {@link org.apache.openaz.xacml.util.FactoryFinder} class.
*
* @return an instance of the <code>TraceEngineFactory</code> class.
* @throws FactoryException if there is an error finding a <code>TraceEngineFactory</code>
@@ -68,7 +68,7 @@
/**
* Gets an instance of the <code>TraceEngineFactory</code> class using standard factory lookup methods defined by
- * the {@link com.att.research.xacml.util.FactoryFinder} class.
+ * the {@link org.apache.openaz.xacml.util.FactoryFinder} class.
*
* @return an instance of the <code>TraceEngineFactory</code> class.
* @throws FactoryException if there is an error finding a <code>TraceEngineFactory</code>
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEvent.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEvent.java
index 4a1bd22..98651b1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEvent.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/TraceEvent.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.trace;
+package org.apache.openaz.xacml.api.trace;
import java.util.Date;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/Traceable.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/Traceable.java
index 6af277f..cb41065 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/Traceable.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/Traceable.java
@@ -29,16 +29,16 @@
* All Rights Reserved
*/
-package com.att.research.xacml.api.trace;
+package org.apache.openaz.xacml.api.trace;
/**
- * Defines the API for objects that can be set as the "cause" in a {@link com.att.research.xacml.api.trace.TraceEvent}. Objects
+ * Defines the API for objects that can be set as the "cause" in a {@link org.apache.openaz.xacml.api.trace.TraceEvent}. Objects
* cause a <code>TraceEvent</code> through methods called during the evaluation of a XACML Policy or PolicySet.
*
*/
public interface Traceable {
/**
- * Gets the <code>String</code> identifier for the object that caused the {@link com.att.research.xacml.api.trace.TraceEvent} as a result
+ * Gets the <code>String</code> identifier for the object that caused the {@link org.apache.openaz.xacml.api.trace.TraceEvent} as a result
* of a policy evaluation method.
* Implementations must not return <code>null</code>.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/package-info.java
index a6afcf6..367306d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/trace/package-info.java
@@ -33,4 +33,4 @@
* Interfaces for objects that implement policy evaluation tracing.
*
*/
-package com.att.research.xacml.api.trace;
+package org.apache.openaz.xacml.api.trace;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/package-info.java
index 9f933c3..59b0879 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml;
+package org.apache.openaz.xacml;
/**
* Provides base interfaces and standard implementation classes for applications using the "eXtensible Access Control Markup Language (XACML) Version 3.0"
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/IdentifierImpl.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/IdentifierImpl.java
index 5f017af..51bc68d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/IdentifierImpl.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/IdentifierImpl.java
@@ -29,16 +29,16 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.net.URI;
import java.util.UUID;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * IdentifierImpl provides a common implementation of the {@link com.att.research.xacml.api.Identifier} interface with a stored, fixed <code>URI</code>.
+ * IdentifierImpl provides a common implementation of the {@link org.apache.openaz.xacml.api.Identifier} interface with a stored, fixed <code>URI</code>.
*
*/
public class IdentifierImpl implements Identifier {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAdvice.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAdvice.java
index 8aad454..cd1ff9a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAdvice.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAdvice.java
@@ -28,22 +28,22 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.util.Wrapper;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.Advice} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.Advice} interface.
*
*/
public class StdAdvice extends Wrapper<Advice> implements Advice {
/**
- * Creates an immutable <code>StdAdvice</code> that wraps the given {@link com.att.research.xacml.api.Advice}.
+ * Creates an immutable <code>StdAdvice</code> that wraps the given {@link org.apache.openaz.xacml.api.Advice}.
*
* @param advice the <code>Advice</code> object to wrap in the new <code>StdAdvice</code>
*/
@@ -52,8 +52,8 @@
}
/**
- * Creates an immutable <code>StdAdvice</code> with the given {@link com.att.research.xacml.api.Identifier} as the XACML AdviceId
- * and the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s representing the XACML AttributeAssignment elements.
+ * Creates an immutable <code>StdAdvice</code> with the given {@link org.apache.openaz.xacml.api.Identifier} as the XACML AdviceId
+ * and the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeAssignment}s representing the XACML AttributeAssignment elements.
*
* @param adviceId the <code>Identifier</code> representing the XACML AdviceId
* @param attributeAssignmentsIn the <code>Collection</code> of <code>AttributeAssignment</code>s representing the XACML AttributeAssignment elements.
@@ -63,7 +63,7 @@
}
/**
- * Creates an immutable <code>StdAdvice</code> with the given {@link com.att.research.xacml.api.Identifier} as the XACML AdviceId and
+ * Creates an immutable <code>StdAdvice</code> with the given {@link org.apache.openaz.xacml.api.Identifier} as the XACML AdviceId and
* an empty list of <code>AttributeAssignment</code>s.
*
* @param adviceId the <code>Identifier</code> representing the XACML AdviceId
@@ -73,7 +73,7 @@
}
/**
- * Creates a copy of the given {@link com.att.research.xacml.api.Advice}.
+ * Creates a copy of the given {@link org.apache.openaz.xacml.api.Advice}.
*
* @param advice the <code>Advice</code> to copy
* @return a new <code>StdAdvice</code> that is a copy of the given <code>Advice</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttribute.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttribute.java
index 3aed474..6e4585f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttribute.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttribute.java
@@ -28,24 +28,24 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
import java.util.Iterator;
-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.Identifier;
-import com.att.research.xacml.util.Wrapper;
+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.Identifier;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.Attribute} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.Attribute} interface.
*
*/
public class StdAttribute extends Wrapper<Attribute> implements Attribute {
/**
- * Creates an immutable <code>StdAttribute</code> that wraps the given {@link com.att.research.xacml.api.Attribute}.
+ * Creates an immutable <code>StdAttribute</code> that wraps the given {@link org.apache.openaz.xacml.api.Attribute}.
*
* @param attribute the <code>Attribute</code> wrapped by this <code>StdAttribute</code>.
*/
@@ -54,8 +54,8 @@
}
/**
- * Creates an immutable <code>StdAttribute</code> with the given {@link com.att.research.xacml.api.Identifier}s representing the XACML Category and
- * AttributeId, a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeValue}s representing the
+ * Creates an immutable <code>StdAttribute</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s representing the XACML Category and
+ * AttributeId, a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeValue}s representing the
* XACML AttributeValue elements, the given <code>String</code> Issuer, and the given <code>boolean</code> indicating whether the new <code>StdAttribute</code>
* should be returned as part of a decision Result.
*
@@ -70,8 +70,8 @@
}
/**
- * Creates an immutable <code>StdAttribute</code> with the given {@link com.att.research.xacml.api.Identifier}s representing the XACML Category and
- * AttributeId, the {@link com.att.research.xacml.api.AttributeValue}s representing a single
+ * Creates an immutable <code>StdAttribute</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s representing the XACML Category and
+ * AttributeId, the {@link org.apache.openaz.xacml.api.AttributeValue}s representing a single
* XACML AttributeValue element, the given <code>String</code> Issuer, and the given <code>boolean</code> indicating whether the new <code>StdAttribute</code>
* should be returned as part of a decision Result.
*
@@ -86,8 +86,8 @@
}
/**
- * Creates an immutable <code>StdAttribute</code> with the given {@link com.att.research.xacml.api.Identifier}s representing the XACML Category and
- * AttributeId, and the {@link com.att.research.xacml.api.AttributeValue}s representing a single
+ * Creates an immutable <code>StdAttribute</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s representing the XACML Category and
+ * AttributeId, and the {@link org.apache.openaz.xacml.api.AttributeValue}s representing a single
* XACML AttributeValue element.
*
* @param categoryIdIn the <code>Identifier</code> representing the XACML Category
@@ -99,7 +99,7 @@
}
/**
- * Gets a new <code>StdAttribute</code> that is a copy of the given {@link com.att.research.xacml.api.Attribute}.
+ * Gets a new <code>StdAttribute</code> that is a copy of the given {@link org.apache.openaz.xacml.api.Attribute}.
*
* @param attribute the <code>Attribute</code> to copy
* @return a new <code>StdAttribute</code> that is a copy of the given <code>Attribute</code>
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeAssignment.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeAssignment.java
index 8f25d1e..dd8f65e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeAssignment.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeAssignment.java
@@ -28,20 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
-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.util.Wrapper;
+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.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.AttributeAssignment} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.AttributeAssignment} interface.
*
*/
public class StdAttributeAssignment extends Wrapper<AttributeAssignment> implements AttributeAssignment {
/**
- * Creates a new immutable <code>StdAttributeAssignment</code> that wraps the given {@link com.att.research.xacml.api.AttributeAssignment}.
+ * Creates a new immutable <code>StdAttributeAssignment</code> that wraps the given {@link org.apache.openaz.xacml.api.AttributeAssignment}.
* The caller agrees not to modify the given <code>AttributeAssignment</code> as long as the new <code>StdAttributeAssignment</code> refers
* to it.
*
@@ -52,8 +52,8 @@
}
/**
- * Creates a new immutable <code>StdAttributeAssignment</code> with the given {@link com.att.research.xacml.api.Identifier}s representing the XACML
- * Category and AttributeId of the Attribute to be assigned, the given <code>String</code> issuer, and the given {@link com.att.research.xacml.api.AttributeValue}
+ * Creates a new immutable <code>StdAttributeAssignment</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s representing the XACML
+ * Category and AttributeId of the Attribute to be assigned, the given <code>String</code> issuer, and the given {@link org.apache.openaz.xacml.api.AttributeValue}
* representing the value to assign to the Attribute.
*
* @param categoryIn the <code>Identifier</code> representing the Category of the Attribute to be assigned
@@ -66,7 +66,7 @@
}
/**
- * Creates a new immutable <code>StdAttributeAssignment</code> by copying the given {@link com.att.research.xacml.api.AttributeAssignment}.
+ * Creates a new immutable <code>StdAttributeAssignment</code> by copying the given {@link org.apache.openaz.xacml.api.AttributeAssignment}.
*
* @param attributeAssignment the <code>AttributeAssignment</code> to copy
* @return a new <code>StdAttributeAssignment</code> copied from the given <code>AttributeAssignment</code>
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeCategory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeCategory.java
index 5aa385d..1bf44f4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeCategory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeCategory.java
@@ -28,23 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
import java.util.Iterator;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.util.Wrapper;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.AttributeCategory} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.AttributeCategory} interface.
*
*/
public class StdAttributeCategory extends Wrapper<AttributeCategory> implements AttributeCategory {
/**
- * Creates an immutable <code>StdAttributeCategory</code> that wraps the given {@link com.att.research.xacml.api.AttributeCategory}.
+ * Creates an immutable <code>StdAttributeCategory</code> that wraps the given {@link org.apache.openaz.xacml.api.AttributeCategory}.
* The caller agrees to no longer modify the given <code>AttributeCategory</code> while it is wrapped by the <code>StdAttributeCategory</code>>
*
* @param attributeCategory the <code>AttributeCategory</code> to wrap.
@@ -54,8 +54,8 @@
}
/**
- * Creates a new <code>StdAttributeCategory</code> with the given {@link com.att.research.xacml.api.Identifier} representing its
- * XACML Category, and the given <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s as its XACML Attributes.
+ * Creates a new <code>StdAttributeCategory</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing its
+ * XACML Category, and the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s as its XACML Attributes.
* The <code>Collection</code> is copied; changes made to the <code>Collection</code> after creating the new <code>StdAttributeCategory</code>
* are not reflected in the <code>StdAttributeCategory</code>.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeValue.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeValue.java
index 62ace65..665fa36 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeValue.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdAttributeValue.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.AttributeValue} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.AttributeValue} interface.
*
*
* @param <T> the java type of the object representing the value of the XACML AttributeValue element represented by the <code>StdAttributeValue</code>
@@ -46,7 +46,7 @@
private Identifier xpathCategory;
/**
- * Creates a new <code>StdAttributeValue</code> with the given {@link com.att.research.xacml.api.Identifier} representing the XACML data type id
+ * Creates a new <code>StdAttributeValue</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the XACML data type id
* and the given object representing the value. The <code>xpathCategoryIn</code> is optional and is only needed for <code>StdAttributeValue</code>s
* whose <code>dataTypeIdIn</code> is XPathExpression.
*
@@ -61,7 +61,7 @@
}
/**
- * Creates a new <code>StdAttributeValue</code> with the given {@link com.att.research.xacml.api.Identifier} representing the XACML data type id
+ * Creates a new <code>StdAttributeValue</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the XACML data type id
* and the given object representing the value.
*
* @param dataTypeIdIn the <code>Identifier</code> representing the XACML data type id for the new <code>StdAttributeValue</code>
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdDataTypeFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdDataTypeFactory.java
index 3c7395e..ad0b60b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdDataTypeFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdDataTypeFactory.java
@@ -28,18 +28,18 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.HashMap;
import java.util.Map;
-import com.att.research.xacml.api.DataType;
-import com.att.research.xacml.api.DataTypeFactory;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.api.DataType;
+import org.apache.openaz.xacml.api.DataTypeFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
/**
- * Implements the {@link com.att.research.xacml.api.DataTypeFactory} interface to support all of the data types in the XACML 3.0
+ * Implements the {@link org.apache.openaz.xacml.api.DataTypeFactory} interface to support all of the data types in the XACML 3.0
* specification.
*
*/
@@ -81,8 +81,8 @@
}
/**
- * Creates a new <code>StdDataTypeFactory</code> and initializes the mapping from {@link com.att.research.xacml.api.Identifier}s for XACML
- * data types to the {@link com.att.research.xacml.api.DataType} class instance that implements that data type.
+ * Creates a new <code>StdDataTypeFactory</code> and initializes the mapping from {@link org.apache.openaz.xacml.api.Identifier}s for XACML
+ * data types to the {@link org.apache.openaz.xacml.api.DataType} class instance that implements that data type.
*/
public StdDataTypeFactory() {
initMap();
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReference.java
index 13bf390..e4d8583 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReference.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
-import com.att.research.xacml.api.IdReference;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Version;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.IdReference;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Version;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.IdReference} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.IdReference} interface.
*
*/
public class StdIdReference implements IdReference {
@@ -44,8 +44,8 @@
private Version version;
/**
- * Creates a new <code>StdIdReference</code> with the given {@link com.att.research.xacml.api.Identifier} representing the
- * XACML PolicyId or PolicySetId, and the given {@link com.att.research.xacml.api.Version} representing the PolicyVersion or PolicySetVersion.
+ * Creates a new <code>StdIdReference</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the
+ * XACML PolicyId or PolicySetId, and the given {@link org.apache.openaz.xacml.api.Version} representing the PolicyVersion or PolicySetVersion.
*
* @param idIn the <code>Identifier</code> representing the PolicyId or PolicySetId.
* @param versionIn the <code>Version</code> representing the PolicyVersion or PolicySetVersion.
@@ -56,7 +56,7 @@
}
/**
- * Creates a new <code>StdIdReference</code> with the given {@link com.att.research.xacml.api.Identifier} representing the
+ * Creates a new <code>StdIdReference</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the
* XACML PolicyId or PolicySetId.
*
* @param idIn the <code>Identifier</code> representing the PolicyId or PolicySetId.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReferenceMatch.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReferenceMatch.java
index e68c452..e96266f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReferenceMatch.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIdReferenceMatch.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
-import com.att.research.xacml.api.IdReferenceMatch;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.VersionMatch;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.IdReferenceMatch;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.VersionMatch;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.IdReferenceMatch} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.IdReferenceMatch} interface.
*
*/
public class StdIdReferenceMatch implements IdReferenceMatch {
@@ -46,8 +46,8 @@
private VersionMatch latestVersion;
/**
- * Creates a new <code>StdIdReferenceMatch</code> with the given {@link com.att.research.xacml.api.Identifier} representing the PolicyId or PolicySetId
- * to match, and the given set of {@link com.att.research.xacml.api.VersionMatch} objects specifying which XACML Versions are acceptable.
+ * Creates a new <code>StdIdReferenceMatch</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the PolicyId or PolicySetId
+ * to match, and the given set of {@link org.apache.openaz.xacml.api.VersionMatch} objects specifying which XACML Versions are acceptable.
*
* @param idIn the <code>Identifier</code> representing the PolicyId or PolicySetId.
* @param versionIn the <code>VersionMatch</code> for an exact match against the current Version of a Policy or PolicySet (may be null)
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIndividualDecisionRequestGenerator.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIndividualDecisionRequestGenerator.java
index 96af943..124fd00 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIndividualDecisionRequestGenerator.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdIndividualDecisionRequestGenerator.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,27 +41,26 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+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.Request;
+import org.apache.openaz.xacml.api.RequestAttributes;
+import org.apache.openaz.xacml.api.RequestAttributesReference;
+import org.apache.openaz.xacml.api.RequestReference;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.api.pdp.ScopeQualifier;
+import org.apache.openaz.xacml.api.pdp.ScopeResolver;
+import org.apache.openaz.xacml.api.pdp.ScopeResolverException;
+import org.apache.openaz.xacml.api.pdp.ScopeResolverResult;
+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.Attribute;
-import com.att.research.xacml.api.AttributeValue;
-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.RequestAttributesReference;
-import com.att.research.xacml.api.RequestReference;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.api.pdp.ScopeQualifier;
-import com.att.research.xacml.api.pdp.ScopeResolver;
-import com.att.research.xacml.api.pdp.ScopeResolverException;
-import com.att.research.xacml.api.pdp.ScopeResolverResult;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacml.std.datatypes.XPathExpressionWrapper;
-
/**
* StdIndividualDecisionRequestGenerator is a utility that PDP developers can use to take an original
- * {@link com.att.research.xacml.api.Request} and turn it into a sequence of individual decision <code>Request</code>s.
+ * {@link org.apache.openaz.xacml.api.Request} and turn it into a sequence of individual decision <code>Request</code>s.
* This class implements all of the multiple-decision profiles specified in "XACML v3.0 Multiple Decision Profile Version 1.0"
*
*/
@@ -271,7 +270,7 @@
*
* @param requestAttributes
* @return
- * @throws com.att.research.xacml.api.pdp.ScopeResolverException
+ * @throws org.apache.openaz.xacml.api.pdp.ScopeResolverException
*/
private static ScopeQualifier getScopeQualifier(RequestAttributes requestAttributes) throws ScopeResolverException {
Iterator<Attribute> iterAttributesScope = requestAttributes.getAttributes(XACML3.ID_RESOURCE_SCOPE);
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMissingAttributeDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMissingAttributeDetail.java
index 4dad1a4..80fea11 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMissingAttributeDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMissingAttributeDetail.java
@@ -28,22 +28,22 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
-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.util.Wrapper;
+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.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.MissingAttributeDetail} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.MissingAttributeDetail} interface.
*
*/
public class StdMissingAttributeDetail extends Wrapper<MissingAttributeDetail> implements MissingAttributeDetail {
/**
- * Creates a new immutable <code>StdMissingAttributeDetail</code> that wraps the given {@link com.att.research.xacml.api.MissingAttributeDetail}.
+ * Creates a new immutable <code>StdMissingAttributeDetail</code> that wraps the given {@link org.apache.openaz.xacml.api.MissingAttributeDetail}.
* The caller agrees not to modify the <code>MissingAttributeDetail</code> as long as the new <code>StdMissingAttributeDetail</code> refers
* to it.
*
@@ -54,9 +54,9 @@
}
/**
- * Creates a new immutable <code>StdMissingAttributeDetail</code> with the given {@link com.att.research.xacml.api.Identifier}s for the XACML Category,
+ * Creates a new immutable <code>StdMissingAttributeDetail</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category,
* AttributeId, and DataType of the missing Attribute, and the given <code>String</code> Issuer. If not null, the <code>Collection</code> of
- * {@link com.att.research.xacml.api.AttributeValue}s is copied into the new <code>StdMutableMissingAttributeDetail</code>.
+ * {@link org.apache.openaz.xacml.api.AttributeValue}s is copied into the new <code>StdMutableMissingAttributeDetail</code>.
*
* @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
* @param attributeIdIn the <code>Identifier</code> representing the XACML AttributeId of the missing Attribute
@@ -69,7 +69,7 @@
}
/**
- * Creates a new immutable <code>StdMissingAttributeDetail</code> with the given {@link com.att.research.xacml.api.Identifier}s for the XACML Category,
+ * Creates a new immutable <code>StdMissingAttributeDetail</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category,
* AttributeId, and DataType of the missing Attribute, and the given <code>String</code> Issuer.
*
* @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
@@ -82,7 +82,7 @@
}
/**
- * Creates a new immutable <code>StdMissingAttributeDetail</code> with the given {@link com.att.research.xacml.api.Identifier}s for the XACML Category,
+ * Creates a new immutable <code>StdMissingAttributeDetail</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category,
* AttributeId, and DataType of the missing Attribute.
*
* @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java
index 14b7a1f..1c2c9fa 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAdvice.java
@@ -28,21 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.util.ListUtil;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.util.ListUtil;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.Advice} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.Advice} interface.
*
*/
public class StdMutableAdvice implements Advice {
@@ -86,7 +86,7 @@
}
/**
- * Creates a copy of the given {@link com.att.research.xacml.api.Advice} as a new <code>StdMutableAdvice</code>.
+ * Creates a copy of the given {@link org.apache.openaz.xacml.api.Advice} as a new <code>StdMutableAdvice</code>.
*
* @param advice the <code>Advice</code> to copy
* @return a new <code>StdMutableAdvice</code> that is a copy of the given <code>Advice</code>
@@ -101,7 +101,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML AdviceId of the Advice represented by this <code>StdMutableAdvice</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML AdviceId of the Advice represented by this <code>StdMutableAdvice</code>.
*
* @param identifier the <code>Identifier</code> representing the XACML AdviceId of the Advice represented by this <code>StdMutableAdvice</code>.
*/
@@ -115,7 +115,7 @@
}
/**
- * Adds an {@link com.att.research.xacml.api.AttributeAssignment} to this <code>StdMutableAdvice</code>>
+ * Adds an {@link org.apache.openaz.xacml.api.AttributeAssignment} to this <code>StdMutableAdvice</code>>
*
* @param attributeAssignment the <code>AttributeAssignment</code> to add to this <code>StdMutableAdvice</code>>
*/
@@ -127,7 +127,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s to this <code>StdMutableAdvice</code>>
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeAssignment}s to this <code>StdMutableAdvice</code>>
*
* @param listAttributeAssignments the <code>Collection</code> of <code>AttributeAssignment</code>s to add to this <code>StdMutableAdvice</code>.
*/
@@ -141,7 +141,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.AttributeAssignment}s in this <code>StdMutableAdvice</code> to a copy of the
+ * Sets the {@link org.apache.openaz.xacml.api.AttributeAssignment}s in this <code>StdMutableAdvice</code> to a copy of the
* given <code>Collection</code>.
*
* @param listAttributeAssignments the <code>Collection</code> of <code>AttributeAssignment</code>s to set in this <code>StdMutableAdvice</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttribute.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttribute.java
index c986c93..90b8063 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttribute.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttribute.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
@@ -36,13 +36,13 @@
import java.util.Iterator;
import java.util.List;
-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.Identifier;
-import com.att.research.xacml.util.ListUtil;
-import com.att.research.xacml.util.ObjUtil;
+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.Identifier;
+import org.apache.openaz.xacml.util.ListUtil;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
* Mutable implementation of the {@link com.att.research.xacml.Attribute} interface.
@@ -122,7 +122,7 @@
}
/**
- * Creates a new <code>StdMutableAttribute</code> that is a copy of the given {@link com.att.research.xacml.api.Attribute}.
+ * Creates a new <code>StdMutableAttribute</code> that is a copy of the given {@link org.apache.openaz.xacml.api.Attribute}.
*
* @param attribute the <code>Attribute</code> to copy
* @return a new <code>StdMutableAttribute</code> that is a copy of the given <code>Attribute</code>.
@@ -137,7 +137,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML AttributeId of the Attribute represented by this <code>StdMutableAttribute</code>>
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML AttributeId of the Attribute represented by this <code>StdMutableAttribute</code>>
*
* @param identifier the <code>Identifier</code> representing the XACML AttributeId of the Attribute represented by this <code>StdMutableAttribute</code>.
*/
@@ -151,7 +151,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML Category of the Attribute represented by this <code>StdMutableAttribute</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML Category of the Attribute represented by this <code>StdMutableAttribute</code>.
*
* @param identifier the <code>Identifier</code> representing the XACML Category of the Attribute represented by this <code>StdMutableAttribute</code>.
*/
@@ -165,7 +165,7 @@
}
/**
- * Adds an {@link com.att.research.xacml.api.AttributeValue} to this <code>StdMutableAttribute</code>.
+ * Adds an {@link org.apache.openaz.xacml.api.AttributeValue} to this <code>StdMutableAttribute</code>.
*
* @param attributeValue the <code>AttributeValue</code> to add to this <code>StdMutableAttribute</code>.
*/
@@ -177,7 +177,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeValue}s to this <code>StdMutableAttribute</code>.
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeValue}s to this <code>StdMutableAttribute</code>.
*
* @param listAttributeValues the <code>Collection</code> of <code>AttributeValue</code>s to add to this <code>StdMutableAttribute</code>.
*/
@@ -191,7 +191,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.AttributeValue}s in this <code>StdMutableAttribute</code> to a copy of the given
+ * Sets the {@link org.apache.openaz.xacml.api.AttributeValue}s in this <code>StdMutableAttribute</code> to a copy of the given
* <code>Collection</code>.
*
* @param listAttributeValues the <code>Collection</code> of <code>AttributValue</code>s to set in this <code>StdMutableAttribute</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeAssignment.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeAssignment.java
index ae1d319..5edccb3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeAssignment.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeAssignment.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
-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.util.ObjUtil;
+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.util.ObjUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.AttributeAssignment} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.AttributeAssignment} interface.
*
*/
public class StdMutableAttributeAssignment implements AttributeAssignment {
@@ -53,8 +53,8 @@
}
/**
- * Creates a new <code>StdMutableAttributeAssignment</code> with the given {@link com.att.research.xacml.api.Identifier}s for the XACML Category and
- * AttributeId, the given <code>String</code> issuer, and the given {@link com.att.research.xacml.api.AttributeValue}.
+ * Creates a new <code>StdMutableAttributeAssignment</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category and
+ * AttributeId, the given <code>String</code> issuer, and the given {@link org.apache.openaz.xacml.api.AttributeValue}.
*
* @param categoryIn the <code>Identifier</code> for the XACML Category of the new <code>StdMutableAttributeAssignment</code>
* @param attributeIdIn the <code>Identifier</code> for the XACML AttributeId of the new <code>StdMutableAttributeAssignment</code>
@@ -79,7 +79,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.AttributeValue} representing the value to be assigned to the XACML AttributeId associated with
+ * Sets the {@link org.apache.openaz.xacml.api.AttributeValue} representing the value to be assigned to the XACML AttributeId associated with
* this <code>StdMutableAttributeAssignment</code>.
*
* @param attributeValueIn the <code>AttributeValue</code> representing the value to be assigned to the XACML AttributeId associated with this
@@ -95,7 +95,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML AttributeId to be assigned in this <code>StdMutableAttributeAssignment</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML AttributeId to be assigned in this <code>StdMutableAttributeAssignment</code>.
*
* @param identifier the <code>Identifier</code> representing the XACML AttributeId to be assigned in this <code>StdMutableAttributeAssignment</code>
*/
@@ -109,7 +109,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML Category of the AttributeId to be assigned in this
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML Category of the AttributeId to be assigned in this
* <code>StdMutableAttributeAssignment</code>.
*
* @param identifier the <code>Identifier</code> representing the XACML Category of the AttributeId to be assigned in this
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeCategory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeCategory.java
index 28fe921..ecbf207 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeCategory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableAttributeCategory.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
@@ -40,15 +40,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.util.ListUtil;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.util.ListUtil;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.AttributeCategory} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.AttributeCategory} interface.
*
*/
public class StdMutableAttributeCategory implements AttributeCategory {
@@ -60,8 +59,8 @@
private Map<Identifier,List<Attribute>> attributesById = new HashMap<Identifier,List<Attribute>>();
/**
- * Builds the <code>Map</code> from {@link com.att.research.xacml.api.Identifier}s for XACML AttributeIds to
- * {@link com.att.research.xacml.api.Attribute}s.
+ * Builds the <code>Map</code> from {@link org.apache.openaz.xacml.api.Identifier}s for XACML AttributeIds to
+ * {@link org.apache.openaz.xacml.api.Attribute}s.
*/
private void buildMap() {
for (Attribute attribute: this.attributes) {
@@ -82,8 +81,8 @@
}
/**
- * Creates a new <code>StdMutableAttributeCategory</code> with the given {@link com.att.research.xacml.api.Identifier} representing its
- * XACML Category, and the given <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s as its XACML Attributes.
+ * Creates a new <code>StdMutableAttributeCategory</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing its
+ * XACML Category, and the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s as its XACML Attributes.
* The <code>Collection</code> is copied; changes made to the <code>Collection</code> after creating the new <code>StdMutableAttributeCategory</code>
* are not reflected in the <code>StdMutableAttributeCategory</code>.
*
@@ -99,7 +98,7 @@
}
/**
- * Creates a new <code>StdMutableAttributeCategory</code> that is a copy of the given {@link com.att.research.xacml.api.AttributeCategory}.
+ * Creates a new <code>StdMutableAttributeCategory</code> that is a copy of the given {@link org.apache.openaz.xacml.api.AttributeCategory}.
*
* @param attributeCategory the <code>AttributeCategory</code> to copy
*/
@@ -115,7 +114,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML Category of this <code>StdMutableAttributeCategory</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML Category of this <code>StdMutableAttributeCategory</code>.
*
* @param identifierCategory the <code>Identifier</code> representing the XACML Category of this <code>StdMutableAttributeCategory</code>.
*/
@@ -129,7 +128,7 @@
}
/**
- * Adds a {@link com.att.research.xacml.api.Attribute} to this <code>StdMutableAttributeCategory</code>>
+ * Adds a {@link org.apache.openaz.xacml.api.Attribute} to this <code>StdMutableAttributeCategory</code>>
*
* @param attribute the <code>Attribute</code> to add
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableMissingAttributeDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableMissingAttributeDetail.java
index 7f5abc3..fef6500 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableMissingAttributeDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableMissingAttributeDetail.java
@@ -28,21 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-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.util.ListUtil;
-import com.att.research.xacml.util.ObjUtil;
+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.util.ListUtil;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.MissingAttributeDetail} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.MissingAttributeDetail} interface.
*
*/
public class StdMutableMissingAttributeDetail implements MissingAttributeDetail {
@@ -62,9 +62,9 @@
}
/**
- * Creates a new <code>StdMutableMissingAttributeDetail</code> with the given {@link com.att.research.xacml.api.Identifier}s for the XACML Category,
+ * Creates a new <code>StdMutableMissingAttributeDetail</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category,
* AttributeId, and DataType of the missing Attribute, and the given <code>String</code> Issuer. If not null, the <code>Collection</code> of
- * {@link com.att.research.xacml.api.AttributeValue}s is copied into the new <code>StdMutableMissingAttributeDetail</code>.
+ * {@link org.apache.openaz.xacml.api.AttributeValue}s is copied into the new <code>StdMutableMissingAttributeDetail</code>.
*
* @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
* @param attributeIdIn the <code>Identifier</code> representing the XACML AttributeId of the missing Attribute
@@ -86,7 +86,7 @@
}
/**
- * Creates a new <code>StdMutableMissingAttributeDetail</code> with the given {@link com.att.research.xacml.api.Identifier}s for the XACML Category,
+ * Creates a new <code>StdMutableMissingAttributeDetail</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category,
* AttributeId, and DataType of the missing Attribute, and the given <code>String</code> Issuer.
*
* @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
@@ -99,7 +99,7 @@
}
/**
- * Creates a new <code>StdMutableMissingAttributeDetail</code> with the given {@link com.att.research.xacml.api.Identifier}s for the XACML Category,
+ * Creates a new <code>StdMutableMissingAttributeDetail</code> with the given {@link org.apache.openaz.xacml.api.Identifier}s for the XACML Category,
* AttributeId, and DataType of the missing Attribute.
*
* @param categoryIn the <code>Identifier</code> representing the XACML Category of the missing Attribute
@@ -111,7 +111,7 @@
}
/**
- * Creates a new <code>StdMutableMissingAttributeDetail</code> that is a copy of the given {@link com.att.research.xacml.api.MissingAttributeDetail}.
+ * Creates a new <code>StdMutableMissingAttributeDetail</code> that is a copy of the given {@link org.apache.openaz.xacml.api.MissingAttributeDetail}.
*
* @param missingAttributeDetail the <code>MissingAttributeDetail</code> to copy
* @return a new <code>StdMutableMissingAttributeDetail</code> that is a copy of the given <code>MissingAttributeDetail</code>.
@@ -130,7 +130,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML Category of the MissingAttributeDetail.
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML Category of the MissingAttributeDetail.
*
* @param identifier the <code>Identifier</code> representing the XACML Category of the MissingAttributeDetail.
*/
@@ -144,7 +144,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML AttributeId of the MissingAttributeDetail.
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML AttributeId of the MissingAttributeDetail.
*
* @param identifier the <code>Identifier</code> representing the XACML AttributeId of the MissingAttributeDetail.
*/
@@ -158,7 +158,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML DataTypeId of the MissingAttributeDetail.
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML DataTypeId of the MissingAttributeDetail.
*
* @param identifier the <code>Identifier</code> representing the XACML AttributeId of the MissingAttributeDetail.
*/
@@ -181,7 +181,7 @@
}
/**
- * Adds an {@link com.att.research.xacml.api.AttributeValue} to this <code>StdMutableMissingAttributeDetail</code>.
+ * Adds an {@link org.apache.openaz.xacml.api.AttributeValue} to this <code>StdMutableMissingAttributeDetail</code>.
*
* @param attributeValue the <code>AttributeValue</code> to add to this <code>StdMutableMissingAttributeDetail</code>.
*/
@@ -193,7 +193,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeValue}s to this <code>StdMutableMissingAttributeDetail</code>.
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeValue}s to this <code>StdMutableMissingAttributeDetail</code>.
*
* @param attributeValuesIn the <code>Collection</code> of <code>AttributeValue</code>s to add to this <code>StdMutableMissingAttributeDetail</code>.
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableObligation.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableObligation.java
index 2e9b4f0..2a91a4c 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableObligation.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableObligation.java
@@ -28,21 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.util.ListUtil;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.util.ListUtil;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.Obligation} interface for XACML Obligation elements.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.Obligation} interface for XACML Obligation elements.
*
*/
public class StdMutableObligation implements Obligation {
@@ -59,8 +59,8 @@
}
/**
- * Creates a new <code>StdMutableObligation</code> with the given {@link com.att.research.xacml.api.Identifier} representing the XACML ObligationId
- * and the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s representing the XACML AttributeAssignments for
+ * Creates a new <code>StdMutableObligation</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the XACML ObligationId
+ * and the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeAssignment}s representing the XACML AttributeAssignments for
* the Obligation.
*
* @param idIn the <code>Identifier</code> representing the XACML ObligationId
@@ -77,7 +77,7 @@
}
/**
- * Creates a new <code>StdMutableObligation</code> with the given {@link com.att.research.xacml.api.Identifier} representing the XACML ObligationId.
+ * Creates a new <code>StdMutableObligation</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the XACML ObligationId.
*
* @param idIn the <code>Identifier</code> representing the XACML ObligationId
*/
@@ -91,7 +91,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Identifier} representing the XACML ObligationId for the Obligation represented by this
+ * Sets the {@link org.apache.openaz.xacml.api.Identifier} representing the XACML ObligationId for the Obligation represented by this
* <code>StdMutableObligation</code>.
*
* @param identifier the <code>Identifier</code> representing the XACML ObligationId for the Obligation represented by this
@@ -119,7 +119,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s to this
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeAssignment}s to this
* <code>StdMutableObligation</code>.
*
* @param attributeAssignmentsIn the <code>Collection</code> of <code>AttributeAssignment</code>s to add to this <code>StdMutableObligation</code>.
@@ -130,7 +130,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.AttributeAssignment}s in this <code>StdMutableObligation</code> to a copy of the
+ * Sets the {@link org.apache.openaz.xacml.api.AttributeAssignment}s in this <code>StdMutableObligation</code> to a copy of the
* given <code>Collection</code>.
*
* @param attributeAssignmentsIn the <code>Collection</code> of <code>AttributeAssignment</code>s to set in this <code>StdMutableObligation</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java
index a58572e..84d217b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
@@ -37,20 +37,20 @@
import java.util.Iterator;
import java.util.List;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.AttributeValue;
-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.RequestDefaults;
-import com.att.research.xacml.api.RequestReference;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.util.ListUtil;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.AttributeValue;
+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.RequestDefaults;
+import org.apache.openaz.xacml.api.RequestReference;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.util.ListUtil;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.Request} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.Request} interface.
*
*/
public class StdMutableRequest implements Request {
@@ -71,12 +71,12 @@
/**
* Creates a new <code>StdMutableRequest</code> with the given parameters.
*
- * @param statusIn the {@link com.att.research.xacml.api.Status} of the <code>StdMutableRequest</code> representing its validity
- * @param requestDefaultsIn the {@link com.att.research.xacml.api.RequestDefaults} representing the XACML RequestDefaults
+ * @param statusIn the {@link org.apache.openaz.xacml.api.Status} of the <code>StdMutableRequest</code> representing its validity
+ * @param requestDefaultsIn the {@link org.apache.openaz.xacml.api.RequestDefaults} representing the XACML RequestDefaults
* @param returnPolicyIdListIn a boolean indicating whether XACML PolicyId and PolicySetIds should be returned with the Results
* @param combinedDecisionIn a boolean indicating whether multiple Decision Request Results should be combined into a single Result
- * @param listRequestAttributes a <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} defining the parameters of the Request
- * @param listRequestReferences a <code>Collection</code> of {@link com.att.research.xacml.api.RequestReference}s for multiple decision requests
+ * @param listRequestAttributes a <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestAttributes} defining the parameters of the Request
+ * @param listRequestReferences a <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestReference}s for multiple decision requests
*/
public StdMutableRequest(Status statusIn,
RequestDefaults requestDefaultsIn,
@@ -105,14 +105,14 @@
}
/**
- * Creates a new <code>StdMutableRequest</code> with a default {@link com.att.research.xacml.api.Status} and the given parameters. The default <code>Status</code>
+ * Creates a new <code>StdMutableRequest</code> with a default {@link org.apache.openaz.xacml.api.Status} and the given parameters. The default <code>Status</code>
* represents a XACML OK Status.
*
- * @param requestDefaultsIn the {@link com.att.research.xacml.api.RequestDefaults} representing the XACML RequestDefaults
+ * @param requestDefaultsIn the {@link org.apache.openaz.xacml.api.RequestDefaults} representing the XACML RequestDefaults
* @param returnPolicyIdListIn a boolean indicating whether XACML PolicyId and PolicySetIds should be returned with the Results
* @param combinedDecisionIn a boolean indicating whether multiple Decision Request Results should be combined into a single Result
- * @param listRequestAttributes a <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} defining the parameters of the Request
- * @param listRequestReferences a <code>Collection</code> of {@link com.att.research.xacml.api.RequestReference}s for multiple decision requests
+ * @param listRequestAttributes a <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestAttributes} defining the parameters of the Request
+ * @param listRequestReferences a <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestReference}s for multiple decision requests
*/
public StdMutableRequest(RequestDefaults requestDefaultsIn,
boolean returnPolicyIdListIn,
@@ -123,7 +123,7 @@
}
/**
- * Creates a new <code>StdMutableRequest</code> that is a copy of the given {@link com.att.research.xacml.api.Request}.
+ * Creates a new <code>StdMutableRequest</code> that is a copy of the given {@link org.apache.openaz.xacml.api.Request}.
*
* @param request the <code>Request</code> to copy
*/
@@ -145,7 +145,7 @@
}
/**
- * Creates a new <code>StdMutableRequest</code> with the given {@link com.att.research.xacml.api.Status} representing its validity and
+ * Creates a new <code>StdMutableRequest</code> with the given {@link org.apache.openaz.xacml.api.Status} representing its validity and
* defaults for all other attributes.
*
* @param statusIn the <code>Status</code> for the new <code>StdMutableRequest</code>
@@ -160,7 +160,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.RequestDefaults} interface for this <code>PEPRequest</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.RequestDefaults} interface for this <code>PEPRequest</code>.
*
* @param requestDefaultsIn the <code>RequestDefaults</code> to use for this <code>PEPRequest</code>.
*/
@@ -213,7 +213,7 @@
}
/**
- * Adds a {@link com.att.research.xacml.api.RequestAttributes} to the <code>RequestAttributes</code> in this <code>StdMutableRequest</code>>
+ * Adds a {@link org.apache.openaz.xacml.api.RequestAttributes} to the <code>RequestAttributes</code> in this <code>StdMutableRequest</code>>
*
* @param requestAttributesNew the <code>RequestAttributes</code> to add to this <code>StdMutableRequest</code>
* @throws NullPointerException if <code>requestAttributesNew</code> is null or if <code>requestAttributesNew.getCategory()</code> is null
@@ -262,7 +262,7 @@
}
/**
- * Adds a {@link com.att.research.xacml.api.RequestReference} to the <code>RequestReference</code>s in this <code>StdMutableRequest</code>.
+ * Adds a {@link org.apache.openaz.xacml.api.RequestReference} to the <code>RequestReference</code>s in this <code>StdMutableRequest</code>.
*
* @param requestReference the <code>RequestReference</code> to add
*/
@@ -384,7 +384,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Status} indicating the validity of this <code>StdMutableRequest</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.Status} indicating the validity of this <code>StdMutableRequest</code>.
*
* @param statusIn the <code>Status</code> for this <code>StdMutableRequest</code>.
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequestAttributes.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequestAttributes.java
index 0711323..f7290c3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequestAttributes.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequestAttributes.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
@@ -36,16 +36,15 @@
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathExpressionException;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.RequestAttributes;
+import org.apache.openaz.xacml.util.ObjUtil;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.RequestAttributes;
-import com.att.research.xacml.util.ObjUtil;
-
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.RequestAttributes} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.RequestAttributes} interface.
*
*/
public class StdMutableRequestAttributes extends StdMutableAttributeCategory implements RequestAttributes {
@@ -60,8 +59,8 @@
}
/**
- * Creates a new <code>StdMutableRequestAttributes</code> with the given {@link com.att.research.xacml.api.Identifier} representing its XACML Category,
- * the given <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s, the given {@link org.w3c.dom.Node} representing the XACML Content element
+ * Creates a new <code>StdMutableRequestAttributes</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing its XACML Category,
+ * the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s, the given {@link org.w3c.dom.Node} representing the XACML Content element
* and the given <code>String</code> as the optional xml:Id.
*
* @param identifierCategory the <code>Identifier</code> representing the XACML Category for the new <code>StdMutableRequestAttributes</code>
@@ -76,7 +75,7 @@
}
/**
- * Creates a new <code>StdMutableRequestAttributes</code> by copying the given {@link com.att.research.xacml.api.RequestAttributes}.
+ * Creates a new <code>StdMutableRequestAttributes</code> by copying the given {@link org.apache.openaz.xacml.api.RequestAttributes}.
*
* @param requestAttributes the <code>RequestAttributes</code> to copy
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequestReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequestReference.java
index 967db58..2437c3e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequestReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequestReference.java
@@ -28,19 +28,19 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import com.att.research.xacml.api.RequestAttributesReference;
-import com.att.research.xacml.api.RequestReference;
-import com.att.research.xacml.util.ListUtil;
+import org.apache.openaz.xacml.api.RequestAttributesReference;
+import org.apache.openaz.xacml.api.RequestReference;
+import org.apache.openaz.xacml.util.ListUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.RequestReference} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.RequestReference} interface.
*
*/
public class StdMutableRequestReference implements RequestReference {
@@ -48,7 +48,7 @@
private List<RequestAttributesReference> requestAttributesReferences = EMPTY_LIST;
/**
- * Creates a new <code>StdMutableRequestReference</code> with no {@link com.att.research.xacml.api.RequestAttributesReference}s.
+ * Creates a new <code>StdMutableRequestReference</code> with no {@link org.apache.openaz.xacml.api.RequestAttributesReference}s.
*/
public StdMutableRequestReference() {
}
@@ -66,7 +66,7 @@
}
/**
- * Adds a {@link com.att.research.xacml.api.RequestAttributesReference} to this <code>StdMutableRequestReference</code>>
+ * Adds a {@link org.apache.openaz.xacml.api.RequestAttributesReference} to this <code>StdMutableRequestReference</code>>
*
* @param requestAttributesReference the <code>RequestAttributesReference</code> to add
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableResponse.java
index 7101f1c..ac48e88 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableResponse.java
@@ -28,20 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-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.util.ListUtil;
+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.util.ListUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.Response} interface.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.Response} interface.
*
*/
public class StdMutableResponse implements Response {
@@ -50,14 +50,14 @@
private List<Result> results;
/**
- * Creates a new <code>StdMutableResponse</code> with no {@link com.att.research.xacml.api.Result}s.
+ * Creates a new <code>StdMutableResponse</code> with no {@link org.apache.openaz.xacml.api.Result}s.
*/
public StdMutableResponse() {
this.results = EMPTY_LIST;
}
/**
- * Creates a new <code>StdMutableResponse</code> with a single {@link com.att.research.xacml.api.Result}.
+ * Creates a new <code>StdMutableResponse</code> with a single {@link org.apache.openaz.xacml.api.Result}.
*
* @param resultIn the <code>Result</code> for the new <code>StdMutableResponse</code>.
*/
@@ -71,7 +71,7 @@
}
/**
- * Creates a new <code>StdMutableResponse</code> with a copy of the {@link com.att.research.xacml.api.Result}s in
+ * Creates a new <code>StdMutableResponse</code> with a copy of the {@link org.apache.openaz.xacml.api.Result}s in
* the given <code>Collection</code>>
*
* @param listResults the <code>Collection</code> of <code>Result</code>s for the new <code>StdMutableResponse</code>
@@ -86,7 +86,7 @@
}
/**
- * Creates a new <code>StdMutableResponse</code> that is a copy of the given {@link com.att.research.xacml.api.Response}.
+ * Creates a new <code>StdMutableResponse</code> that is a copy of the given {@link org.apache.openaz.xacml.api.Response}.
*
* @param copy the <code>Response</code> to copy
*/
@@ -95,8 +95,8 @@
}
/**
- * Creates a new <code>StdMutableResponse</code> with a single {@link com.att.research.xacml.api.Result} defined
- * by the given {@link com.att.research.xacml.api.Status}.
+ * Creates a new <code>StdMutableResponse</code> with a single {@link org.apache.openaz.xacml.api.Result} defined
+ * by the given {@link org.apache.openaz.xacml.api.Status}.
*
* @param status the <code>Status</code> of the <code>Result</code> for the new <code>StdMutableResponse</code>.
*/
@@ -110,7 +110,7 @@
}
/**
- * Adds a {@link com.att.research.xacml.api.Result} to this <code>StdMutableResponse</code>>
+ * Adds a {@link org.apache.openaz.xacml.api.Result} to this <code>StdMutableResponse</code>>
*
* @param result the <code>Result</code> to add
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableResult.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableResult.java
index 1f1c16f..249fd7d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableResult.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableResult.java
@@ -28,25 +28,25 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-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.Result;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.util.ListUtil;
-import com.att.research.xacml.util.ObjUtil;
+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.Result;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.util.ListUtil;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.Result}
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.Result}
*
*/
public class StdMutableResult implements Result {
@@ -84,7 +84,7 @@
}
/**
- * Creates a new <code>StdMutableResult</code> with the given {@link com.att.research.xacml.api.Decision} and {@link com.att.research.xacml.api.Status}.
+ * Creates a new <code>StdMutableResult</code> with the given {@link org.apache.openaz.xacml.api.Decision} and {@link org.apache.openaz.xacml.api.Status}.
*
* @param decisionIn the <code>Decision</code> for the new <code>StdMutableResult</code>
* @param statusIn the <code>Status</code> for the new <code>StdMutableResult</code>
@@ -96,8 +96,8 @@
}
/**
- * Creates a new <code>StdMutableResult</code> with a {@link com.att.research.xacml.api.Decision} of <code>INDETERMINATE</code> and
- * the given {@link com.att.research.xacml.api.Status}.
+ * Creates a new <code>StdMutableResult</code> with a {@link org.apache.openaz.xacml.api.Decision} of <code>INDETERMINATE</code> and
+ * the given {@link org.apache.openaz.xacml.api.Status}.
*
* @param statusIn the <code>Status</code> for the new <code>StdMutableResult</code>
*/
@@ -106,7 +106,7 @@
}
/**
- * Creates a new <code>StdMutableResult</code> with the given {@link com.att.research.xacml.api.Decision} and a {@link com.att.research.xacml.api.Status}
+ * Creates a new <code>StdMutableResult</code> with the given {@link org.apache.openaz.xacml.api.Decision} and a {@link org.apache.openaz.xacml.api.Status}
* of OK.
*
* @param decisionIn the <code>Decision</code> for the new <code>StdMutableResult</code>
@@ -116,15 +116,15 @@
}
/**
- * Creates a new <code>StdMutableResult</code> with the given {@link com.att.research.xacml.api.Decision} and the given set of <code>Collection</code>s
+ * Creates a new <code>StdMutableResult</code> with the given {@link org.apache.openaz.xacml.api.Decision} and the given set of <code>Collection</code>s
* with the details of the result.
*
* @param decisionIn the <code>Decision</code> for the new <code>StdMutableResult</code>
- * @param obligationsIn a <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s for the new <code>StdMutableResult</code>
- * @param adviceIn a <code>Collection</code> of {@link com.att.research.xacml.api.Advice} objects for the new <code>StdMutableResult</code>
- * @param attributesIn a <code>Collection</code> of {@link com.att.research.xacml.api.AttributeCategory} objects for the new <code>StdMutableResult</code>
- * @param policyIdentifiersIn a <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects for the Policy identifiers
- * @param policySetIdentifiersIn a <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects for the PolicySet identifiers
+ * @param obligationsIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.Obligation}s for the new <code>StdMutableResult</code>
+ * @param adviceIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.Advice} objects for the new <code>StdMutableResult</code>
+ * @param attributesIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeCategory} objects for the new <code>StdMutableResult</code>
+ * @param policyIdentifiersIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects for the Policy identifiers
+ * @param policySetIdentifiersIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects for the PolicySet identifiers
*/
public StdMutableResult(Decision decisionIn,
Collection<Obligation> obligationsIn,
@@ -146,7 +146,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Decision} for this <code>StdMutableResult</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.Decision} for this <code>StdMutableResult</code>.
*
* @param decisionIn the <code>Decision</code> for this <code>StdMutableResult</code>.
*/
@@ -160,7 +160,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Status} for this <code>StdMutableResult</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.Status} for this <code>StdMutableResult</code>.
*
* @param statusIn the <code>Status</code> for this <code>StdMutableResult</code>.
*/
@@ -174,7 +174,7 @@
}
/**
- * Adds an {@link com.att.research.xacml.api.Obligation} to this <code>StdMutableResult</code>.
+ * Adds an {@link org.apache.openaz.xacml.api.Obligation} to this <code>StdMutableResult</code>.
*
* @param obligation the <code>Obligation</code> to add to this <code>StdMutableResult</code>.
*/
@@ -186,7 +186,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s to this <code>StdMutableResult</code>.
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.Obligation}s to this <code>StdMutableResult</code>.
*
* @param obligationsIn the <code>Collection</code> of <code>Obligation</code>s to add
*/
@@ -200,7 +200,7 @@
}
/**
- * Clears any existing {@link com.att.research.xacml.api.Obligation}s from this <code>StdMutableResult</code> and adds
+ * Clears any existing {@link org.apache.openaz.xacml.api.Obligation}s from this <code>StdMutableResult</code> and adds
* the given <code>Collection</code> of <code>Obligation</code>s.
*
* @param obligationsIn the <code>Collection</code> of <code>Obligation</code>s to set in this <code>StdMutableResult</code>.
@@ -216,7 +216,7 @@
}
/**
- * Adds an {@link com.att.research.xacml.api.Advice} to this <code>StdMutableResult</code>.
+ * Adds an {@link org.apache.openaz.xacml.api.Advice} to this <code>StdMutableResult</code>.
*
* @param advice the <code>Advice</code> to add to this <code>StdMutableResult</code>
*/
@@ -228,7 +228,7 @@
}
/**
- * Adds a copy of the {@link com.att.research.xacml.api.Advice} objects in the given <code>Collection</code> to this <code>StdMutableResult</code>>
+ * Adds a copy of the {@link org.apache.openaz.xacml.api.Advice} objects in the given <code>Collection</code> to this <code>StdMutableResult</code>>
*
* @param adviceIn the <code>Collection</code> of <code>Advice</code> objects to add to this <code>StdMutableResult</code>.
*/
@@ -242,7 +242,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Advice} objects in this <code>StdMutableResult</code> to a copy of the given <code>Collection</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.Advice} objects in this <code>StdMutableResult</code> to a copy of the given <code>Collection</code>.
*
* @param adviceIn the <code>Collection</code> of <code>Advice</code> objects to set in this <code>StdMutableResult</code>.
*/
@@ -257,7 +257,7 @@
}
/**
- * Adds an {@link com.att.research.xacml.api.Attribute} to this <code>StdMutableResult</code>.
+ * Adds an {@link org.apache.openaz.xacml.api.Attribute} to this <code>StdMutableResult</code>.
*
* @param attribute the <code>Attribute</code> to add to this <code>StdMutableResult</code>.
*/
@@ -269,7 +269,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeCategory}s to this <code>StdMutableResult</code>.
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeCategory}s to this <code>StdMutableResult</code>.
*
* @param listAttributeCategories the <code>Collection</code> of <code>AttributeCategory</code>s to add to this <code>StdMutableResult</code>.
*/
@@ -283,7 +283,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.AttributeCategory}s in this <code>StdMutableResult</code> to be a copy of the given
+ * Sets the {@link org.apache.openaz.xacml.api.AttributeCategory}s in this <code>StdMutableResult</code> to be a copy of the given
* <code>Collection</code> or to an empty list if the <code>Collection</code> is null.
*
* @param listAttributeCategories the <code>Collection</code> of <code>AttributeCategory</code>s to set in this <code>StdMutableResult</code>
@@ -299,7 +299,7 @@
}
/**
- * Adds an {@link com.att.research.xacml.api.IdReference} as a XACML Policy ID to this <code>StdMutableResult</code>.
+ * Adds an {@link org.apache.openaz.xacml.api.IdReference} as a XACML Policy ID to this <code>StdMutableResult</code>.
*
* @param policyIdentifier the <code>Identifier</code> of the Policy to add to this <code>StdMutableResult</code>.
*/
@@ -311,7 +311,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.IdReference}s representing PolicyIds to this <code>StdMutableResult</code>.
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference}s representing PolicyIds to this <code>StdMutableResult</code>.
*
* @param policyIdentifierList the <code>Collection</code> of <code>IdReference</code> to add
*/
@@ -325,7 +325,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.IdReference}s representing PolicyIds in this <code>StdMutableResult</code> to a copy of the given
+ * Sets the {@link org.apache.openaz.xacml.api.IdReference}s representing PolicyIds in this <code>StdMutableResult</code> to a copy of the given
* <code>Collection</code>.
*
* @param policyIdentifierList the <code>Collection</code> of <code>IdReference</code>s representing PolicyIds to set in this <code>StdMutableResult</code>
@@ -341,7 +341,7 @@
}
/**
- * Adds an {@link com.att.research.xacml.api.IdReference} as a XACML Policy ID to this <code>StdMutableResult</code>.
+ * Adds an {@link org.apache.openaz.xacml.api.IdReference} as a XACML Policy ID to this <code>StdMutableResult</code>.
*
* @param policyIdentifier the <code>Identifier</code> of the Policy to add to this <code>StdMutableResult</code>.
*/
@@ -353,7 +353,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.IdReference}s representing PolicySetIds to this <code>StdMutableResult</code>.
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference}s representing PolicySetIds to this <code>StdMutableResult</code>.
*
* @param policyIdentifierList the <code>Collection</code> of <code>IdReference</code> to add
*/
@@ -367,7 +367,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.IdReference}s representing PolicySetIds in this <code>StdMutableResult</code> to a copy of the given
+ * Sets the {@link org.apache.openaz.xacml.api.IdReference}s representing PolicySetIds in this <code>StdMutableResult</code> to a copy of the given
* <code>Collection</code>.
*
* @param policyIdentifierList the <code>Collection</code> of <code>IdReference</code>s representing PolicySetIds to set in this <code>StdMutableResult</code>
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableStatus.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableStatus.java
index 6c60982..6af1185 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableStatus.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableStatus.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
-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.util.ObjUtil;
+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.util.ObjUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.Status} interface to represent a XACML Status element.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.Status} interface to represent a XACML Status element.
*
*/
public class StdMutableStatus implements Status {
@@ -45,8 +45,8 @@
private StatusDetail statusDetail;
/**
- * Creates a new <code>StdMutableStatus</code> with the given {@link com.att.research.xacml.api.StatusCode}, <code>String</code> status message,
- * and {@link com.att.research.xacml.api.StatusDetail}.
+ * Creates a new <code>StdMutableStatus</code> with the given {@link org.apache.openaz.xacml.api.StatusCode}, <code>String</code> status message,
+ * and {@link org.apache.openaz.xacml.api.StatusDetail}.
*
* @param statusCodeIn the <code>StatusCode</code> representing the XACML StatusCode.
* @param statusMessageIn the <code>String</code> representing the XACML StatusMessage
@@ -59,8 +59,8 @@
}
/**
- * Creates a new <code>StdMutableStatus</code> with the given {@link com.att.research.xacml.api.StatusCode}, <code>String</code> status message
- * and no {@link com.att.research.xacml.api.StatusDetail}.
+ * Creates a new <code>StdMutableStatus</code> with the given {@link org.apache.openaz.xacml.api.StatusCode}, <code>String</code> status message
+ * and no {@link org.apache.openaz.xacml.api.StatusDetail}.
*
* @param statusCodeIn the <code>StatusCode</code> representing the XACML StatusCode.
* @param statusMessageIn the <code>String</code> representing the XACML StatusMessage
@@ -70,8 +70,8 @@
}
/**
- * Creates a new <code>StdMutableStatus</code> with the given {@link com.att.research.xacml.api.StatusCode}, a null status message
- * and no {@link com.att.research.xacml.api.StatusDetail}.
+ * Creates a new <code>StdMutableStatus</code> with the given {@link org.apache.openaz.xacml.api.StatusCode}, a null status message
+ * and no {@link org.apache.openaz.xacml.api.StatusDetail}.
*
* @param statusCodeIn the <code>StatusCode</code> representing the XACML StatusCode.
*/
@@ -86,7 +86,7 @@
}
/**
- * Creates a new <code>StdMutableStatus</code> that is a copy of the given {@link com.att.research.xacml.api.Status}.
+ * Creates a new <code>StdMutableStatus</code> that is a copy of the given {@link org.apache.openaz.xacml.api.Status}.
*
* @param status the <code>Status</code> to copy
* @return a new <code>StdMutableStatus</code> that is a copy of the given <code>Status</code>.
@@ -101,7 +101,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.StatusCode} representing the XACML StatusCode for the Status represented by this <code>StdMutableStatus</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.StatusCode} representing the XACML StatusCode for the Status represented by this <code>StdMutableStatus</code>.
*
* @param statusCodeIn the <code>StatusCode</code> representing the XACML StatusCode for the Status
*/
@@ -129,7 +129,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.StatusDetail} representing the XACML StatusDetail for the Status represented by this <code>StdMutableStatus</code>.
+ * Sets the {@link org.apache.openaz.xacml.api.StatusDetail} representing the XACML StatusDetail for the Status represented by this <code>StdMutableStatus</code>.
*
* @param statusDetailIn the <code>StatusDetail</code> representing the XACML StatusDetail for the Status
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableStatusDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableStatusDetail.java
index 1a46026..b53f5e1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableStatusDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableStatusDetail.java
@@ -28,19 +28,19 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import com.att.research.xacml.api.MissingAttributeDetail;
-import com.att.research.xacml.api.StatusDetail;
-import com.att.research.xacml.util.ListUtil;
+import org.apache.openaz.xacml.api.MissingAttributeDetail;
+import org.apache.openaz.xacml.api.StatusDetail;
+import org.apache.openaz.xacml.util.ListUtil;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.StatusDetail} interface to implement the XACML StatusDetail element.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.StatusDetail} interface to implement the XACML StatusDetail element.
*
*/
public class StdMutableStatusDetail implements StatusDetail {
@@ -56,7 +56,7 @@
}
/**
- * Creates a new <code>StdMutableStatusDetail</code> with a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.MissingAttributeDetail}s.
+ * Creates a new <code>StdMutableStatusDetail</code> with a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.MissingAttributeDetail}s.
*
* @param missingAttributeDetailsIn the <code>Collection</code> of <code>MissingAttributeDetail</code>s to copy
*/
@@ -66,7 +66,7 @@
}
/**
- * Creates a new <code>StdMutableStatusDetail</code> with the given single {@link com.att.research.xacml.api.MissingAttributeDetail}.
+ * Creates a new <code>StdMutableStatusDetail</code> with the given single {@link org.apache.openaz.xacml.api.MissingAttributeDetail}.
*
* @param missingAttributeDetail the <code>MissingAttributeDetail</code> for the new <code>StdMutableStatusDetail</code>.
*/
@@ -76,7 +76,7 @@
}
/**
- * Creates a new <code>StdMutableStatusDetail</code> that is a copy of the given {@link com.att.research.xacml.api.StatusDetail}.
+ * Creates a new <code>StdMutableStatusDetail</code> that is a copy of the given {@link org.apache.openaz.xacml.api.StatusDetail}.
*
* @param statusDetail the <code>StatusDetail</code> to copy
* @return a new <code>StdMutableStatusDetail</code> that is a copy of the given <code>StatusDetail</code>.
@@ -91,7 +91,7 @@
}
/**
- * Adds a {@link com.att.research.xacml.api.MissingAttributeDetail} to this <code>StdMutableStatusDetail</code>.
+ * Adds a {@link org.apache.openaz.xacml.api.MissingAttributeDetail} to this <code>StdMutableStatusDetail</code>.
*
* @param missingAttributeDetail the <code>MissingAttributeDetail</code> to add to this <code>StdMutableStatusDetail</code>.
*/
@@ -103,7 +103,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.MissingAttributeDetail}s to this <code>StdMutableStatusDetail</code>.
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.MissingAttributeDetail}s to this <code>StdMutableStatusDetail</code>.
*
* @param missingAttributeDetailsIn the <code>Collection</code> of <code>MissingAttributeDetail</code>s to add to this <code>StdMutableStatusDetail</code>.
*/
@@ -117,7 +117,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.MissingAttributeDetail}s for this <code>StdMutableStatusDetail</code> to a copy of the given
+ * Sets the {@link org.apache.openaz.xacml.api.MissingAttributeDetail}s for this <code>StdMutableStatusDetail</code> to a copy of the given
* <code>Collection</code>.
*
* @param missingAttributeDetailsIn the <code>Collection</code> of <code>MissingAttributeDetail</code>s to set in this <code>StdMutableStatusDetail</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdObligation.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdObligation.java
index 92f5732..3a17bf2 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdObligation.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdObligation.java
@@ -28,22 +28,22 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.util.Wrapper;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.Obligation} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.Obligation} interface.
*
*/
public class StdObligation extends Wrapper<Obligation> implements Obligation {
/**
- * Creates a new immutable <code>StdObligation</code> that wraps the given {@link com.att.research.xacml.api.Obligation}.
+ * Creates a new immutable <code>StdObligation</code> that wraps the given {@link org.apache.openaz.xacml.api.Obligation}.
* The caller agrees not o modify the given <code>Obligation</code> as long as the new <code>StdObligation,</code> refers to it.
*
* @param obligation the <code>Obligation</code> to wrap in the new <code>StdObligation</code>.
@@ -53,7 +53,7 @@
}
/**
- * Creates a new immutable <code>StdObligation</code> with the given {@link com.att.research.xacml.api.Identifier} representing the XACML
+ * Creates a new immutable <code>StdObligation</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the XACML
* ObligationId of the Obligation represented by the new <code>StdObligation</code>.
*
* @param identifier the <code>Identifier</code> representing the XACML ObligationId of the Obligation
@@ -63,8 +63,8 @@
}
/**
- * Creates a new immutable <code>StdObligation</code> with the given {@link com.att.research.xacml.api.Identifier} representing the XACML
- * ObligationId and a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s representing the
+ * Creates a new immutable <code>StdObligation</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the XACML
+ * ObligationId and a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeAssignment}s representing the
* AttributeAssignment elements of the Obligation represented by the new <code>StdObligation</code>.
*
* @param identifier the <code>Identifier</code> representing the XACML ObligationId of the Obligation
@@ -75,7 +75,7 @@
}
/**
- * Creates a new <code>StdObligation</code> as a copy of the given {@link com.att.research.xacml.api.Obligation}.
+ * Creates a new <code>StdObligation</code> as a copy of the given {@link org.apache.openaz.xacml.api.Obligation}.
*
* @param obligation the <code>Obligation</code> to copy
* @return a new <code>StdObligation</code> copied from the given <code>Obligation</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequest.java
index 4c807f3..a4b7bd4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequest.java
@@ -28,27 +28,27 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
import java.util.Iterator;
-import com.att.research.xacml.api.AttributeCategory;
-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.RequestDefaults;
-import com.att.research.xacml.api.RequestReference;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.util.Wrapper;
+import org.apache.openaz.xacml.api.AttributeCategory;
+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.RequestDefaults;
+import org.apache.openaz.xacml.api.RequestReference;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.Request} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.Request} interface.
*
*/
public class StdRequest extends Wrapper<Request> implements Request {
/**
- * Creates a new <code>StdRequest</code> that is a copy of the given {@link com.att.research.xacml.api.Request}.
+ * Creates a new <code>StdRequest</code> that is a copy of the given {@link org.apache.openaz.xacml.api.Request}.
*
* @param request the <code>Request</code> to copy
*/
@@ -59,12 +59,12 @@
/**
* Creates a new <code>StdMutableRequest</code> with the given parameters.
*
- * @param statusIn the {@link com.att.research.xacml.api.Status} of the <code>StdMutableRequest</code> representing its validity
- * @param requestDefaultsIn the {@link com.att.research.xacml.api.RequestDefaults} representing the XACML RequestDefaults
+ * @param statusIn the {@link org.apache.openaz.xacml.api.Status} of the <code>StdMutableRequest</code> representing its validity
+ * @param requestDefaultsIn the {@link org.apache.openaz.xacml.api.RequestDefaults} representing the XACML RequestDefaults
* @param returnPolicyIdListIn a boolean indicating whether XACML PolicyId and PolicySetIds should be returned with the Results
* @param combinedDecisionIn a boolean indicating whether multiple Decision Request Results should be combined into a single Result
- * @param listRequestAttributes a <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} defining the parameters of the Request
- * @param listRequestReferences a <code>Collection</code> of {@link com.att.research.xacml.api.RequestReference}s for multiple decision requests
+ * @param listRequestAttributes a <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestAttributes} defining the parameters of the Request
+ * @param listRequestReferences a <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestReference}s for multiple decision requests
*/
public StdRequest(Status statusIn,
RequestDefaults requestDefaultsIn,
@@ -78,11 +78,11 @@
/**
* Creates a new <code>StdMutableRequest</code> with the given parameters and a default {@link com.att.research.xacmo.api.Status} of OK.
*
- * @param requestDefaultsIn the {@link com.att.research.xacml.api.RequestDefaults} representing the XACML RequestDefaults
+ * @param requestDefaultsIn the {@link org.apache.openaz.xacml.api.RequestDefaults} representing the XACML RequestDefaults
* @param returnPolicyIdListIn a boolean indicating whether XACML PolicyId and PolicySetIds should be returned with the Results
* @param combinedDecisionIn a boolean indicating whether multiple Decision Request Results should be combined into a single Result
- * @param listRequestAttributes a <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} defining the parameters of the Request
- * @param listRequestReferences a <code>Collection</code> of {@link com.att.research.xacml.api.RequestReference}s for multiple decision requests
+ * @param listRequestAttributes a <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestAttributes} defining the parameters of the Request
+ * @param listRequestReferences a <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestReference}s for multiple decision requests
*/
public StdRequest(RequestDefaults requestDefaultsIn,
boolean returnPolicyIdListIn,
@@ -93,7 +93,7 @@
}
/**
- * Creates a new <code>StdRequest</code> with the given {@link com.att.research.xacml.api.Status} and defaults for all other attributes.
+ * Creates a new <code>StdRequest</code> with the given {@link org.apache.openaz.xacml.api.Status} and defaults for all other attributes.
*
* @param statusIn the <code>Status</code> for the new <code>StdRequest</code>.
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestAttributes.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestAttributes.java
index 42e9701..e46533a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestAttributes.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestAttributes.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
@@ -38,16 +38,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.RequestAttributes;
+import org.apache.openaz.xacml.util.ObjUtil;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.RequestAttributes;
-import com.att.research.xacml.util.ObjUtil;
-
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.RequestAttributes} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.RequestAttributes} interface.
*
*/
public class StdRequestAttributes extends StdAttributeCategory implements RequestAttributes {
@@ -57,8 +56,8 @@
private String xmlId;
/**
- * Creates a new <code>StdRequestAttributes</code> with the given {@link com.att.research.xacml.api.Identifier} representing its XACML Category,
- * the given <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s, the given {@link org.w3c.dom.Node} representing the XACML Content element
+ * Creates a new <code>StdRequestAttributes</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing its XACML Category,
+ * the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s, the given {@link org.w3c.dom.Node} representing the XACML Content element
* and the given <code>String</code> as the optional xml:Id.
*
* @param identifierCategory the <code>Identifier</code> representing the XACML Category for the new <code>StdRequestAttributes</code>
@@ -73,7 +72,7 @@
}
/**
- * Creates a new <code>StdRequestAttributes</code> by copying the given {@link com.att.research.xacml.api.RequestAttributes}.
+ * Creates a new <code>StdRequestAttributes</code> by copying the given {@link org.apache.openaz.xacml.api.RequestAttributes}.
*
* @param requestAttributes the <code>RequestAttributes</code> to copy
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestAttributesReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestAttributesReference.java
index 6703391..4e9eb0b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestAttributesReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestAttributesReference.java
@@ -28,13 +28,13 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
-import com.att.research.xacml.api.RequestAttributesReference;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.RequestAttributesReference;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.RequestAttributesReference} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.RequestAttributesReference} interface.
*
*/
public class StdRequestAttributesReference implements RequestAttributesReference {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestDefaults.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestDefaults.java
index d6b81d5..076c5d1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestDefaults.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestDefaults.java
@@ -28,16 +28,16 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.net.URI;
-import com.att.research.xacml.api.RequestDefaults;
-import com.att.research.xacml.api.XACML;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.RequestDefaults;
+import org.apache.openaz.xacml.api.XACML;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.RequestDefaults} interface for the XACML RequestDefaults element.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.RequestDefaults} interface for the XACML RequestDefaults element.
*
*/
public class StdRequestDefaults implements RequestDefaults {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestReference.java
index 0e4c09e..2b98ccd 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdRequestReference.java
@@ -28,21 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
-import com.att.research.xacml.api.RequestAttributesReference;
-import com.att.research.xacml.api.RequestReference;
-import com.att.research.xacml.util.Wrapper;
+import org.apache.openaz.xacml.api.RequestAttributesReference;
+import org.apache.openaz.xacml.api.RequestReference;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.RequestReference} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.RequestReference} interface.
*
*/
public class StdRequestReference extends Wrapper<RequestReference> implements RequestReference {
/**
- * Creates a new immutable <code>StdRequestReference</code> that wraps the given {@link com.att.research.xacml.api.RequestReference}.
+ * Creates a new immutable <code>StdRequestReference</code> that wraps the given {@link org.apache.openaz.xacml.api.RequestReference}.
*
* @param requestReference the <code>RequestReference</code> to wrap.
*/
@@ -51,7 +51,7 @@
}
/**
- * Creates a new <code>StdRequestReference</code> with a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributesReference}s.
+ * Creates a new <code>StdRequestReference</code> with a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.RequestAttributesReference}s.
*
* @param requestAttributesReferences the <code>Collection</code> of <code>RequestAttributesReference</code>s to copy into the new <code>StdRequestReference</code>>
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdResponse.java
index 64496ea..bced2cf 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdResponse.java
@@ -28,21 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
-import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.util.Wrapper;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.Response} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.Response} interface.
*
*/
public class StdResponse extends Wrapper<Response> implements Response {
/**
- * Creates an immutable <code>StdResponse</code> wrapping the given {@link com.att.research.xacml.api.Response}.
+ * Creates an immutable <code>StdResponse</code> wrapping the given {@link org.apache.openaz.xacml.api.Response}.
*
* @param response the <code>Response</code> to wrap in the new <code>StdResponse</code>
*/
@@ -51,7 +51,7 @@
}
/**
- * Creates a new <code>StdResponse</code> with the single given {@link com.att.research.xacml.api.Result}.
+ * Creates a new <code>StdResponse</code> with the single given {@link org.apache.openaz.xacml.api.Result}.
*
* @param result the <code>Result</code> for the new <code>StdResponse</code>.
*/
@@ -60,7 +60,7 @@
}
/**
- * Creates a new <code>StdResponse</code> with a copy of the {@link com.att.research.xacml.api.Result}s in the given <code>Collection</code>.
+ * Creates a new <code>StdResponse</code> with a copy of the {@link org.apache.openaz.xacml.api.Result}s in the given <code>Collection</code>.
*
* @param listResults the <code>Collection</code> of <code>Result</code>s to copy
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdResult.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdResult.java
index e82dd4b..ae419a7 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdResult.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdResult.java
@@ -28,26 +28,26 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
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.Result;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.util.Wrapper;
+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.Result;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.Result} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.Result} interface.
*
*/
public class StdResult extends Wrapper<Result> implements Result {
/**
- * Creates an immutable <code>StdResult</code> by wrapping another {@link com.att.research.xacml.api.Result}. By creating
+ * Creates an immutable <code>StdResult</code> by wrapping another {@link org.apache.openaz.xacml.api.Result}. By creating
* this wrapper, the caller is stating they will not modify the wrapped <code>Result</code> any further.
*
* @param result the <code>Result</code> to wrap.
@@ -57,7 +57,7 @@
}
/**
- * Creates an immutable <code>StdResult</code> with the given {@link com.att.research.xacml.api.Decision} and {@link com.att.research.xacml.api.Status}.
+ * Creates an immutable <code>StdResult</code> with the given {@link org.apache.openaz.xacml.api.Decision} and {@link org.apache.openaz.xacml.api.Status}.
*
* @param decision the <code>Decision</code> for the new <code>StdResult</code>
* @param status the <code>Status</code> for the new <code>StdResult</code>
@@ -67,7 +67,7 @@
}
/**
- * Creates an immutable <code>StdResult</code> with the given {@link com.att.research.xacml.api.Decision} and an OK {@link com.att.research.xacml.api.Status}.
+ * Creates an immutable <code>StdResult</code> with the given {@link org.apache.openaz.xacml.api.Decision} and an OK {@link org.apache.openaz.xacml.api.Status}.
*
* @param decision the <code>Decision</code> for the new <code>StdResult</code>
*/
@@ -76,8 +76,8 @@
}
/**
- * Creates an immutable <code>StdResult</code> with an <code>INDETERMINATE</code> {@link com.att.research.xacml.api.Decision} and
- * the given {@link com.att.research.xacml.api.Status}.
+ * Creates an immutable <code>StdResult</code> with an <code>INDETERMINATE</code> {@link org.apache.openaz.xacml.api.Decision} and
+ * the given {@link org.apache.openaz.xacml.api.Status}.
*
* @param status the <code>Status</code> for the new <code>StdResult</code>>
*/
@@ -86,15 +86,15 @@
}
/**
- * Creates an immutable <code>StdResult</code> with the given {@link com.att.research.xacml.api.Decision} and the given set of <code>Collection</code>s
+ * Creates an immutable <code>StdResult</code> with the given {@link org.apache.openaz.xacml.api.Decision} and the given set of <code>Collection</code>s
* with the details of the result.
*
* @param decisionIn the <code>Decision</code> for the new <code>StdMutableResult</code>
- * @param obligationsIn a <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s for the new <code>StdMutableResult</code>
- * @param adviceIn a <code>Collection</code> of {@link com.att.research.xacml.api.Advice} objects for the new <code>StdMutableResult</code>
- * @param attributesIn a <code>Collection</code> of {@link com.att.research.xacml.api.AttributeCategory} objects for the new <code>StdMutableResult</code>
- * @param policyIdentifiersIn a <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects for the Policy identifiers
- * @param policySetIdentifiersIn a <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects for the PolicySet identifiers
+ * @param obligationsIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.Obligation}s for the new <code>StdMutableResult</code>
+ * @param adviceIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.Advice} objects for the new <code>StdMutableResult</code>
+ * @param attributesIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeCategory} objects for the new <code>StdMutableResult</code>
+ * @param policyIdentifiersIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects for the Policy identifiers
+ * @param policySetIdentifiersIn a <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects for the PolicySet identifiers
*/
public StdResult(Decision decisionIn,
Collection<Obligation> obligationsIn,
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdScopeResolverResult.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdScopeResolverResult.java
index f2812ff..434b42b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdScopeResolverResult.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdScopeResolverResult.java
@@ -28,20 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.api.pdp.ScopeResolverResult;
-import com.att.research.xacml.util.StringUtils;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.api.pdp.ScopeResolverResult;
+import org.apache.openaz.xacml.util.StringUtils;
/**
- * StdScopeResolverResult implements the {@link com.att.research.xacml.api.pdp.ScopeResolverResult} interface.
+ * StdScopeResolverResult implements the {@link org.apache.openaz.xacml.api.pdp.ScopeResolverResult} interface.
*
*/
public class StdScopeResolverResult implements ScopeResolverResult {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatus.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatus.java
index 44b3d32..2bc8225 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatus.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatus.java
@@ -28,22 +28,22 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
-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.util.Wrapper;
+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.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.Status} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.Status} interface.
*
*/
public class StdStatus extends Wrapper<Status> implements Status {
public static final Status STATUS_OK = new StdStatus(StdStatusCode.STATUS_CODE_OK);
/**
- * Creates a new immutable <code>StdStatus</code> that wraps the given {@link com.att.research.xacml.api.Status}.
+ * Creates a new immutable <code>StdStatus</code> that wraps the given {@link org.apache.openaz.xacml.api.Status}.
* The caller agrees not to modify the given <code>Status</code> as long as the new <code>StdStatus</code> refers to it.
*
* @param status the <code>Status</code> to wrap
@@ -53,8 +53,8 @@
}
/**
- * Creates a new <code>StdStatus</code> with the given {@link com.att.research.xacml.api.StatusCode}, <code>String</code> status message,
- * and {@link com.att.research.xacml.api.StatusDetail}.
+ * Creates a new <code>StdStatus</code> with the given {@link org.apache.openaz.xacml.api.StatusCode}, <code>String</code> status message,
+ * and {@link org.apache.openaz.xacml.api.StatusDetail}.
*
* @param statusCodeIn the <code>StatusCode</code> representing the XACML StatusCode.
* @param statusMessageIn the <code>String</code> representing the XACML StatusMessage
@@ -65,8 +65,8 @@
}
/**
- * Creates a new <code>StdStatus</code> with the given {@link com.att.research.xacml.api.StatusCode}, <code>String</code> status message
- * and no {@link com.att.research.xacml.api.StatusDetail}.
+ * Creates a new <code>StdStatus</code> with the given {@link org.apache.openaz.xacml.api.StatusCode}, <code>String</code> status message
+ * and no {@link org.apache.openaz.xacml.api.StatusDetail}.
*
* @param statusCodeIn the <code>StatusCode</code> representing the XACML StatusCode.
* @param statusMessageIn the <code>String</code> representing the XACML StatusMessage
@@ -76,8 +76,8 @@
}
/**
- * Creates a new <code>StdStatus</code> with the given {@link com.att.research.xacml.api.StatusCode}, a null status message
- * and no {@link com.att.research.xacml.api.StatusDetail}.
+ * Creates a new <code>StdStatus</code> with the given {@link org.apache.openaz.xacml.api.StatusCode}, a null status message
+ * and no {@link org.apache.openaz.xacml.api.StatusDetail}.
*
* @param statusCodeIn the <code>StatusCode</code> representing the XACML StatusCode.
*/
@@ -86,7 +86,7 @@
}
/**
- * Creates a new <code>StdStatus</code> that is a copy of the given {@link com.att.research.xacml.api.Status}.
+ * Creates a new <code>StdStatus</code> that is a copy of the given {@link org.apache.openaz.xacml.api.Status}.
*
* @param status the <code>Status</code> to copy
* @return a new <code>StatusStatus</code> that is a copy of the given <code>Status</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatusCode.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatusCode.java
index 85ee562..0a9a747 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatusCode.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatusCode.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.XACML1;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.XACML1;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.StatusCode} interface to store the major
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.StatusCode} interface to store the major
* and minor {@link com.att.research.xacml.common.StatusCodeValues} objects associated with a XACML StatusCode element.
*
*/
@@ -49,8 +49,8 @@
public static final StatusCode STATUS_CODE_PROCESSING_ERROR = new StdStatusCode(XACML1.ID_STATUS_PROCESSING_ERROR);
/**
- * Creates a new <code>StdStatusCode</code> with the given {@link com.att.research.xacml.api.Identifier} representing the XACML StatusCode value,
- * and the given {@link com.att.research.xacml.api.StatusCode} representing the sub-StatusCode.
+ * Creates a new <code>StdStatusCode</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the XACML StatusCode value,
+ * and the given {@link org.apache.openaz.xacml.api.StatusCode} representing the sub-StatusCode.
*
* @param statusCodeValueIn the <code>Identifier</code> representing the XACML StatusCode value
* @param childIn the <code>StatusCode</code> representing the XACML sub-StatusCode value
@@ -61,7 +61,7 @@
}
/**
- * Creates a new <code>StdStatusCode</code> with the given {@link com.att.research.xacml.api.Identifier} representing the XACML StatusCode value
+ * Creates a new <code>StdStatusCode</code> with the given {@link org.apache.openaz.xacml.api.Identifier} representing the XACML StatusCode value
*
* @param statusCodeValueIn the <code>Identifier</code> representing the XACML StatusCode value
*/
@@ -70,7 +70,7 @@
}
/**
- * Creates a new <code>StdStatusCode</code> that is a copy of the given {@link com.att.research.xacml.api.StatusCode}.
+ * Creates a new <code>StdStatusCode</code> that is a copy of the given {@link org.apache.openaz.xacml.api.StatusCode}.
*
* @param statusCode the <code>StatusCode</code> to copy
* @return a new <code>StdStatusCode</code> that is a copy of the given <code>StatusCode</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatusDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatusDetail.java
index ca3b89c..5257ffe 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatusDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdStatusDetail.java
@@ -28,21 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.util.Collection;
-import com.att.research.xacml.api.MissingAttributeDetail;
-import com.att.research.xacml.api.StatusDetail;
-import com.att.research.xacml.util.Wrapper;
+import org.apache.openaz.xacml.api.MissingAttributeDetail;
+import org.apache.openaz.xacml.api.StatusDetail;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.StatusDetail} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.StatusDetail} interface.
*
*/
public class StdStatusDetail extends Wrapper<StatusDetail> implements StatusDetail {
/**
- * Creates a new immutable <code>StdStatusDetail</code> that wraps the given {@link com.att.research.xacml.api.StatusDetail}.
+ * Creates a new immutable <code>StdStatusDetail</code> that wraps the given {@link org.apache.openaz.xacml.api.StatusDetail}.
* The caller agrees not to modify the given <code>StatusDetail</code> as long as the new <code>StdStatusDetail</code> refers to it.
*
* @param statusDetail the <code>StatusDetail</code> to wrap
@@ -68,7 +68,7 @@
}
/**
- * Creates a new immutable <code>StdStatusDetail</code> with the given {@link com.att.research.xacml.api.MissingAttributeDetail}.
+ * Creates a new immutable <code>StdStatusDetail</code> with the given {@link org.apache.openaz.xacml.api.MissingAttributeDetail}.
*
* @param missingAttributeDetail the <code>MissingAttributeDetail</code> for the new <code>StdStatusDetail</code>
*/
@@ -77,7 +77,7 @@
}
/**
- * Creates a new <code>StdStatusDetail that is a copy of the given {@link com.att.research.xacml.api.StatusDetail}.
+ * Creates a new <code>StdStatusDetail that is a copy of the given {@link org.apache.openaz.xacml.api.StatusDetail}.
*
* @param statusDetail the <code>StatusDetail</code> to copy
* @return a new <code>StdStatusDetail</code> that is a copy of the given <code>StatusDetail</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdVersion.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdVersion.java
index 21b06eb..93f5b18 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdVersion.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdVersion.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.text.ParseException;
import java.util.Arrays;
-import com.att.research.xacml.api.Version;
+import org.apache.openaz.xacml.api.Version;
/**
- * StdVersion implements the {@link com.att.research.xacml.api.Version} interface to represent XACML version identifiers.
+ * StdVersion implements the {@link org.apache.openaz.xacml.api.Version} interface to represent XACML version identifiers.
*
*/
public class StdVersion implements Version {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdVersionMatch.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdVersionMatch.java
index 00e5d6b..5a3ff91 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdVersionMatch.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdVersionMatch.java
@@ -28,16 +28,16 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
import java.text.ParseException;
-import com.att.research.xacml.api.Version;
-import com.att.research.xacml.api.VersionMatch;
-import com.att.research.xacml.util.ObjUtil;
+import org.apache.openaz.xacml.api.Version;
+import org.apache.openaz.xacml.api.VersionMatch;
+import org.apache.openaz.xacml.util.ObjUtil;
/**
- * StdVersionMatch implements {@link com.att.research.xacml.api.VersionMatch} as an array of integers.
+ * StdVersionMatch implements {@link org.apache.openaz.xacml.api.VersionMatch} as an array of integers.
*
*/
public class StdVersionMatch implements VersionMatch {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/RequestParser.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/RequestParser.java
index 0b7c7dc..17109c3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/RequestParser.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/RequestParser.java
@@ -28,19 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.annotations;
+package org.apache.openaz.xacml.std.annotations;
-import com.att.research.xacml.api.*;
-import com.att.research.xacml.std.*;
-import com.att.research.xacml.std.datatypes.*;
-import com.att.research.xacml.util.AttributeUtils;
-import com.att.research.xacml.util.FactoryException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.*;
+import org.apache.openaz.xacml.std.*;
+import org.apache.openaz.xacml.std.datatypes.*;
+import org.apache.openaz.xacml.util.AttributeUtils;
+import org.apache.openaz.xacml.util.FactoryException;
import org.w3c.dom.Node;
import org.w3c.dom.xpath.XPathExpression;
import javax.security.auth.x500.X500Principal;
+
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.net.URI;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLAction.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLAction.java
index c7aafdc..6571a0f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLAction.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLAction.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.annotations;
+package org.apache.openaz.xacml.std.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Documented;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLAttribute.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLAttribute.java
index c59b8ed..a5775b1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLAttribute.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLAttribute.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.annotations;
+package org.apache.openaz.xacml.std.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Documented;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLEnvironment.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLEnvironment.java
index f5522ea..658690d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLEnvironment.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLEnvironment.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.annotations;
+package org.apache.openaz.xacml.std.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Documented;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLMultiRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLMultiRequest.java
index a41e12b..c9fde6c 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLMultiRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLMultiRequest.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.annotations;
+package org.apache.openaz.xacml.std.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLRequest.java
index 789e990..608cc84 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLRequest.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.annotations;
+package org.apache.openaz.xacml.std.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Documented;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLRequestReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLRequestReference.java
index cad1479..09ef801 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLRequestReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLRequestReference.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.annotations;
+package org.apache.openaz.xacml.std.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLResource.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLResource.java
index 22878ad..274e8f8 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLResource.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLResource.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.annotations;
+package org.apache.openaz.xacml.std.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Documented;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLSubject.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLSubject.java
index 90443af..9f6f5d8 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLSubject.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/annotations/XACMLSubject.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.annotations;
+package org.apache.openaz.xacml.std.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Documented;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/Base64Binary.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/Base64Binary.java
index 007be1e..51da313 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/Base64Binary.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/Base64Binary.java
@@ -28,15 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.util.Arrays;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Base64;
-
-import com.att.research.xacml.api.SemanticString;
-import com.att.research.xacml.util.StringUtils;
+import org.apache.openaz.xacml.api.SemanticString;
+import org.apache.openaz.xacml.util.StringUtils;
/**
* Base64Binary provides utilities for converting the XACML base64Binary data type to and from <code>String</code> values.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeAnyURI.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeAnyURI.java
index 75b2561..62967c6 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeAnyURI.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeAnyURI.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.net.URI;
import java.net.URISyntaxException;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML;
/**
* DataTypeAnyURI extends {@link DataTypeBase} for the XACML anyURI data type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBase.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBase.java
index 48ef1e5..a1688dd 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBase.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBase.java
@@ -28,24 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+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.XACML3;
+import org.apache.openaz.xacml.std.StdAttributeValue;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
import org.w3c.dom.Node;
-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.XACML3;
-import com.att.research.xacml.std.StdAttributeValue;
-import com.att.research.xacml.std.dom.DOMUtil;
-
/**
- * DataTypeBase provides common implementation components of the {@link com.att.research.xacml.api.DataType} interface
+ * DataTypeBase provides common implementation components of the {@link org.apache.openaz.xacml.api.DataType} interface
* that is used by the specific instance implementations.
*
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBase64Binary.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBase64Binary.java
index 7207b56..ececd07 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBase64Binary.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBase64Binary.java
@@ -28,10 +28,10 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML;
/**
* DataTypeBase64Binary extends {@link DataTypeBase} for the XACML base64Binary data type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBoolean.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBoolean.java
index 979f546..28df542 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBoolean.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeBoolean.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML;
-import com.att.research.xacml.std.StdAttributeValue;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML;
+import org.apache.openaz.xacml.std.StdAttributeValue;
/**
* DataTypeBoolean extends {@link DataTypeBase} with conversions to the
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDNSName.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDNSName.java
index bb095be..e306e31 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDNSName.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDNSName.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML2;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML2;
/**
* DataTypeRFC2396DomainName extends {@link DataTypeBase} to implement the XACML
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDate.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDate.java
index e7f6a09..91fa0f0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDate.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDate.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML;
/**
* DataTypeDate extends {@link DataTypeBase} to implement the XACML Date type with
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDateTime.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDateTime.java
index fb8aae2..a9bd615 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDateTime.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDateTime.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML;
/**
* DataTypeDateTime extends {@link DataTypeBase} for the XACML DateTime type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDayTimeDuration.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDayTimeDuration.java
index 39a94d9..a8ee440 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDayTimeDuration.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDayTimeDuration.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML3;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML3;
/**
* DataTypeDayTimeDuration extends {@link DataTypeBase} to implement the XACML dayTimeDuration
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDouble.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDouble.java
index 64d6de7..5ab7a93 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDouble.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeDouble.java
@@ -28,10 +28,10 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML;
/**
* DataTypeDouble implements conversion to the XACML Double data type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeHexBinary.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeHexBinary.java
index 335cba9..1f371ad 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeHexBinary.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeHexBinary.java
@@ -28,10 +28,10 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML;
/**
* DataTypeHexBinary extends {@link DataTypeBase} to implement the XACML hexBinary data type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeInteger.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeInteger.java
index f56aa84..5b5465e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeInteger.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeInteger.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.math.BigInteger;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML;
/**
* DataTypeInteger extends {@link DataTypeBase} to implement the XACML integer type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeIpAddress.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeIpAddress.java
index 861f6b3..5282a22 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeIpAddress.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeIpAddress.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML2;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML2;
/**
* DataTypeIpAddress extends {@link com.att.research.xacml.common.datatypes.DatatypeBase} to implement the XACML ipAddress data type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeRFC822Name.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeRFC822Name.java
index 6e6b685..a33b44f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeRFC822Name.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeRFC822Name.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML1;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML1;
/**
* DataTypeRFC822Name extends {@link com.att.research.xacml.common.datatypes.DataTypeBase> for the XACML rfc822Name data type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeSemanticStringBase.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeSemanticStringBase.java
index 6f8b8da..a250e96 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeSemanticStringBase.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeSemanticStringBase.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.Identifier;
-public abstract class DataTypeSemanticStringBase<T extends com.att.research.xacml.api.SemanticString> extends DataTypeBase<T> {
+public abstract class DataTypeSemanticStringBase<T extends org.apache.openaz.xacml.api.SemanticString> extends DataTypeBase<T> {
public DataTypeSemanticStringBase(Identifier identifierIn, Class<T> classConvertIn) {
super(identifierIn, classConvertIn);
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeString.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeString.java
index 2352a06..6459e57 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeString.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeString.java
@@ -28,10 +28,10 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML;
/**
* DataTypeString extends {@link DataTypeBase} to represent XACML 3.0 Strings as java <code>String</code>s.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeTime.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeTime.java
index 60a95cc..c537435 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeTime.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeTime.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML;
/**
* DataTypeTime extends {@link DataTypeBase} to implement the XACML Time
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeX500Name.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeX500Name.java
index 83b4d24..7ad47b3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeX500Name.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeX500Name.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import javax.security.auth.x500.X500Principal;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML1;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML1;
/**
* DataTypeX500Name extends {@link DataTypeBase} to implement the XACML x500Name data type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeXPathExpression.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeXPathExpression.java
index 53fd5b3..571eb8b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeXPathExpression.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeXPathExpression.java
@@ -28,15 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import javax.xml.xpath.XPathExpression;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML3;
import org.w3c.dom.Node;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML3;
-
/**
* DataTypeXPathExpression extends {@link DataTypeBase} to implement the XACML
* xpathExpression data type.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeYearMonthDuration.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeYearMonthDuration.java
index 6ddf5dd..65c2037 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeYearMonthDuration.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypeYearMonthDuration.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.XACML3;
+import org.apache.openaz.xacml.api.DataTypeException;
+import org.apache.openaz.xacml.api.XACML3;
/**
* DataTypeYearMonthDuration extends {@link DataTypeBase} to implement
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypes.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypes.java
index d741f0e..708399a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypes.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/DataTypes.java
@@ -29,10 +29,10 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
/**
- * DataTypes provides constant instances of the built-in {@link com.att.research.xacml.api.DataType} implementation classes.
+ * DataTypes provides constant instances of the built-in {@link org.apache.openaz.xacml.api.DataType} implementation classes.
*
*/
public class DataTypes {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ExtendedNamespaceContext.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ExtendedNamespaceContext.java
index 433e396..bdd4974 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ExtendedNamespaceContext.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ExtendedNamespaceContext.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.util.Iterator;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/HexBinary.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/HexBinary.java
index f6f9146..d952873 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/HexBinary.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/HexBinary.java
@@ -28,15 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.util.Arrays;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
-
-import com.att.research.xacml.api.SemanticString;
-import com.att.research.xacml.util.StringUtils;
+import org.apache.openaz.xacml.api.SemanticString;
+import org.apache.openaz.xacml.util.StringUtils;
/**
* HexBinary provides utilities for converting the XACML hexBinary data type to and from <code>String</code> values.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IDateTime.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IDateTime.java
index 6f0e0af..2c8f738 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IDateTime.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IDateTime.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
/**
* IDateTime is the minimal interface an object needs to support in order to be used in XACML functions that expect a Date, DateTime, or Time.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPAddress.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPAddress.java
index 2eccb4f..64b5e7f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPAddress.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPAddress.java
@@ -28,11 +28,11 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.SemanticString;
/**
* IPAddress represents either an IPv4 or IPv6 network address with optional (IPv4)masks or (IPv6)prefixes and port range components.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPv4Address.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPv4Address.java
index dbf6880..3007331 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPv4Address.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPv4Address.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
import java.util.Arrays;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPv6Address.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPv6Address.java
index 3ec0f2d..542bdb9 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPv6Address.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/IPv6Address.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
import java.util.Arrays;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Date.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Date.java
index e1f5311..3cc33a0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Date.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Date.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
import java.util.Calendar;
@@ -36,7 +36,7 @@
import java.util.GregorianCalendar;
import java.util.TimeZone;
-import com.att.research.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.SemanticString;
/**
* ISO8601Date is a representation of an ISO8601 format date without a time component.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601DateTime.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601DateTime.java
index 74c9f28..75578c5 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601DateTime.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601DateTime.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
import java.util.Calendar;
@@ -36,11 +36,11 @@
import java.util.GregorianCalendar;
import java.util.TimeZone;
-import com.att.research.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.SemanticString;
/**
* ISO8601Datetime is a combination of an {@link ISO8601Date} and a {@link ISO8601Time}
- * with a common {@link com.att.research.xacml.std.datatypes.ISO8601TimeZone}.
+ * with a common {@link org.apache.openaz.xacml.std.datatypes.ISO8601TimeZone}.
*
* Note: This is a temporary implementation. It appears Java 8 will have better classes for dealing with ISO8601 dates and times.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Duration.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Duration.java
index 7ca46a0..5d07f31 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Duration.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Duration.java
@@ -28,11 +28,11 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.SemanticString;
/**
* ISO8601Duration implements the ISO8601 duration data type with parsers from strings and to strings.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Time.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Time.java
index 21b0fcf..c01bced 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Time.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601Time.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
-import com.att.research.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.SemanticString;
/**
* ISO8601Time represents a time of day with an optional timezone indication using ISO8601 standard representations
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601TimeZone.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601TimeZone.java
index 3a1cdfc..ff86c71 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601TimeZone.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ISO8601TimeZone.java
@@ -28,11 +28,11 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.SemanticString;
/**
* ISO8601TimeZone represents an ISO8601 TimeZone specification.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/NodeNamespaceContext.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/NodeNamespaceContext.java
index 0234102..c53756b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/NodeNamespaceContext.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/NodeNamespaceContext.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ParseUtils.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ParseUtils.java
index e0d0c2f..99140c4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ParseUtils.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ParseUtils.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
/**
* ParseUtils provides a number of static methods that are useful in parsing <code>String</code> objects into
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/PortRange.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/PortRange.java
index 9443b19..99640c4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/PortRange.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/PortRange.java
@@ -18,11 +18,11 @@
*
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.SemanticString;
/**
* PortRange represents the optional range of port values for an <code>IPAddress</code>. A value of -1
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/RFC2396DomainName.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/RFC2396DomainName.java
index 6e23a48..2537ccc 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/RFC2396DomainName.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/RFC2396DomainName.java
@@ -28,11 +28,11 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.SemanticString;
/**
* RFC2396DomainName represents a host name from the RFC2396 specification.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/RFC822Name.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/RFC822Name.java
index d0835ae..8995e1f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/RFC822Name.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/RFC822Name.java
@@ -28,11 +28,11 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
-import com.att.research.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.SemanticString;
/**
* RFC822Name represents an RFC 822 name consisting of a local part and a domain part.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/StringNamespaceContext.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/StringNamespaceContext.java
index 7ece32e..86c2ca1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/StringNamespaceContext.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/StringNamespaceContext.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathDayTimeDuration.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathDayTimeDuration.java
index b2e791e..fd50821 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathDayTimeDuration.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathDayTimeDuration.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathExpressionWrapper.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathExpressionWrapper.java
index e974879..a4205d0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathExpressionWrapper.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathExpressionWrapper.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
@@ -37,14 +37,13 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-
/**
* XPathExpressionWrapper implements the {@link javax.xml.xpath.XPathExpression} interface to wrap another <code>XPathExpression</code> and
* keep the path expression that was used to create it.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathYearMonthDuration.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathYearMonthDuration.java
index 98ab9be..755871b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathYearMonthDuration.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/XPathYearMonthDuration.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
import java.text.ParseException;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/package-info.java
index 14efc2e..65137b7 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.datatypes;
+package org.apache.openaz.xacml.std.datatypes;
/**
* com.att.research.xacml.std.datatypes contains implementations of the {@link com.att.research.xacml.api.DataType} interface
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAdvice.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAdvice.java
index 578867c..6a77e94 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAdvice.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAdvice.java
@@ -28,22 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.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.Advice;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdAdvice;
+import org.apache.openaz.xacml.std.StdMutableAdvice;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdAdvice;
-import com.att.research.xacml.std.StdMutableAdvice;
-
/**
* DOMAdvice provides a static method for creating an instance of the {@link com.att.research.xacml.Advice} interface from
* a {@link org.w3c.dom.Node} representing a XACML 3.0 Advice element, and for creating a <code>List</code> of <code>Advice</code>
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttribute.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttribute.java
index 753d206..59b3db2 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttribute.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttribute.java
@@ -28,22 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdAttribute;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdAttribute;
-import com.att.research.xacml.std.StdMutableAttribute;
-
/**
- * DOMAttribute extends {@link com.att.research.xacml.std.StdMutableAttribute} with methods for creation from DOM <code>Node</code>s.
+ * DOMAttribute extends {@link org.apache.openaz.xacml.std.StdMutableAttribute} with methods for creation from DOM <code>Node</code>s.
*
*/
public class DOMAttribute {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeAssignment.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeAssignment.java
index 88b201f..72a75fc 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeAssignment.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeAssignment.java
@@ -28,24 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+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.XACML3;
+import org.apache.openaz.xacml.std.StdAttributeAssignment;
+import org.apache.openaz.xacml.std.StdMutableAttributeAssignment;
+import org.apache.openaz.xacml.util.FactoryException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import com.att.research.xacml.api.AttributeAssignment;
-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.XACML3;
-import com.att.research.xacml.std.StdAttributeAssignment;
-import com.att.research.xacml.std.StdMutableAttributeAssignment;
-import com.att.research.xacml.util.FactoryException;
-
public class DOMAttributeAssignment {
private static final Log logger = LogFactory.getLog(DOMAttributeAssignment.class);
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeCategory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeCategory.java
index 438236d..25a2940 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeCategory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeCategory.java
@@ -28,25 +28,24 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.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.Attribute;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdAttributeCategory;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdAttributeCategory;
-
/**
- * DOMAttributeCategory extends {@link com.att.research.xacml.std.StdAttributeCategory} with methods for creation
+ * DOMAttributeCategory extends {@link org.apache.openaz.xacml.std.StdAttributeCategory} with methods for creation
* from DOM {@link org.w3c.dom.Node}s.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeValue.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeValue.java
index 1077a65..c1e294f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeValue.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMAttributeValue.java
@@ -28,26 +28,25 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.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.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.XACML;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdAttributeValue;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.util.FactoryException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-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.XACML;
-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.xacml.util.FactoryException;
-
/**
- * DOMAttributeValue extends {@link com.att.research.xacml.std.StdAttributeValue} with methods for creation from DOM elements.
+ * DOMAttributeValue extends {@link org.apache.openaz.xacml.std.StdAttributeValue} with methods for creation from DOM elements.
*
*
* @param <T> the Java type implementing the value for the Attribute
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMDocumentRepair.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMDocumentRepair.java
index 4e1d26a..1bad354 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMDocumentRepair.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMDocumentRepair.java
@@ -28,13 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
+import org.apache.openaz.xacml.api.XACML3;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import com.att.research.xacml.api.XACML3;
-
/**
* DOMDocumentRepair provides methods for examining a DOM {@link org.w3c.dom.Document} for XACML document types and doing repair on them.
* This class supports XACML Request and Response documents.
@@ -71,7 +70,7 @@
* @param document the <code>Document</code> to check
* @return true if any repairs were made in the <code>Document</code>, else false
* @throws DOMStructureException if there were unrecoverable errors found
- * @throws com.att.research.xacml.std.dom.DOMDocumentRepair.UnsupportedDocumentTypeException if the root element is not a XACML Request or Response.
+ * @throws org.apache.openaz.xacml.std.dom.DOMDocumentRepair.UnsupportedDocumentTypeException if the root element is not a XACML Request or Response.
*/
public boolean repair(Document document) throws DOMStructureException, UnsupportedDocumentTypeException {
Node firstChild = DOMUtil.getFirstChildElement(document);
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMIdReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMIdReference.java
index a490c04..948647a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMIdReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMIdReference.java
@@ -28,24 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import java.text.ParseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.IdReference;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Version;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdIdReference;
+import org.apache.openaz.xacml.std.StdVersion;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import com.att.research.xacml.api.IdReference;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Version;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdIdReference;
-import com.att.research.xacml.std.StdVersion;
-
/**
- * DOMIdReference extends {@link com.att.research.xacml.std.StdIdReference} with methods for creation from
+ * DOMIdReference extends {@link org.apache.openaz.xacml.std.StdIdReference} with methods for creation from
* DOM {@link org.w3c.dom.Node}s.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMIdReferenceMatch.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMIdReferenceMatch.java
index 94c8060..bf0ddea 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMIdReferenceMatch.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMIdReferenceMatch.java
@@ -28,24 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import java.text.ParseException;
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.Identifier;
+import org.apache.openaz.xacml.api.VersionMatch;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdIdReferenceMatch;
+import org.apache.openaz.xacml.std.StdVersionMatch;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import com.att.research.xacml.api.IdReferenceMatch;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.VersionMatch;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdIdReferenceMatch;
-import com.att.research.xacml.std.StdVersionMatch;
-
/**
- * DOMIdReferenceMatch extends {@link com.att.research.xacml.std.StdIdReferenceMatch} with methods for creation from
+ * DOMIdReferenceMatch extends {@link org.apache.openaz.xacml.std.StdIdReferenceMatch} with methods for creation from
* DOM {@link org.w3c.dom.Node}s.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMMissingAttributeDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMMissingAttributeDetail.java
index d01863f..fed502b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMMissingAttributeDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMMissingAttributeDetail.java
@@ -28,21 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.MissingAttributeDetail;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdMissingAttributeDetail;
+import org.apache.openaz.xacml.std.StdMutableMissingAttributeDetail;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.MissingAttributeDetail;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdMissingAttributeDetail;
-import com.att.research.xacml.std.StdMutableMissingAttributeDetail;
-
/**
- * DOMMissingAttributeDetail extends {@link com.att.research.xacml.std.StdMutableMissingAttributeDetail} with methods for creation from
+ * DOMMissingAttributeDetail extends {@link org.apache.openaz.xacml.std.StdMutableMissingAttributeDetail} with methods for creation from
* DOM {@link org.w3c.dom.Node}s.
*
*/
@@ -56,7 +55,7 @@
*
* @param nodeMissingAttributeDetail the <code>Node</code> representing the MissingAttributeDetail element
* @return a new <code>DOMMissingAttributeDetail</code> parsed from the given <code>Node</code>
- * @throws com.att.research.xacml.std.dom.DOMStructureException if the conversion is not possible
+ * @throws org.apache.openaz.xacml.std.dom.DOMStructureException if the conversion is not possible
*/
public static MissingAttributeDetail newInstance(Node nodeMissingAttributeDetail) throws DOMStructureException {
Element elementMissingAttributeDetail = DOMUtil.getElement(nodeMissingAttributeDetail);
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMObligation.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMObligation.java
index 722ca98..8fddd9e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMObligation.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMObligation.java
@@ -28,24 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.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.Obligation;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdMutableObligation;
+import org.apache.openaz.xacml.std.StdObligation;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdMutableObligation;
-import com.att.research.xacml.std.StdObligation;
-
/**
- * Provides static methods for creating {@link com.att.research.xacml.api.Obligation} objects from a {@link org.w3c.dom.Node}.
+ * Provides static methods for creating {@link org.apache.openaz.xacml.api.Obligation} objects from a {@link org.w3c.dom.Node}.
*
*/
public class DOMObligation {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMProperties.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMProperties.java
index 351ec4e..deb1ce8 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMProperties.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMProperties.java
@@ -28,12 +28,12 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import java.util.HashMap;
import java.util.Map;
-import com.att.research.xacml.util.XACMLProperties;
+import org.apache.openaz.xacml.util.XACMLProperties;
/**
* DOMProperties contains utilities for determining the properties for parsing XACML documents with a DOM parser.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java
index 4522cbd..e3cd20d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -42,20 +42,19 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdMutableRequest;
+import org.apache.openaz.xacml.std.StdRequest;
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.Request;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdMutableRequest;
-import com.att.research.xacml.std.StdRequest;
-
/**
- * DOMRequest is used to convert XML into {@link com.att.research.xacml.api.Request} objects.
- * The {@link com.att.research.xacml.api.Request} objects returned by this class are instances of
- * {@link com.att.research.xacml.std.StdMutableRequest}, not <code>DOMRequest</code>.
+ * DOMRequest is used to convert XML into {@link org.apache.openaz.xacml.api.Request} objects.
+ * The {@link org.apache.openaz.xacml.api.Request} objects returned by this class are instances of
+ * {@link org.apache.openaz.xacml.std.StdMutableRequest}, not <code>DOMRequest</code>.
* Object instances are generated by loading a file, string, InputStream, or XML Node tree representing the Request.
*
*
@@ -70,7 +69,7 @@
}
/**
- * Parse and XML string into a {@link com.att.research.xacml.api.Request} object.
+ * Parse and XML string into a {@link org.apache.openaz.xacml.api.Request} object.
*
* @param xmlString
* @return
@@ -96,7 +95,7 @@
}
/**
- * Read a file containing the XML description of a XACML Request and parse it into a {@link com.att.research.xacml.api.Request} Object.
+ * Read a file containing the XML description of a XACML Request and parse it into a {@link org.apache.openaz.xacml.api.Request} Object.
*
* This is only used for testing.
* In normal operation a Request arrives through the RESTful interface and is processed using <code>load(String xmlString)</code>.
@@ -125,7 +124,7 @@
}
/**
- * Read characters from the given <code>InputStream</code> and parse them into an XACML {@link com.att.research.xacml.api.Request} object.
+ * Read characters from the given <code>InputStream</code> and parse them into an XACML {@link org.apache.openaz.xacml.api.Request} object.
*
* @param is
* @return
@@ -189,10 +188,10 @@
}
/**
- * Creates a new {@link com.att.research.xacml.api.Request} by parsing the given <code>Node</code> representing a XACML Request element.
+ * Creates a new {@link org.apache.openaz.xacml.api.Request} by parsing the given <code>Node</code> representing a XACML Request element.
*
* @param nodeRequest the <code>Node</code> representing the XACML Request element.
- * @return a new {@link com.att.research.xacml.std.StdMutableRequest} parsed from the given <code>Node</code>
+ * @return a new {@link org.apache.openaz.xacml.std.StdMutableRequest} parsed from the given <code>Node</code>
* @throws DOMStructureException if the conversion cannot be made
*/
public static Request newInstance(Node nodeRequest) throws DOMStructureException {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestAttributes.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestAttributes.java
index 4cc46c0..da609b9 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestAttributes.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestAttributes.java
@@ -28,25 +28,24 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.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.Attribute;
+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.StdRequestAttributes;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Attribute;
-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.StdRequestAttributes;
-
/**
- * DOMRequestAttributes extends {@link com.att.research.xacml.std.StdRequestAttributes} with methods for creation from DOM
+ * DOMRequestAttributes extends {@link org.apache.openaz.xacml.std.StdRequestAttributes} with methods for creation from DOM
* {@link org.w3c.dom.Node}s.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestAttributesReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestAttributesReference.java
index 175d88b..96e9047 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestAttributesReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestAttributesReference.java
@@ -28,19 +28,18 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.RequestAttributesReference;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdRequestAttributesReference;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import com.att.research.xacml.api.RequestAttributesReference;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdRequestAttributesReference;
-
/**
- * DOMRequestAttributesReference extends {@link com.att.research.xacml.std.StdRequestAttributesReference} with methods for creation from
+ * DOMRequestAttributesReference extends {@link org.apache.openaz.xacml.std.StdRequestAttributesReference} with methods for creation from
* DOM {@link org.w3c.dom.Node}s.
*
*/
@@ -55,7 +54,7 @@
*
* @param nodeAttributesReference the <code>Node</code> to parse
* @return a new <code>DOMRequestAttributesReference</code>
- * @throws com.att.research.xacml.std.dom.DOMStructureException if the conversion cannot be made
+ * @throws org.apache.openaz.xacml.std.dom.DOMStructureException if the conversion cannot be made
*/
public static RequestAttributesReference newInstance(Node nodeAttributesReference) throws DOMStructureException {
Element elementAttributesReference = DOMUtil.getElement(nodeAttributesReference);
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestDefaults.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestDefaults.java
index 1227821..3f15ce8 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestDefaults.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestDefaults.java
@@ -28,22 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import java.net.URI;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.RequestDefaults;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdRequestDefaults;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.RequestDefaults;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdRequestDefaults;
-
/**
- * DOMRequestDefaults extends {@link com.att.research.xacml.std.StdRequestDefaults} with methods for creation from
+ * DOMRequestDefaults extends {@link org.apache.openaz.xacml.std.StdRequestDefaults} with methods for creation from
* DOM {@link org.w3c.dom.Node}s.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestReference.java
index 9083daa..fadca62 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequestReference.java
@@ -28,21 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.RequestReference;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdMutableRequestReference;
+import org.apache.openaz.xacml.std.StdRequestReference;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.RequestReference;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdMutableRequestReference;
-import com.att.research.xacml.std.StdRequestReference;
-
/**
- * DOMRequestReference extends {@link com.att.research.xacml.std.StdMutableRequestReference} with methods for creation from
+ * DOMRequestReference extends {@link org.apache.openaz.xacml.std.StdMutableRequestReference} with methods for creation from
* DOM {@link org.w3c.dom.Node}s.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
index 10378a7..e5593c6 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -53,44 +53,43 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.IdReference;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.MissingAttributeDetail;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.api.SemanticString;
+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.XACML3;
+import org.apache.openaz.xacml.std.StdMutableResponse;
+import org.apache.openaz.xacml.std.StdResponse;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.datatypes.ExtendedNamespaceContext;
+import org.apache.openaz.xacml.std.datatypes.XPathExpressionWrapper;
+import org.apache.openaz.xacml.std.json.JSONStructureException;
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.Advice;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.IdReference;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.MissingAttributeDetail;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.api.SemanticString;
-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.XACML3;
-import com.att.research.xacml.std.StdMutableResponse;
-import com.att.research.xacml.std.StdResponse;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.datatypes.ExtendedNamespaceContext;
-import com.att.research.xacml.std.datatypes.XPathExpressionWrapper;
-import com.att.research.xacml.std.json.JSONStructureException;
-
/**
- * DOMResponse is used to convert XML into {@link com.att.research.xacml.api.Response} objects and
- * {@link com.att.research.xacml.api.Response} objects into XML strings.
+ * DOMResponse is used to convert XML into {@link org.apache.openaz.xacml.api.Response} objects and
+ * {@link org.apache.openaz.xacml.api.Response} objects into XML strings.
* Instances of this class are never created.
- * The {@link com.att.research.xacml.api.Response} objects returned by this class are instances of
- * {@link com.att.research.xacml.std.StdMutableResponse}.
- * {@link com.att.research.xacml.api.Response} objects are generated by loading a file or XML Node tree representing the Request.
+ * The {@link org.apache.openaz.xacml.api.Response} objects returned by this class are instances of
+ * {@link org.apache.openaz.xacml.std.StdMutableResponse}.
+ * {@link org.apache.openaz.xacml.api.Response} objects are generated by loading a file or XML Node tree representing the Request.
* In normal product operation this is not used to generate new instances
- * because the PDP generates {@link com.att.research.xacml.std.StdResponse} objects internally.
+ * because the PDP generates {@link org.apache.openaz.xacml.std.StdResponse} objects internally.
* Those objects are converted to XML strings for transmission through the RESTful Web Service
* using the <code>convert</code> method in this class.
*
@@ -200,7 +199,7 @@
/**
- * Read a file containing an XML representation of a Response and parse it into a {@link com.att.research.xacml.api.Response} Object.
+ * Read a file containing an XML representation of a Response and parse it into a {@link org.apache.openaz.xacml.api.Response} Object.
* This is used only for testing since Responses in the normal environment are generated by the PDP code.
*
* @param fileResponse
@@ -239,7 +238,7 @@
/**
- * Read a file containing an XML representation of a Response and parse it into a {@link com.att.research.xacml.api.Response} Object.
+ * Read a file containing an XML representation of a Response and parse it into a {@link org.apache.openaz.xacml.api.Response} Object.
* This is used only for testing since Responses in the normal environment are generated by the PDP code.
*
* @param fileResponse
@@ -305,7 +304,7 @@
/**
- * Convert the {@link com.att.research.xacml.api.Response} into an XML string.
+ * Convert the {@link org.apache.openaz.xacml.api.Response} into an XML string.
* This is used only for debugging.
* It assumes that pretty-printing is desired.
*
@@ -318,7 +317,7 @@
}
/**
- * Convert the {@link com.att.research.xacml.api.Response} into an XML string.
+ * Convert the {@link org.apache.openaz.xacml.api.Response} into an XML string.
* This is used only for debugging.
* The caller chooses whether to pretty-print or not.
*
@@ -464,7 +463,7 @@
/**
- * Convert the {@link com.att.research.xacml.api.Response} object into a string suitable for output in an HTTPResponse.
+ * Convert the {@link org.apache.openaz.xacml.api.Response} object into a string suitable for output in an HTTPResponse.
* This method generates the output without any pretty-printing.
* This is the method normally called by the Web Service for generating the output to the PEP through the RESTful interface.
*
@@ -478,7 +477,7 @@
}
/**
- * Do the work of converting the {@link com.att.research.xacml.api.Response} object to a string, allowing for pretty-printing if desired.
+ * Do the work of converting the {@link org.apache.openaz.xacml.api.Response} object to a string, allowing for pretty-printing if desired.
*
* @param response
* @param outputStream
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResult.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResult.java
index ce5a75e..d3a8d18 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResult.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResult.java
@@ -28,22 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdMutableResult;
+import org.apache.openaz.xacml.std.StdResult;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdMutableResult;
-import com.att.research.xacml.std.StdResult;
-
/**
- * DOMResult extends {@link com.att.research.xacml.std.StdMutableResult} with methods for creation from
+ * DOMResult extends {@link org.apache.openaz.xacml.std.StdMutableResult} with methods for creation from
* DOM {@link org.w3c.dom.Node}s.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatus.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatus.java
index bcfa82c..ce86628 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatus.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatus.java
@@ -28,21 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdMutableStatus;
+import org.apache.openaz.xacml.std.StdStatus;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdMutableStatus;
-import com.att.research.xacml.std.StdStatus;
-
/**
- * DOMStatus extends {@link com.att.research.xacml.std.StdMutableStatus} with methods for creation from
+ * DOMStatus extends {@link org.apache.openaz.xacml.std.StdMutableStatus} with methods for creation from
* DOM {@link org.w3c.dom.Node}s.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatusCode.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatusCode.java
index 7b9d111..0746e0d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatusCode.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatusCode.java
@@ -28,19 +28,18 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.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.StatusCode;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdStatusCode;
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.StatusCode;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdStatusCode;
-
/**
* DOMStatusCode extends {@link com.att.research.xacml.comomon.std.StdStatusCode} with methods for creation from
* DOM {@link org.w3c.dom.Node}s.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatusDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatusDetail.java
index e1a9e4f..a1287b0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatusDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStatusDetail.java
@@ -28,21 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.StatusDetail;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdMutableStatusDetail;
+import org.apache.openaz.xacml.std.StdStatusDetail;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.StatusDetail;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdMutableStatusDetail;
-import com.att.research.xacml.std.StdStatusDetail;
-
/**
- * DOMStatusDetail extends {@link com.att.research.xacml.std.StdMutableStatusDetail} with methods for construction from
+ * DOMStatusDetail extends {@link org.apache.openaz.xacml.std.StdMutableStatusDetail} with methods for construction from
* DOM {@link org.w3c.dom.Node}s.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStructureException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStructureException.java
index 71df277..ea256b6 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStructureException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMStructureException.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import org.w3c.dom.Node;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
index 38a9850..d4de7f0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
import java.io.File;
import java.io.InputStream;
@@ -48,19 +48,18 @@
import javax.xml.transform.stream.StreamResult;
import org.apache.commons.logging.Log;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Version;
+import org.apache.openaz.xacml.api.XACML2;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdVersion;
+import org.apache.openaz.xacml.std.StdVersionMatch;
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.Version;
-import com.att.research.xacml.api.XACML2;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdVersion;
-import com.att.research.xacml.std.StdVersionMatch;
-
/**
* DOMUtil contains a number of utility functions for DOM document elements.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/package-info.java
index cceef6e..43ec0a0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.dom;
+package org.apache.openaz.xacml.std.dom;
/**
* com.att.research.xacml.std.dom contains the implementation of interfaces in {@link com.att.research.xacml.api} using DOM nodes.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAdvice.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAdvice.java
index 47486f6..1dbc8d0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAdvice.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAdvice.java
@@ -28,23 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdMutableAdvice;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AdviceType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeAssignmentType;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdMutableAdvice;
-
/**
- * JaxpAdvice extends {@link com.att.research.xacml.std.StdMutableAdvice} with methods for creation from
+ * JaxpAdvice extends {@link org.apache.openaz.xacml.std.StdMutableAdvice} with methods for creation from
* JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttribute.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttribute.java
index 020fdbc..36419df 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttribute.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttribute.java
@@ -28,22 +28,22 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdMutableAttribute;
-
/**
- * JaxpAttribute extends {@link com.att.research.xacml.std.StdMutableAttribute} with methods for creation from JAXP elements.
+ * JaxpAttribute extends {@link org.apache.openaz.xacml.std.StdMutableAttribute} with methods for creation from JAXP elements.
*
*/
public class JaxpAttribute extends StdMutableAttribute {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeAssignment.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeAssignment.java
index 80bdcee..591cb6e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeAssignment.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeAssignment.java
@@ -28,23 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.List;
+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.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdMutableAttributeAssignment;
+import org.apache.openaz.xacml.util.FactoryException;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeAssignmentType;
-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.std.IdentifierImpl;
-import com.att.research.xacml.std.StdMutableAttributeAssignment;
-import com.att.research.xacml.util.FactoryException;
-
/**
- * JaxpAttributeAssignment extends {@link com.att.research.xacml.std.StdMutableAttributeAssignment} with methods for creation
+ * JaxpAttributeAssignment extends {@link org.apache.openaz.xacml.std.StdMutableAttributeAssignment} with methods for creation
* from JAXP elements.
*
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeCategory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeCategory.java
index e4a1386..4383102 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeCategory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeCategory.java
@@ -28,23 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeCategory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdAttributeCategory;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributesType;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeCategory;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdAttributeCategory;
-
/**
- * JaxpAttributeCategory extends {@link com.att.research.xacml.std.StdAttributeCategory} with methods for creation from
+ * JaxpAttributeCategory extends {@link org.apache.openaz.xacml.std.StdAttributeCategory} with methods for creation from
* JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeValue.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeValue.java
index 00bb21e..90f7a19 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeValue.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpAttributeValue.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.math.BigInteger;
import java.net.URI;
@@ -36,46 +36,46 @@
import javax.security.auth.x500.X500Principal;
import javax.xml.xpath.XPathExpression;
+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.api.XACML1;
+import org.apache.openaz.xacml.api.XACML2;
+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.datatypes.Base64Binary;
+import org.apache.openaz.xacml.std.datatypes.DataTypeAnyURI;
+import org.apache.openaz.xacml.std.datatypes.DataTypeBase64Binary;
+import org.apache.openaz.xacml.std.datatypes.DataTypeBoolean;
+import org.apache.openaz.xacml.std.datatypes.DataTypeDNSName;
+import org.apache.openaz.xacml.std.datatypes.DataTypeDate;
+import org.apache.openaz.xacml.std.datatypes.DataTypeDateTime;
+import org.apache.openaz.xacml.std.datatypes.DataTypeDayTimeDuration;
+import org.apache.openaz.xacml.std.datatypes.DataTypeDouble;
+import org.apache.openaz.xacml.std.datatypes.DataTypeHexBinary;
+import org.apache.openaz.xacml.std.datatypes.DataTypeInteger;
+import org.apache.openaz.xacml.std.datatypes.DataTypeIpAddress;
+import org.apache.openaz.xacml.std.datatypes.DataTypeRFC822Name;
+import org.apache.openaz.xacml.std.datatypes.DataTypeString;
+import org.apache.openaz.xacml.std.datatypes.DataTypeTime;
+import org.apache.openaz.xacml.std.datatypes.DataTypeX500Name;
+import org.apache.openaz.xacml.std.datatypes.DataTypeXPathExpression;
+import org.apache.openaz.xacml.std.datatypes.DataTypeYearMonthDuration;
+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;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
-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.api.XACML1;
-import com.att.research.xacml.api.XACML2;
-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.datatypes.Base64Binary;
-import com.att.research.xacml.std.datatypes.DataTypeAnyURI;
-import com.att.research.xacml.std.datatypes.DataTypeBase64Binary;
-import com.att.research.xacml.std.datatypes.DataTypeBoolean;
-import com.att.research.xacml.std.datatypes.DataTypeDNSName;
-import com.att.research.xacml.std.datatypes.DataTypeDate;
-import com.att.research.xacml.std.datatypes.DataTypeDateTime;
-import com.att.research.xacml.std.datatypes.DataTypeDayTimeDuration;
-import com.att.research.xacml.std.datatypes.DataTypeDouble;
-import com.att.research.xacml.std.datatypes.DataTypeHexBinary;
-import com.att.research.xacml.std.datatypes.DataTypeInteger;
-import com.att.research.xacml.std.datatypes.DataTypeIpAddress;
-import com.att.research.xacml.std.datatypes.DataTypeRFC822Name;
-import com.att.research.xacml.std.datatypes.DataTypeString;
-import com.att.research.xacml.std.datatypes.DataTypeTime;
-import com.att.research.xacml.std.datatypes.DataTypeX500Name;
-import com.att.research.xacml.std.datatypes.DataTypeXPathExpression;
-import com.att.research.xacml.std.datatypes.DataTypeYearMonthDuration;
-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;
-
/**
- * JaxpAttributeValue<T> extends {@link com.att.research.xacml.std.StdAttributeValue} to instantiate itself
+ * JaxpAttributeValue<T> extends {@link org.apache.openaz.xacml.std.StdAttributeValue} to instantiate itself
* from a JAXP {@link oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType}.
*
* @param <T> the data type of the value in the <code>AttributeValue</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpIdReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpIdReference.java
index 2b8ca36..71197b4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpIdReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpIdReference.java
@@ -28,20 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.text.ParseException;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.Version;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdIdReference;
+import org.apache.openaz.xacml.std.StdVersion;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.IdReferenceType;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Version;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdIdReference;
-import com.att.research.xacml.std.StdVersion;
-
/**
- * JaxpIdReference extends {@link com.att.research.xacml.std.StdIdReference} with methods for creation from
+ * JaxpIdReference extends {@link org.apache.openaz.xacml.std.StdIdReference} with methods for creation from
* JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpIdReferenceMatch.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpIdReferenceMatch.java
index 0158a06..55bee42 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpIdReferenceMatch.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpIdReferenceMatch.java
@@ -28,20 +28,20 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.text.ParseException;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.VersionMatch;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdIdReferenceMatch;
+import org.apache.openaz.xacml.std.StdVersionMatch;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.IdReferenceType;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.VersionMatch;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdIdReferenceMatch;
-import com.att.research.xacml.std.StdVersionMatch;
-
/**
- * JaxpIdReferenceMatch extends {@link com.att.research.xacml.std.StdIdReferenceMatch} with methods for creation
+ * JaxpIdReferenceMatch extends {@link org.apache.openaz.xacml.std.StdIdReferenceMatch} with methods for creation
* from JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpMissingAttributeDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpMissingAttributeDetail.java
index 31e7e86..2530e63 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpMissingAttributeDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpMissingAttributeDetail.java
@@ -28,23 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdMutableMissingAttributeDetail;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.MissingAttributeDetailType;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdMutableMissingAttributeDetail;
-
/**
- * JaxpMissingAttributeDetail extends {@link com.att.research.xacml.std.StdMutableMissingAttributeDetail} with methods for creation from
+ * JaxpMissingAttributeDetail extends {@link org.apache.openaz.xacml.std.StdMutableMissingAttributeDetail} with methods for creation from
* JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpObligation.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpObligation.java
index 4a15b16..1843ae6 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpObligation.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpObligation.java
@@ -28,23 +28,23 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdMutableObligation;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeAssignmentType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationType;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdMutableObligation;
-
/**
- * JaxpObligation extends {@link com.att.research.xacml.std.StdMutableObligation} with methods for creation from
+ * JaxpObligation extends {@link org.apache.openaz.xacml.std.StdMutableObligation} with methods for creation from
* JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequest.java
index 97e2fad..2ff928f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequest.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.io.File;
import java.io.IOException;
@@ -48,16 +48,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.std.StdMutableRequest;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import com.att.research.xacml.std.StdMutableRequest;
-
/**
- * JaxpRequest extends {@link com.att.research.xacml.std.StdMutableRequest} with methods for creation from JAXP elements.
+ * JaxpRequest extends {@link org.apache.openaz.xacml.std.StdMutableRequest} with methods for creation from JAXP elements.
*
*/
public class JaxpRequest extends StdMutableRequest {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestAttributes.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestAttributes.java
index 22d2124..58abdfb 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestAttributes.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestAttributes.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.ArrayList;
import java.util.Iterator;
@@ -37,16 +37,15 @@
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributesType;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.RequestAttributes;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdRequestAttributes;
import org.w3c.dom.Node;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.RequestAttributes;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdRequestAttributes;
-
/**
- * JaxpRequestAttributes extends {@link com.att.research.xacml.std.StdRequestAttributes} with methods for creation from JAXP elements.
+ * JaxpRequestAttributes extends {@link org.apache.openaz.xacml.std.StdRequestAttributes} with methods for creation from JAXP elements.
*
*/
public class JaxpRequestAttributes {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestAttributesReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestAttributesReference.java
index 0726288..2b00dcf 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestAttributesReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestAttributesReference.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
+
+import org.apache.openaz.xacml.std.StdRequestAttributesReference;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributesReferenceType;
-import com.att.research.xacml.std.StdRequestAttributesReference;
-
/**
- * JaxpRequestAttributesReference extends {@link com.att.research.xacml.std.StdRequestAttributesReference} with methods for
+ * JaxpRequestAttributesReference extends {@link org.apache.openaz.xacml.std.StdRequestAttributesReference} with methods for
* creation using JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestDefaults.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestDefaults.java
index ea3bd0a..272230a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestDefaults.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestDefaults.java
@@ -28,16 +28,16 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.net.URI;
+import org.apache.openaz.xacml.std.StdRequestDefaults;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.RequestDefaultsType;
-import com.att.research.xacml.std.StdRequestDefaults;
-
/**
- * JaxpRequestDefaults extends {@link com.att.research.xacml.std.StdRequestDefaults} with methods for creation
+ * JaxpRequestDefaults extends {@link org.apache.openaz.xacml.std.StdRequestDefaults} with methods for creation
* from JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestReference.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestReference.java
index 7d4c7a9..fc740a3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestReference.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpRequestReference.java
@@ -28,17 +28,17 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.Iterator;
+import org.apache.openaz.xacml.std.StdMutableRequestReference;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributesReferenceType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.RequestReferenceType;
-import com.att.research.xacml.std.StdMutableRequestReference;
-
/**
- * JaxpRequestReference extends {@link com.att.research.xacml.std.StdMutableRequestReference} with methods for
+ * JaxpRequestReference extends {@link org.apache.openaz.xacml.std.StdMutableRequestReference} with methods for
* creation form JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpResponse.java
index 4d31b61..f4304b3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpResponse.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.io.File;
import java.io.IOException;
@@ -47,16 +47,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.std.StdMutableResponse;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import com.att.research.xacml.std.StdMutableResponse;
-
/**
- * JaxpResponse extends {@link com.att.research.xacml.std.StdMutableResponse} with methods for creation from
+ * JaxpResponse extends {@link org.apache.openaz.xacml.std.StdMutableResponse} with methods for creation from
* JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpResult.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpResult.java
index 7f12ffe..d933809 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpResult.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpResult.java
@@ -28,24 +28,24 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.Iterator;
import javax.xml.bind.JAXBElement;
+import org.apache.openaz.xacml.api.Decision;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.StdMutableResult;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AdviceType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributesType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.IdReferenceType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.ResultType;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.StdMutableResult;
-
/**
- * JaxpResult extends {@link com.att.research.xacml.std.StdMutableResult} with methods for creation
+ * JaxpResult extends {@link org.apache.openaz.xacml.std.StdMutableResult} with methods for creation
* from JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatus.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatus.java
index 47b12e5..4eae1f7 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatus.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatus.java
@@ -28,14 +28,14 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
+
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.StatusDetail;
+import org.apache.openaz.xacml.std.StdMutableStatus;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.StatusType;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.StatusDetail;
-import com.att.research.xacml.std.StdMutableStatus;
-
/**
* JaxpStatus extends {@link com.att.research.StdMutableStatus.common.std.StdStatus} with methods for creation from
* JAXP elements.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatusCode.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatusCode.java
index aecd3c4..d6a33f7 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatusCode.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatusCode.java
@@ -28,17 +28,17 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
+
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdStatusCode;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.StatusCodeType;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdStatusCode;
-
/**
- * JaxpStatusCode extends {@link com.att.research.xacml.std.StdStatusCode} with static methods
+ * JaxpStatusCode extends {@link org.apache.openaz.xacml.std.StdStatusCode} with static methods
* for creating a <code>StatusCode</code> object by parsing JAXP elements based on the XACML 3.0 schema.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatusDetail.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatusDetail.java
index 0f36d54..d3c4374 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatusDetail.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/JaxpStatusDetail.java
@@ -28,21 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import org.apache.openaz.xacml.api.MissingAttributeDetail;
+import org.apache.openaz.xacml.std.StdMutableStatusDetail;
+
import oasis.names.tc.xacml._3_0.core.schema.wd_17.MissingAttributeDetailType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.StatusDetailType;
-import com.att.research.xacml.api.MissingAttributeDetail;
-import com.att.research.xacml.std.StdMutableStatusDetail;
-
/**
- * JaxpStatusDetail extends {@link com.att.research.xacml.std.StdMutableStatusDetail} with methods for creation from
+ * JaxpStatusDetail extends {@link org.apache.openaz.xacml.std.StdMutableStatusDetail} with methods for creation from
* JAXP elements.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/package-info.java
index 62c69db..dac09eb 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/jaxp/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.jaxp;
+package org.apache.openaz.xacml.std.jaxp;
/**
* com.att.research.xacml.std.jaxp contains the implementation of interfaces in {@link com.att.research.xacml.api} using JAXP elements.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONRequest.java
index 07ee57e..e8f27e7 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONRequest.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.json;
+package org.apache.openaz.xacml.std.json;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -64,34 +64,34 @@
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+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.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.RequestAttributesReference;
+import org.apache.openaz.xacml.api.RequestReference;
+import org.apache.openaz.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdAttribute;
+import org.apache.openaz.xacml.std.StdAttributeValue;
+import org.apache.openaz.xacml.std.StdMutableRequest;
+import org.apache.openaz.xacml.std.StdMutableRequestAttributes;
+import org.apache.openaz.xacml.std.StdMutableRequestReference;
+import org.apache.openaz.xacml.std.StdRequest;
+import org.apache.openaz.xacml.std.StdRequestAttributesReference;
+import org.apache.openaz.xacml.std.StdRequestDefaults;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.std.datatypes.ExtendedNamespaceContext;
+import org.apache.openaz.xacml.std.datatypes.StringNamespaceContext;
+import org.apache.openaz.xacml.std.datatypes.XPathExpressionWrapper;
+import org.apache.openaz.xacml.util.FactoryException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-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.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.RequestAttributesReference;
-import com.att.research.xacml.api.RequestReference;
-import com.att.research.xacml.api.SemanticString;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdAttribute;
-import com.att.research.xacml.std.StdAttributeValue;
-import com.att.research.xacml.std.StdMutableRequest;
-import com.att.research.xacml.std.StdMutableRequestAttributes;
-import com.att.research.xacml.std.StdMutableRequestReference;
-import com.att.research.xacml.std.StdRequest;
-import com.att.research.xacml.std.StdRequestAttributesReference;
-import com.att.research.xacml.std.StdRequestDefaults;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacml.std.datatypes.ExtendedNamespaceContext;
-import com.att.research.xacml.std.datatypes.StringNamespaceContext;
-import com.att.research.xacml.std.datatypes.XPathExpressionWrapper;
-import com.att.research.xacml.util.FactoryException;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.core.JsonLocation;
@@ -102,7 +102,7 @@
import com.fasterxml.jackson.databind.SerializationFeature;
/**
- * JSONRequest is used to convert JSON into {@link com.att.research.xacml.api.Request} objects.
+ * JSONRequest is used to convert JSON into {@link org.apache.openaz.xacml.api.Request} objects.
* Instances are only generated by loading a file, string, or InputStream representing the Request.
*
*
@@ -784,7 +784,7 @@
/**
- * Parse and JSON string into a {@link com.att.research.xacml.api.Request} object.
+ * Parse and JSON string into a {@link org.apache.openaz.xacml.api.Request} object.
*
* @param jsonString
* @return
@@ -811,7 +811,7 @@
/**
- * Read a file containing the JSON description of a XACML Request and parse it into a {@link com.att.research.xacml.api.Request} Object.
+ * Read a file containing the JSON description of a XACML Request and parse it into a {@link org.apache.openaz.xacml.api.Request} Object.
*
* This is only used for testing.
* In normal operation a Request arrives through the RESTful interface and is processed using <code>load(String jsonString)</code>.
@@ -832,7 +832,7 @@
/**
- * Read characters from the given <code>InputStream</code> and parse them into an XACML {@link com.att.research.xacml.api.Request} object.
+ * Read characters from the given <code>InputStream</code> and parse them into an XACML {@link org.apache.openaz.xacml.api.Request} object.
*
* @param is
* @return
@@ -1111,7 +1111,7 @@
/**
- * Convert the {@link com.att.research.xacml.api.Request} into an JSON string with pretty-printing.
+ * Convert the {@link org.apache.openaz.xacml.api.Request} into an JSON string with pretty-printing.
* This is used only for debugging.
*
* @param request
@@ -1123,7 +1123,7 @@
}
/**
- * Convert the {@link com.att.research.xacml.api.Response} into an JSON string, pretty-printing is optional.
+ * Convert the {@link org.apache.openaz.xacml.api.Response} into an JSON string, pretty-printing is optional.
* This is used only for debugging.
*
* @param response
@@ -1152,7 +1152,7 @@
}
/**
- * Convert the {@link com.att.research.xacml.api.Request} object into a string suitable for output.
+ * Convert the {@link org.apache.openaz.xacml.api.Request} object into a string suitable for output.
*
* IMPORTANT: This method does NOT close the outputStream. It is the responsibility of the caller to (who opened the stream) to close it.
*
@@ -1166,7 +1166,7 @@
}
/**
- * Do the work of converting the {@link com.att.research.xacml.api.Request} object to a string, allowing for pretty-printing if desired.
+ * Do the work of converting the {@link org.apache.openaz.xacml.api.Request} object to a string, allowing for pretty-printing if desired.
*
* IMPORTANT: This method does NOT close the outputStream. It is the responsibility of the caller to (who opened the stream) to close it.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONResponse.java
index c19aa13..5335526 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONResponse.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.json;
+package org.apache.openaz.xacml.std.json;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -61,50 +61,50 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.AttributeCategory;
+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.Decision;
+import org.apache.openaz.xacml.api.IdReference;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.MissingAttributeDetail;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.api.Response;
+import org.apache.openaz.xacml.api.Result;
+import org.apache.openaz.xacml.api.SemanticString;
+import org.apache.openaz.xacml.api.StatusCode;
+import org.apache.openaz.xacml.api.XACML3;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdAdvice;
+import org.apache.openaz.xacml.std.StdDataTypeFactory;
+import org.apache.openaz.xacml.std.StdIdReference;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.StdMutableAttributeAssignment;
+import org.apache.openaz.xacml.std.StdMutableAttributeCategory;
+import org.apache.openaz.xacml.std.StdMutableMissingAttributeDetail;
+import org.apache.openaz.xacml.std.StdMutableResponse;
+import org.apache.openaz.xacml.std.StdMutableResult;
+import org.apache.openaz.xacml.std.StdMutableStatus;
+import org.apache.openaz.xacml.std.StdMutableStatusDetail;
+import org.apache.openaz.xacml.std.StdObligation;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.StdVersion;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.std.datatypes.ExtendedNamespaceContext;
+import org.apache.openaz.xacml.std.datatypes.StringNamespaceContext;
+import org.apache.openaz.xacml.std.datatypes.XPathExpressionWrapper;
+import org.apache.openaz.xacml.util.FactoryException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.att.research.xacml.api.Advice;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.AttributeCategory;
-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.Decision;
-import com.att.research.xacml.api.IdReference;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.MissingAttributeDetail;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.api.SemanticString;
-import com.att.research.xacml.api.StatusCode;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdAdvice;
-import com.att.research.xacml.std.StdDataTypeFactory;
-import com.att.research.xacml.std.StdIdReference;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.StdMutableAttributeAssignment;
-import com.att.research.xacml.std.StdMutableAttributeCategory;
-import com.att.research.xacml.std.StdMutableMissingAttributeDetail;
-import com.att.research.xacml.std.StdMutableResponse;
-import com.att.research.xacml.std.StdMutableResult;
-import com.att.research.xacml.std.StdMutableStatus;
-import com.att.research.xacml.std.StdMutableStatusDetail;
-import com.att.research.xacml.std.StdObligation;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.StdVersion;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacml.std.datatypes.ExtendedNamespaceContext;
-import com.att.research.xacml.std.datatypes.StringNamespaceContext;
-import com.att.research.xacml.std.datatypes.XPathExpressionWrapper;
-import com.att.research.xacml.util.FactoryException;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.core.JsonParseException;
@@ -114,14 +114,14 @@
import com.fasterxml.jackson.databind.SerializationFeature;
/**
- * JSONResponse is used to convert JSON into {@link com.att.research.xacml.api.Response} objects and
- * {@link com.att.research.xacml.api.Response} objects into JSON strings.
+ * JSONResponse is used to convert JSON into {@link org.apache.openaz.xacml.api.Response} objects and
+ * {@link org.apache.openaz.xacml.api.Response} objects into JSON strings.
* Instances of this class are never created.
- * The {@link com.att.research.xacml.api.Response} objects returned by this class are instances of
- * {@link com.att.research.xacml.std.StdMutableResponse}.
- * {@link com.att.research.xacml.api.Response} objects are generated by loading a file or JSON string representing the Request.
+ * The {@link org.apache.openaz.xacml.api.Response} objects returned by this class are instances of
+ * {@link org.apache.openaz.xacml.std.StdMutableResponse}.
+ * {@link org.apache.openaz.xacml.api.Response} objects are generated by loading a file or JSON string representing the Request.
* In normal product operation this is not used to generate new instances
- * because the PDP generates {@link com.att.research.xacml.std.StdResponse} objects internally.
+ * because the PDP generates {@link org.apache.openaz.xacml.std.StdResponse} objects internally.
* Those objects are converted to JSON strings for transmission through the RESTful Web Service
* using the <code>convert</code> method in this class.
*
@@ -597,7 +597,7 @@
/**
- * Parse and JSON string into a {@link com.att.research.xacml.api.Response} object.
+ * Parse and JSON string into a {@link org.apache.openaz.xacml.api.Response} object.
*
* @param jsonString
* @return
@@ -615,7 +615,7 @@
/**
- * Read a file containing an JSON representation of a Response and parse it into a {@link com.att.research.xacml.api.Response} Object.
+ * Read a file containing an JSON representation of a Response and parse it into a {@link org.apache.openaz.xacml.api.Response} Object.
* This is used only for testing since Responses in the normal environment are generated by the PDP code.
*
* @param fileResponse
@@ -653,7 +653,7 @@
}
/**
- * Read characters from the given <code>InputStream</code> and parse them into an XACML {@link com.att.research.xacml.api.Request} object.
+ * Read characters from the given <code>InputStream</code> and parse them into an XACML {@link org.apache.openaz.xacml.api.Request} object.
*
* @param is
* @return
@@ -1077,7 +1077,7 @@
/**
- * Convert the {@link com.att.research.xacml.api.Response} into an JSON string with pretty-printing.
+ * Convert the {@link org.apache.openaz.xacml.api.Response} into an JSON string with pretty-printing.
* This is used only for debugging.
*
* @param response
@@ -1089,7 +1089,7 @@
}
/**
- * Convert the {@link com.att.research.xacml.api.Response} into an JSON string, pretty-printing is optional.
+ * Convert the {@link org.apache.openaz.xacml.api.Response} into an JSON string, pretty-printing is optional.
* This is used only for debugging.
*
* @param response
@@ -1118,7 +1118,7 @@
}
/**
- * Convert the {@link com.att.research.xacml.api.Response} object into a string suitable for output in an HTTPResponse.
+ * Convert the {@link org.apache.openaz.xacml.api.Response} object into a string suitable for output in an HTTPResponse.
* This method generates the output without any pretty-printing.
* This is the method normally called by the Web Service for generating the output to the PEP through the RESTful interface.
*
@@ -1134,7 +1134,7 @@
}
/**
- * Do the work of converting the {@link com.att.research.xacml.api.Response} object to a string, allowing for pretty-printing if desired.
+ * Do the work of converting the {@link org.apache.openaz.xacml.api.Response} object to a string, allowing for pretty-printing if desired.
*
* IMPORTANT: This method does NOT close the outputStream. It is the responsibility of the caller to (who opened the stream) to close it.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONStructureException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONStructureException.java
index afd2a0c..4ce07c1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONStructureException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/json/JSONStructureException.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.json;
+package org.apache.openaz.xacml.std.json;
/**
* Exception indicating that a JSON structure is incorrect.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/package-info.java
index 1c01ccb..989cf65 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std;
+package org.apache.openaz.xacml.std;
/**
* Provides standard implementations of the interfaces from the {@link com.att.research.xacml} package. All of the standard classes implement
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdEngine.java
index 57a7d2f..a37756b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdEngine.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
@@ -53,14 +53,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.pap.PAPEngine;
+import org.apache.openaz.xacml.api.pap.PAPException;
+import org.apache.openaz.xacml.api.pap.PDP;
+import org.apache.openaz.xacml.api.pap.PDPGroup;
+import org.apache.openaz.xacml.api.pap.PDPPolicy;
+import org.apache.openaz.xacml.api.pap.PDPStatus;
+import org.apache.openaz.xacml.util.XACMLProperties;
-import com.att.research.xacml.api.pap.PAPEngine;
-import com.att.research.xacml.api.pap.PAPException;
-import com.att.research.xacml.api.pap.PDP;
-import com.att.research.xacml.api.pap.PDPGroup;
-import com.att.research.xacml.api.pap.PDPPolicy;
-import com.att.research.xacml.api.pap.PDPStatus;
-import com.att.research.xacml.util.XACMLProperties;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.collect.Sets;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdEngineFactory.java
index 41855cb..1c5dd33 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdEngineFactory.java
@@ -28,18 +28,17 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
import java.io.IOException;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.pap.PAPEngine;
-import com.att.research.xacml.api.pap.PAPEngineFactory;
-import com.att.research.xacml.api.pap.PAPException;
-import com.att.research.xacml.util.FactoryException;
+import org.apache.openaz.xacml.api.pap.PAPEngine;
+import org.apache.openaz.xacml.api.pap.PAPEngineFactory;
+import org.apache.openaz.xacml.api.pap.PAPException;
+import org.apache.openaz.xacml.util.FactoryException;
public class StdEngineFactory extends PAPEngineFactory {
private static Log logger = LogFactory.getLog(StdEngineFactory.class);
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDP.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDP.java
index 279edb4..9e81792 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDP.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDP.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
import java.io.Serializable;
import java.util.Collections;
@@ -38,11 +38,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.pap.PDP;
-import com.att.research.xacml.api.pap.PDPPIPConfig;
-import com.att.research.xacml.api.pap.PDPPolicy;
-import com.att.research.xacml.api.pap.PDPStatus;
+import org.apache.openaz.xacml.api.pap.PDP;
+import org.apache.openaz.xacml.api.pap.PDPPIPConfig;
+import org.apache.openaz.xacml.api.pap.PDPPolicy;
+import org.apache.openaz.xacml.api.pap.PDPStatus;
public class StdPDP extends StdPDPItemSetChangeNotifier implements PDP, Comparable<StdPDP>, Serializable {
private static final long serialVersionUID = 1L;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPGroup.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPGroup.java
index 40c06d7..9608913 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPGroup.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPGroup.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
import java.io.IOException;
import java.io.InputStream;
@@ -48,16 +48,16 @@
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.PDP;
+import org.apache.openaz.xacml.api.pap.PDPGroup;
+import org.apache.openaz.xacml.api.pap.PDPGroupStatus;
+import org.apache.openaz.xacml.api.pap.PDPPIPConfig;
+import org.apache.openaz.xacml.api.pap.PDPPolicy;
+import org.apache.openaz.xacml.api.pap.PDPGroupStatus.Status;
+import org.apache.openaz.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
+import org.apache.openaz.xacml.util.XACMLProperties;
-import com.att.research.xacml.api.pap.PAPException;
-import com.att.research.xacml.api.pap.PDP;
-import com.att.research.xacml.api.pap.PDPGroup;
-import com.att.research.xacml.api.pap.PDPGroupStatus;
-import com.att.research.xacml.api.pap.PDPGroupStatus.Status;
-import com.att.research.xacml.api.pap.PDPPIPConfig;
-import com.att.research.xacml.api.pap.PDPPolicy;
-import com.att.research.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
-import com.att.research.xacml.util.XACMLProperties;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
@@ -492,7 +492,7 @@
* @param isRoot
* @param policy
* @return
- * @throws com.att.research.xacml.api.pap.PAPException
+ * @throws org.apache.openaz.xacml.api.pap.PAPException
*/
public void copyPolicyToFile(String id, InputStream policy) throws PAPException {
try {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPGroupStatus.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPGroupStatus.java
index 99d6ca2..5c3e0ba 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPGroupStatus.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPGroupStatus.java
@@ -28,16 +28,17 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import com.att.research.xacml.api.pap.PDP;
-import com.att.research.xacml.api.pap.PDPGroupStatus;
-import com.att.research.xacml.api.pap.PDPPIPConfig;
-import com.att.research.xacml.api.pap.PDPPolicy;
+import org.apache.openaz.xacml.api.pap.PDP;
+import org.apache.openaz.xacml.api.pap.PDPGroupStatus;
+import org.apache.openaz.xacml.api.pap.PDPPIPConfig;
+import org.apache.openaz.xacml.api.pap.PDPPolicy;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
public class StdPDPGroupStatus implements PDPGroupStatus {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPItemSetChangeNotifier.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPItemSetChangeNotifier.java
index 762fa3b..79502cf 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPItemSetChangeNotifier.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPItemSetChangeNotifier.java
@@ -28,13 +28,13 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
import java.util.Collection;
import java.util.LinkedList;
-import com.att.research.xacml.api.pap.PDP;
-import com.att.research.xacml.api.pap.PDPGroup;
+import org.apache.openaz.xacml.api.pap.PDP;
+import org.apache.openaz.xacml.api.pap.PDPGroup;
public class StdPDPItemSetChangeNotifier {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPPIPConfig.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPPIPConfig.java
index d45acbb..1c84ec6 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPPIPConfig.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPPIPConfig.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
import java.io.Serializable;
import java.util.Collections;
@@ -38,8 +38,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.pap.PDPPIPConfig;
-import com.att.research.xacml.api.pap.PDPPIPConfig;
import com.fasterxml.jackson.annotation.JsonIgnore;
public class StdPDPPIPConfig implements PDPPIPConfig, Serializable {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPPolicy.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPPolicy.java
index 4757fc9..8a4764a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPPolicy.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPPolicy.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -44,10 +44,10 @@
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.PDPPolicy;
+import org.apache.openaz.xacml.util.XACMLPolicyScanner;
-import com.att.research.xacml.api.pap.PAPException;
-import com.att.research.xacml.api.pap.PDPPolicy;
-import com.att.research.xacml.util.XACMLPolicyScanner;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPStatus.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPStatus.java
index 53866ae..ccf27e0 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPStatus.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/StdPDPStatus.java
@@ -28,16 +28,17 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import com.att.research.xacml.api.pap.PDPPIPConfig;
-import com.att.research.xacml.api.pap.PDPPolicy;
-import com.att.research.xacml.api.pap.PDPStatus;
+import org.apache.openaz.xacml.api.pap.PDPPIPConfig;
+import org.apache.openaz.xacml.api.pap.PDPPolicy;
+import org.apache.openaz.xacml.api.pap.PDPStatus;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
public class StdPDPStatus implements Serializable, PDPStatus {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/package-info.java
index 066b888..a372745 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pap/package-info.java
@@ -33,4 +33,4 @@
*
*
*/
-package com.att.research.xacml.std.pap;
+package org.apache.openaz.xacml.std.pap;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/StdEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/StdEngine.java
index 8eff717..a11b6d1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/StdEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/StdEngine.java
@@ -28,26 +28,25 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pep;
+package org.apache.openaz.xacml.std.pep;
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.Response;
-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.api.pep.PEPEngine;
-import com.att.research.xacml.api.pep.PEPException;
-import com.att.research.xacml.util.FactoryException;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.Response;
+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.api.pep.PEPEngine;
+import org.apache.openaz.xacml.api.pep.PEPException;
+import org.apache.openaz.xacml.util.FactoryException;
/**
- * StdEngine implements the {@link com.att.research.xacml.api.pep.PEPEngine} interface by creating
- * an instance of the {@link com.att.research.xacml.api.pdp.PDPEngine} interface using the {@link com.att.research.xacml.api.pdp.PDPEngineFactory} and
- * passing requests through to that engine, forwarding the {@link com.att.research.xacml.api.Response} object back to the caller.
+ * StdEngine implements the {@link org.apache.openaz.xacml.api.pep.PEPEngine} interface by creating
+ * an instance of the {@link org.apache.openaz.xacml.api.pdp.PDPEngine} interface using the {@link org.apache.openaz.xacml.api.pdp.PDPEngineFactory} and
+ * passing requests through to that engine, forwarding the {@link org.apache.openaz.xacml.api.Response} object back to the caller.
*
*/
public class StdEngine implements PEPEngine {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/StdEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/StdEngineFactory.java
index f037282..45bd526 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/StdEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/StdEngineFactory.java
@@ -28,13 +28,13 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pep;
+package org.apache.openaz.xacml.std.pep;
import java.util.Properties;
-import com.att.research.xacml.api.pep.PEPEngine;
-import com.att.research.xacml.api.pep.PEPEngineFactory;
-import com.att.research.xacml.api.pep.PEPException;
+import org.apache.openaz.xacml.api.pep.PEPEngine;
+import org.apache.openaz.xacml.api.pep.PEPEngineFactory;
+import org.apache.openaz.xacml.api.pep.PEPException;
public class StdEngineFactory extends PEPEngineFactory {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/package-info.java
index 27f5a28..2e4339f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pep/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.pep;
+package org.apache.openaz.xacml.std.pep;
/**
* com.att.research.xacml.std.pep contains the standard implementation of the PEP interface
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdMutablePIPResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdMutablePIPResponse.java
index a0e6884..fbcc7f3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdMutablePIPResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdMutablePIPResponse.java
@@ -28,21 +28,21 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip;
+package org.apache.openaz.xacml.std.pip;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.StdStatus;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.std.StdStatus;
/**
- * Mutable implementation of the {@link com.att.research.xacml.api.pip.PIPResponse} interface with methods for
- * keeping a collection of {@link com.att.research.xacml.api.Attribute}s with a {@link com.att.research.xacml.api.Status}.
+ * Mutable implementation of the {@link org.apache.openaz.xacml.api.pip.PIPResponse} interface with methods for
+ * keeping a collection of {@link org.apache.openaz.xacml.api.Attribute}s with a {@link org.apache.openaz.xacml.api.Status}.
*
*/
public class StdMutablePIPResponse implements PIPResponse {
@@ -53,7 +53,7 @@
private boolean simple;
/**
- * Creates a new <code>StdMutablePIPResponse</code> with the given {@link com.att.research.xacml.api.Status}.
+ * Creates a new <code>StdMutablePIPResponse</code> with the given {@link org.apache.openaz.xacml.api.Status}.
*
* @param statusIn the <code>Status</code> of the new <code>StdMutablePIPResponse</code>
*/
@@ -63,8 +63,8 @@
}
/**
- * Creates a new <code>StdMutablePIPResponse</code> with an OK {@link com.att.research.xacml.api.Status} and the single
- * given {@link com.att.research.xacml.api.Attribute}.
+ * Creates a new <code>StdMutablePIPResponse</code> with an OK {@link org.apache.openaz.xacml.api.Status} and the single
+ * given {@link org.apache.openaz.xacml.api.Attribute}.
*
* @param attribute the <code>Attribute</code> for the new <code>StdMutablePIPResponse</code>>
*/
@@ -76,8 +76,8 @@
}
/**
- * Creates a new <code>StdMutablePIPResponse</code> with an OK {@link com.att.research.xacml.api.Status} and a copy of
- * the given <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s.
+ * Creates a new <code>StdMutablePIPResponse</code> with an OK {@link org.apache.openaz.xacml.api.Status} and a copy of
+ * the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s.
*
* @param attributesIn the <code>Collection</code> of <code>Attribute</code>s for the new <code>StdMutablePIPResponse</code>.
*/
@@ -89,7 +89,7 @@
}
/**
- * Creates a new <code>StdMutablePIPResponse</code> with an OK {@link com.att.research.xacml.api.Status}.
+ * Creates a new <code>StdMutablePIPResponse</code> with an OK {@link org.apache.openaz.xacml.api.Status}.
*/
public StdMutablePIPResponse() {
this(StdStatus.STATUS_OK);
@@ -102,7 +102,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Status} for this <code>StdMutablePIPResponse</code>>
+ * Sets the {@link org.apache.openaz.xacml.api.Status} for this <code>StdMutablePIPResponse</code>>
*
* @param statusIn the <code>Status</code> for this <code>StdMutablePIPResponse</code>.
*/
@@ -121,7 +121,7 @@
}
/**
- * Adds a single {@link com.att.research.xacml.api.Attribute} to this <code>StdMutablePIPResponse</code>.
+ * Adds a single {@link org.apache.openaz.xacml.api.Attribute} to this <code>StdMutablePIPResponse</code>.
*
* @param attributeIn the <code>Attribute</code> to add to this <code>StdMutablePIPResponse</code>.
*/
@@ -141,7 +141,7 @@
}
/**
- * Adds a copy of the given <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s to this
+ * Adds a copy of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s to this
* <code>StdMutablePIPResponse</code>.
*
* @param attributesIn the <code>Collection</code> of <code>Attribute</code>s to add to this <code>StdMutablePIPResponse</code>.
@@ -161,7 +161,7 @@
}
/**
- * Sets the {@link com.att.research.xacml.api.Attribute}s in this <code>StdMutablePIPResponse</code> to a copy of the
+ * Sets the {@link org.apache.openaz.xacml.api.Attribute}s in this <code>StdMutablePIPResponse</code> to a copy of the
* given <code>Collection</code>.
*
* @param attributesIn the <code>Collection</code> of <code>Attribute</code>s to set in this <code>StdMutablePIPResponse</code>.
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPFinderFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPFinderFactory.java
index d32a557..f1ed9e2 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPFinderFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPFinderFactory.java
@@ -28,18 +28,17 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip;
+package org.apache.openaz.xacml.std.pip;
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 StdPIPFinderFactory extends PIPFinderFactory {
private PIPFinder pipFinder;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPRequest.java
index 2ed2264..8cfd046 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPRequest.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip;
+package org.apache.openaz.xacml.std.pip;
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.pip.PIPRequest;
-import com.att.research.xacml.util.ObjUtil;
+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.pip.PIPRequest;
+import org.apache.openaz.xacml.util.ObjUtil;
public class StdPIPRequest implements PIPRequest {
private Identifier category;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPResponse.java
index d6332aa..ee9403a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdPIPResponse.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip;
+package org.apache.openaz.xacml.std.pip;
import java.util.ArrayList;
import java.util.Collection;
@@ -37,26 +37,26 @@
import java.util.List;
import java.util.Map;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Status;
-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.StdAttribute;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.util.Wrapper;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Status;
+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.std.StdAttribute;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.util.Wrapper;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.pip.PIPResponse} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.pip.PIPResponse} interface.
*
*/
public class StdPIPResponse extends Wrapper<PIPResponse> implements PIPResponse {
public static final PIPResponse PIP_RESPONSE_EMPTY = new StdPIPResponse(StdStatus.STATUS_OK);
/**
- * Creates a new immutable <code>StdPIPResponse</code> that wraps the given {@link com.att.research.xacml.api.pip.PIPResponse}.
+ * Creates a new immutable <code>StdPIPResponse</code> that wraps the given {@link org.apache.openaz.xacml.api.pip.PIPResponse}.
*
* @param wrappedObjectIn the <code>PIPResponse</code> to wrap.
*/
@@ -65,7 +65,7 @@
}
/**
- * Creates a new <code>StdPIPResponse</code> with the given {@link com.att.research.xacml.api.Status}.
+ * Creates a new <code>StdPIPResponse</code> with the given {@link org.apache.openaz.xacml.api.Status}.
*
* @param status the <code>Status</code> for the new <code>StdPIPResponse</code>
*/
@@ -74,8 +74,8 @@
}
/**
- * Creates a new <code>StdPIPResponse</code> with an OK {@link com.att.research.xacml.api.Status} and a
- * single {@link com.att.research.xacml.api.Attribute}.
+ * Creates a new <code>StdPIPResponse</code> with an OK {@link org.apache.openaz.xacml.api.Status} and a
+ * single {@link org.apache.openaz.xacml.api.Attribute}.
*
* @param attribute the <code>Attribute</code> for the new <code>StdPIPResponse</code>.
*/
@@ -84,8 +84,8 @@
}
/**
- * Creates a new <code>StdPIPResponse</code> with an OK {@link com.att.research.xacml.api.Status} and a copy
- * of the given <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s.
+ * Creates a new <code>StdPIPResponse</code> with an OK {@link org.apache.openaz.xacml.api.Status} and a copy
+ * of the given <code>Collection</code> of {@link org.apache.openaz.xacml.api.Attribute}s.
*
* @param attributes the <code>Attribute</code>s for the new <code>StdPIPResponse</code>.
*/
@@ -104,7 +104,7 @@
}
/**
- * Determines if the given {@link com.att.research.xacml.api.pip.PIPRequest} matches the given {@link com.att.research.xacml.api.Attribute} by
+ * Determines if the given {@link org.apache.openaz.xacml.api.pip.PIPRequest} matches the given {@link org.apache.openaz.xacml.api.Attribute} by
* comparing the category, attribute id, and if not null in the <code>PIPRequest</code>, the issuer.
*
* @param pipRequest the <code>PIPRequest</code> to compare against
@@ -125,8 +125,8 @@
}
/**
- * Gets the subset of the {@link com.att.research.xacml.api.AttributeValue}s from the given <code>Collection</code> whose data type
- * matches the data type in the given {@link com.att.research.xacml.api.pip.PIPRequest}.
+ * Gets the subset of the {@link org.apache.openaz.xacml.api.AttributeValue}s from the given <code>Collection</code> whose data type
+ * matches the data type in the given {@link org.apache.openaz.xacml.api.pip.PIPRequest}.
*
* @param pipRequest the <code>PIPRequest</code> to compare against
* @param listAttributeValues the <code>Collection</code> of <code>AttributeValue</code>s to select from
@@ -171,14 +171,14 @@
}
/**
- * Returns a {@link com.att.research.xacml.api.pip.PIPResponse} that only contains the {@link com.att.research.xacml.api.Attribute}s
- * that match the given {@link com.att.research.xacml.api.pip.PIPRequest} with {@link com.att.research.xacml.api.AttributeValue}s that
+ * Returns a {@link org.apache.openaz.xacml.api.pip.PIPResponse} that only contains the {@link org.apache.openaz.xacml.api.Attribute}s
+ * that match the given {@link org.apache.openaz.xacml.api.pip.PIPRequest} with {@link org.apache.openaz.xacml.api.AttributeValue}s that
* match the requested data type.
*
* @param pipRequest
* @param pipResponse
* @return
- * @throws com.att.research.xacml.api.pip.PIPException
+ * @throws org.apache.openaz.xacml.api.pip.PIPException
*/
public static PIPResponse getMatchingResponse(PIPRequest pipRequest, PIPResponse pipResponse) throws PIPException {
/*
@@ -288,13 +288,13 @@
}
/**
- * Takes a {@link com.att.research.xacml.api.pip.PIPResponse} that may contain {@link com.att.research.xacml.api.Attribute}s, with multiple
- * identifiers, each of which may contain multiple {@link com.att.research.xacml.api.AttributeValue}s with different data types and creates a collection of
+ * Takes a {@link org.apache.openaz.xacml.api.pip.PIPResponse} that may contain {@link org.apache.openaz.xacml.api.Attribute}s, with multiple
+ * identifiers, each of which may contain multiple {@link org.apache.openaz.xacml.api.AttributeValue}s with different data types and creates a collection of
* simple <code>PIPResponse</code>s that contain a single <code>Attribute</code> with <code>AttributeValue</code>s of one data type.
*
* @param pipResponse the <code>PIPResponse</code> to split
* @return a <code>Collection</code> of simple <code>PIPResponse</code>s
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error splitting the response
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error splitting the response
*/
public static Map<PIPRequest,PIPResponse> splitResponse(PIPResponse pipResponse) throws PIPException {
Map<PIPRequest,PIPResponse> map = new HashMap<PIPRequest,PIPResponse>();
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdSinglePIPResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdSinglePIPResponse.java
index b966364..72e3e29 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdSinglePIPResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/StdSinglePIPResponse.java
@@ -28,13 +28,13 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip;
+package org.apache.openaz.xacml.std.pip;
-import com.att.research.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.Attribute;
/**
- * StdSinglePIPResponse extends {@link com.att.research.xacml.std.pip.StdMutablePIPResponse} with methods for
- * retrieving a single {@link com.att.research.xacml.api.Attribute}.
+ * StdSinglePIPResponse extends {@link org.apache.openaz.xacml.std.pip.StdMutablePIPResponse} with methods for
+ * retrieving a single {@link org.apache.openaz.xacml.api.Attribute}.
*
*/
public class StdSinglePIPResponse extends StdMutablePIPResponse {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ConfigurableEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ConfigurableEngine.java
index d73bfb0..8fe44b5 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ConfigurableEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ConfigurableEngine.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines;
+package org.apache.openaz.xacml.std.pip.engines;
import java.util.Properties;
-import com.att.research.xacml.api.pip.PIPEngine;
-import com.att.research.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.api.pip.PIPEngine;
+import org.apache.openaz.xacml.api.pip.PIPException;
/**
- * ConfigurableEngine extends the {@link com.att.research.xacml.api.pip.PIPEngine} interface with methods
+ * ConfigurableEngine extends the {@link org.apache.openaz.xacml.api.pip.PIPEngine} interface with methods
* for configuring the engine from a <code>Properties</code> object.
*
*/
@@ -46,7 +46,7 @@
*
* @param id the <code>String</code> name for this <code>ConfigurableEngine</code> used also to locate properties
* @param properties the <code>Properties</code> containing the configuration parameters for this <code>ConfigurableEngine</code>
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error configuring the <code>ConfigurableEngine</code>
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error configuring the <code>ConfigurableEngine</code>
*/
public void configure(String id, Properties properties) throws PIPException;
}
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ConfigurableResolver.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ConfigurableResolver.java
index 4ef5030..47409e3 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ConfigurableResolver.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ConfigurableResolver.java
@@ -28,13 +28,13 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines;
+package org.apache.openaz.xacml.std.pip.engines;
import java.util.Collection;
import java.util.Properties;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.api.pip.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.api.pip.PIPRequest;
public interface ConfigurableResolver {
/**
@@ -43,7 +43,7 @@
* @param id the <code>String</code> identifier for locating properties for this <code>JDBCResolver</code>
* @param properties the <code>Properties</code> to search for properties
* @param defaultIssuer the default issuer value if none is defined specifically.
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error configuring this <code>JDBCResolver</code>
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error configuring this <code>JDBCResolver</code>
*/
public void configure(String id, Properties properties, String defaultIssuer) throws PIPException;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/Configurables.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/Configurables.java
index cea38e3..230404b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/Configurables.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/Configurables.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines;
+package org.apache.openaz.xacml.std.pip.engines;
import java.util.ArrayList;
import java.util.HashMap;
@@ -40,11 +40,10 @@
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.PIPRequest;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.pip.StdPIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.api.pip.PIPRequest;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.pip.StdPIPRequest;
/**
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/EnvironmentEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/EnvironmentEngine.java
index 1720659..d03df26 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/EnvironmentEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/EnvironmentEngine.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines;
+package org.apache.openaz.xacml.std.pip.engines;
import java.util.ArrayList;
import java.util.Collection;
@@ -36,20 +36,20 @@
import java.util.Date;
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.XACML3;
-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.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacml.std.pip.StdPIPRequest;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.StdSinglePIPResponse;
+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.XACML3;
+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.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.std.pip.StdPIPRequest;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
+import org.apache.openaz.xacml.std.pip.StdSinglePIPResponse;
/**
* EnvironmentEngine implements the {@link com.att.research.xacml.api.pip.PipEngine} interface to provide values
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/RequestEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/RequestEngine.java
index 38b958f..04b2d31 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/RequestEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/RequestEngine.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines;
+package org.apache.openaz.xacml.std.pip.engines;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,23 +38,23 @@
import java.util.List;
import java.util.Set;
-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.Request;
-import com.att.research.xacml.api.RequestAttributes;
-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.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.pip.StdMutablePIPResponse;
-import com.att.research.xacml.std.pip.StdPIPRequest;
-import com.att.research.xacml.std.pip.StdPIPResponse;
+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.Request;
+import org.apache.openaz.xacml.api.RequestAttributes;
+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.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.pip.StdMutablePIPResponse;
+import org.apache.openaz.xacml.std.pip.StdPIPRequest;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
/**
- * StdRequestEngine implements the {@link com.att.research.xacml.api.pip.PIPEngine} interface to retrieve
+ * StdRequestEngine implements the {@link org.apache.openaz.xacml.api.pip.PIPEngine} interface to retrieve
* matching {@link com.att.reserach.xacml.api.Attribute}s from a {@link com.att.research.xacml.pip.Request} object.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/StdConfigurableEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/StdConfigurableEngine.java
index f930da6..a05c139 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/StdConfigurableEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/StdConfigurableEngine.java
@@ -28,12 +28,13 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines;
+package org.apache.openaz.xacml.std.pip.engines;
import java.util.Properties;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/CSVEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/CSVEngine.java
index 092491f..8b2bc2b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/CSVEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/CSVEngine.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.csv;
+package org.apache.openaz.xacml.std.pip.engines.csv;
import java.io.File;
import java.io.FileReader;
@@ -43,25 +43,25 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+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.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.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.pip.StdMutablePIPResponse;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
+import org.apache.openaz.xacml.std.pip.engines.StdConfigurableEngine;
+import org.apache.openaz.xacml.util.AttributeUtils;
+import org.apache.openaz.xacml.util.FactoryException;
import au.com.bytecode.opencsv.CSVReader;
-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.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.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.pip.StdMutablePIPResponse;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
-import com.att.research.xacml.util.AttributeUtils;
-import com.att.research.xacml.util.FactoryException;
import com.google.common.base.Splitter;
public class CSVEngine extends StdConfigurableEngine {
@@ -124,7 +124,7 @@
*
* @param id
* @param properties
- * @throws com.att.research.xacml.api.pip.PIPException
+ * @throws org.apache.openaz.xacml.api.pip.PIPException
*/
private void readCSVFileConfiguration(String id, Properties properties) throws PIPException {
@@ -241,12 +241,12 @@
}
/**
- * Creates a new {@link com.att.research.xacml.std.pip.engines.csv.CSVResolver} by looking up the "classname"
+ * Creates a new {@link org.apache.openaz.xacml.std.pip.engines.csv.CSVResolver} by looking up the "classname"
* property for the given <code>String</code> resolver ID and then calling its <code>configure</code> method.
*
* @param resolverId the <code>String</code> identifier of the resolver to configure
* @param properties the <code>Properties</code> to search for the "classname" and any resolver-specific properties
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error creating the <code>CSVResolver</code>.
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error creating the <code>CSVResolver</code>.
*/
protected void createResolver(String resolverId, Properties properties) throws PIPException {
String propPrefix = resolverId + ".";
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/CSVResolver.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/CSVResolver.java
index f90c753..48c3875 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/CSVResolver.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/CSVResolver.java
@@ -28,18 +28,18 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.csv;
+package org.apache.openaz.xacml.std.pip.engines.csv;
import java.util.List;
import java.util.Map;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeValue;
-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.PIPRequest;
-import com.att.research.xacml.std.pip.engines.ConfigurableResolver;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeValue;
+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.PIPRequest;
+import org.apache.openaz.xacml.std.pip.engines.ConfigurableResolver;
/**
* CSVResolver is the interface used by the {@link CSVEngine} to
@@ -67,7 +67,7 @@
* @param request
* @param finder
* @return
- * @throws com.att.research.xacml.api.pip.PIPException
+ * @throws org.apache.openaz.xacml.api.pip.PIPException
*/
Map<Integer, List<AttributeValue<?>>> getColumnParameterValues(PIPEngine engine, PIPRequest request, PIPFinder finder) throws PIPException;
@@ -76,7 +76,7 @@
*
* @param line - line read from CSV file broken into fields.
* @return list of attributes
- * @throws com.att.research.xacml.api.pip.PIPException
+ * @throws org.apache.openaz.xacml.api.pip.PIPException
*/
List<Attribute> decodeResult(String[] line) throws PIPException;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/ConfigurableCSVResolver.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/ConfigurableCSVResolver.java
index 2bbf13b..c56a6cc 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/ConfigurableCSVResolver.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/ConfigurableCSVResolver.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.csv;
+package org.apache.openaz.xacml.std.pip.engines.csv;
import java.util.ArrayList;
import java.util.Collection;
@@ -39,22 +39,22 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+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.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.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.pip.StdPIPRequest;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
+import org.apache.openaz.xacml.std.pip.engines.Configurables;
+import org.apache.openaz.xacml.util.FactoryException;
-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.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.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.pip.StdPIPRequest;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.engines.Configurables;
-import com.att.research.xacml.util.FactoryException;
import com.google.common.base.Splitter;
public class ConfigurableCSVResolver implements CSVResolver {
@@ -95,7 +95,7 @@
*
* @param id
* @param properties
- * @throws com.att.research.xacml.api.pip.PIPException
+ * @throws org.apache.openaz.xacml.api.pip.PIPException
*/
private void readSearchParameters(String id, Properties properties) throws PIPException {
String parameterNamesString = properties.getProperty(id + "." + PROP_PARAMETERS);
@@ -137,7 +137,7 @@
*
* @param id
* @param properties
- * @throws com.att.research.xacml.api.pip.PIPException
+ * @throws org.apache.openaz.xacml.api.pip.PIPException
*/
private void readPIPRequestFieldDefinitions(String id, Properties properties) throws PIPException {
String fieldNamesString = properties.getProperty(id + ".fields");
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/HyperCSVEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/HyperCSVEngine.java
index eebaab6..ba9f7a7 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/HyperCSVEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/HyperCSVEngine.java
@@ -28,18 +28,16 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.csv;
+package org.apache.openaz.xacml.std.pip.engines.csv;
import java.util.Properties;
-
import java.nio.file.FileSystems;
-
import java.sql.Connection;
import java.sql.Statement;
import java.sql.SQLException;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.std.pip.engines.jdbc.JDBCEngine;
+import org.apache.openaz.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.std.pip.engines.jdbc.JDBCEngine;
public class HyperCSVEngine extends JDBCEngine {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/XacmlCSVEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/XacmlCSVEngine.java
index e8c93b5..41dda06 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/XacmlCSVEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/csv/XacmlCSVEngine.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.csv;
+package org.apache.openaz.xacml.std.pip.engines.csv;
import java.io.BufferedReader;
import java.io.File;
@@ -48,25 +48,24 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-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.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.std.IdentifierImpl;
-import com.att.research.xacml.std.StdMutableAttribute;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.engines.ConfigurableEngine;
-import com.att.research.xacml.util.FactoryException;
+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.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.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdMutableAttribute;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
+import org.apache.openaz.xacml.std.pip.engines.ConfigurableEngine;
+import org.apache.openaz.xacml.util.FactoryException;
/**
- * CSVPIPEngine implements the {@link com.att.research.xacml.api.pip.PIPFinder} interface to find attributes
+ * CSVPIPEngine implements the {@link org.apache.openaz.xacml.api.pip.PIPFinder} interface to find attributes
* loaded from a text file containing the following fields:
* category-id,attribute-id,datatype-id,issuer,value
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/ConfigurableJDBCResolver.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/ConfigurableJDBCResolver.java
index bd286f5..9629948 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/ConfigurableJDBCResolver.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/ConfigurableJDBCResolver.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.jdbc;
+package org.apache.openaz.xacml.std.pip.engines.jdbc;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -45,24 +45,24 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+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.DataTypeFactory;
+import org.apache.openaz.xacml.api.Identifier;
+import org.apache.openaz.xacml.api.XACML3;
+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.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.std.StdAttribute;
+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.pip.StdPIPRequest;
+import org.apache.openaz.xacml.std.pip.engines.Configurables;
-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.DataTypeFactory;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.XACML3;
-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.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.StdAttribute;
-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.pip.StdPIPRequest;
-import com.att.research.xacml.std.pip.engines.Configurables;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
@@ -96,7 +96,7 @@
}
/**
- * Determines if the given {@link com.att.research.xacml.api.pip.PIPRequest} can be answered with this <code>ConfigurableJDBCResolver</code>.
+ * Determines if the given {@link org.apache.openaz.xacml.api.pip.PIPRequest} can be answered with this <code>ConfigurableJDBCResolver</code>.
*
* @param pipRequest the <code>PIPRequest</code> to check
* @return true if the given <code>PIPRequest</code> is supported by this <code>ConfigurableJDBCResolver</code>, else false
@@ -378,11 +378,11 @@
}
/**
- * Creates an {@link com.att.research.xacml.api.Attribute} from the value associated with the field with the given <code>fieldName</code>.
+ * Creates an {@link org.apache.openaz.xacml.api.Attribute} from the value associated with the field with the given <code>fieldName</code>.
*
* @param resultSet the {@link java.sql.ResultSet} containing the current row from the database
* @param fieldName the <code>String</code> name of the field containing the attribute value
- * @param pipRequestAttribute the {@link com.att.research.xacml.api.pip.PIPRequest} for the <code>Attribute</code> to create
+ * @param pipRequestAttribute the {@link org.apache.openaz.xacml.api.pip.PIPRequest} for the <code>Attribute</code> to create
* @return a new <code>Attribute</code> with the value of the given <code>fieldName</code>.
*/
protected Attribute getAttributeFromResultSet(ResultSet resultSet, String fieldName, PIPRequest pipRequestAttribute) {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/JDBCEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/JDBCEngine.java
index 6ea97db..60d6baa 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/JDBCEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/JDBCEngine.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.jdbc;
+package org.apache.openaz.xacml.std.pip.engines.jdbc;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -49,21 +49,21 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Attribute;
+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.std.pip.StdMutablePIPResponse;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
+import org.apache.openaz.xacml.std.pip.engines.StdConfigurableEngine;
+import org.apache.openaz.xacml.util.AttributeUtils;
-import com.att.research.xacml.api.Attribute;
-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.std.pip.StdMutablePIPResponse;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
-import com.att.research.xacml.util.AttributeUtils;
import com.google.common.base.Splitter;
import com.google.common.cache.Cache;
/**
- * PIPEgineJDBC extends {@link com.att.research.xacml.std.pip.engines.StdConfigurableEngine} to implement a PIP that
+ * PIPEgineJDBC extends {@link org.apache.openaz.xacml.std.pip.engines.StdConfigurableEngine} to implement a PIP that
* retrieves XACML attributes from a database using JDBC. This is a minimal implementation that does not do any caching of
* results. It does not perform JDBC connection pooling either.
*
@@ -112,7 +112,7 @@
* connection pooling or other connection reuse optimizations here.
*
* @return a <code>Connection</code> to use to execute the query
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error creating the JDBC <code>Connection</code>.
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error creating the JDBC <code>Connection</code>.
*/
protected Connection getConnection() throws PIPException {
/*
@@ -284,12 +284,12 @@
}
/**
- * Creates a new {@link com.att.research.xacml.std.pip.engines.jdbc.JDBCResolver} by looking up the "classname"
+ * Creates a new {@link org.apache.openaz.xacml.std.pip.engines.jdbc.JDBCResolver} by looking up the "classname"
* property for the given <code>String</code> resolver ID and then calling its <code>configure</code> method.
*
* @param resolverId the <code>String</code> identifier of the resolver to configure
* @param properties the <code>Properties</code> to search for the "classname" and any resolver-specific properties
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error creating the <code>JDBCResolver</code>.
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error creating the <code>JDBCResolver</code>.
*/
protected void createResolver(String resolverId, Properties properties) throws PIPException {
String propPrefix = resolverId + ".";
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/JDBCResolver.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/JDBCResolver.java
index e20a9cf..678167c 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/JDBCResolver.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/JDBCResolver.java
@@ -28,19 +28,19 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.jdbc;
+package org.apache.openaz.xacml.std.pip.engines.jdbc;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.List;
-import com.att.research.xacml.api.Attribute;
-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.PIPRequest;
-import com.att.research.xacml.std.pip.engines.ConfigurableResolver;
+import org.apache.openaz.xacml.api.Attribute;
+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.PIPRequest;
+import org.apache.openaz.xacml.std.pip.engines.ConfigurableResolver;
/**
* JDBCResolver is the interface used by the {@link JDBCEngine} to
@@ -54,17 +54,17 @@
* Creates a {@link java.sql.PreparedStatement} for a SQL SELECT statement that will retrieve the data
* used to generate the XACML AttributeValues.
*
- * @param pipEngine the {@link com.att.research.xacml.api.pip.PIPEngine} making the request for XACML AttributeValues
- * @param pipRequest the {@link com.att.research.xacml.api.pip.PIPRequest} with the requested XACML Attributes
- * @param pipFinder the {@link com.att.research.xacml.api.pip.PIPFinder} for finding any other XACML AttributeValues required to build the query.
+ * @param pipEngine the {@link org.apache.openaz.xacml.api.pip.PIPEngine} making the request for XACML AttributeValues
+ * @param pipRequest the {@link org.apache.openaz.xacml.api.pip.PIPRequest} with the requested XACML Attributes
+ * @param pipFinder the {@link org.apache.openaz.xacml.api.pip.PIPFinder} for finding any other XACML AttributeValues required to build the query.
* @param connection the {@link java.sql.Connection} needed to create the <code>PreparedStatement</code>
* @return a <code>PreparedStatement</code> to query the database for the required XACML AttributeValues.
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error creating the <code>PreparedStatement</code>
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error creating the <code>PreparedStatement</code>
*/
public PreparedStatement getPreparedStatement(PIPEngine pipEngine, PIPRequest pipRequest, PIPFinder pipFinder, Connection connection) throws PIPException;
/**
- * Creates a <code>List</code> of {@link com.att.research.xacml.api.Attribute}s from the given {@link java.sql.ResultSet}
+ * Creates a <code>List</code> of {@link org.apache.openaz.xacml.api.Attribute}s from the given {@link java.sql.ResultSet}
* returned by a SQL SELECT statement. The <code>ResultSet</code> should already be positioned at the first element to decode.
* The implementation may choose to decode multiple results before returning or may only decode the current result. The implementation
* should leave the cursor on the last result decoded.
@@ -72,7 +72,7 @@
* @param resultSet the <code>ResultSet</code> returned from a SQL SELECT statement.
* @return a new <code>List</code> of <code>Attribute</code>s generated by parsing the given <code>ResultSet</code> or an empty
* <code>List</code> if there are no results.
- * @throws com.att.research.xacml.api.pip.PIPException
+ * @throws org.apache.openaz.xacml.api.pip.PIPException
*/
public List<Attribute> decodeResult(ResultSet resultSet) throws PIPException;
}
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/package-info.java
index 3e2ecb5..f2fafa6 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/jdbc/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.jdbc;
+package org.apache.openaz.xacml.std.pip.engines.jdbc;
/**
* com.att.research.xacml.std.pip.engines contains an implementation of the {@link com.att.research.xacml.api.pip.PIPEngine}
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/ConfigurableLDAPResolver.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/ConfigurableLDAPResolver.java
index eb8b803..d09bf4d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/ConfigurableLDAPResolver.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/ConfigurableLDAPResolver.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.ldap;
+package org.apache.openaz.xacml.std.pip.engines.ldap;
import java.io.StringWriter;
import java.util.ArrayList;
@@ -42,12 +42,34 @@
import java.util.regex.Pattern;
+
+
+
+
+
+
+
//import javax.naming.directory.Attribute;
import javax.naming.NamingException;
import javax.naming.directory.SearchResult;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+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.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.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.std.StdAttribute;
+import org.apache.openaz.xacml.std.datatypes.DataTypes;
+import org.apache.openaz.xacml.std.pip.StdPIPRequest;
+import org.apache.openaz.xacml.std.pip.engines.Configurables;
+import org.apache.openaz.xacml.util.FactoryException;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.event.EventCartridge;
@@ -56,22 +78,6 @@
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
-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.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.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.StdAttribute;
-import com.att.research.xacml.std.datatypes.DataTypes;
-import com.att.research.xacml.std.pip.StdPIPRequest;
-import com.att.research.xacml.std.pip.engines.Configurables;
-import com.att.research.xacml.util.FactoryException;
-
public class ConfigurableLDAPResolver implements LDAPResolver {
private static DataTypeFactory dataTypeFactory = null;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/LDAPEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/LDAPEngine.java
index 724536c..5756652 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/LDAPEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/LDAPEngine.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.ldap;
+package org.apache.openaz.xacml.std.pip.engines.ldap;
import java.util.ArrayList;
import java.util.Collection;
@@ -48,20 +48,20 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Attribute;
+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.std.pip.StdMutablePIPResponse;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
+import org.apache.openaz.xacml.std.pip.engines.StdConfigurableEngine;
-import com.att.research.xacml.api.Attribute;
-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.std.pip.StdMutablePIPResponse;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
import com.google.common.base.Splitter;
import com.google.common.cache.Cache;
/**
- * LDAPEngine extends {@link com.att.research.xacml.std.pip.engines.StdConfigurableEngine} to implement a generic PIP for accessing
+ * LDAPEngine extends {@link org.apache.openaz.xacml.std.pip.engines.StdConfigurableEngine} to implement a generic PIP for accessing
* data from and LDAP server, including a configurable cache to avoid repeat queries.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/LDAPResolver.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/LDAPResolver.java
index 73d28f9..b88fe9c 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/LDAPResolver.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/LDAPResolver.java
@@ -28,32 +28,32 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.ldap;
+package org.apache.openaz.xacml.std.pip.engines.ldap;
import java.util.List;
import javax.naming.directory.SearchResult;
-import com.att.research.xacml.api.Attribute;
-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.PIPRequest;
-import com.att.research.xacml.std.pip.engines.ConfigurableResolver;
+import org.apache.openaz.xacml.api.Attribute;
+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.PIPRequest;
+import org.apache.openaz.xacml.std.pip.engines.ConfigurableResolver;
/**
* LDAPResolver is the interface used by the {@link LDAPEngine} to convert
* a request for a XACML attribute into an LDAP query string, including retrieving any required attributes needed to construct
- * the query string, and convert the response into a collection of {@link com.att.research.xacml.api.Attribute}s.
+ * the query string, and convert the response into a collection of {@link org.apache.openaz.xacml.api.Attribute}s.
*
*/
public interface LDAPResolver extends ConfigurableResolver {
/**
* Gets the base <code>String</code> to be used in the <code>search</code> method of a {@link javax.naming.directory.DirectoryContext}.
*
- * @param pipEngine the {@link com.att.research.xacml.api.pip.PIPEngine} making the request
+ * @param pipEngine the {@link org.apache.openaz.xacml.api.pip.PIPEngine} making the request
* @param pipRequest the <code>PIPRequest</code> to convert
- * @param pipFinder the {@link com.att.research.xacml.api.pip.PIPFinder} to use when resolving required attributes
+ * @param pipFinder the {@link org.apache.openaz.xacml.api.pip.PIPFinder} to use when resolving required attributes
* @return the base <code>String</code> or null if the <code>PIPRequest</code> cannot be satisfied by this <code>LDAPResolver</code>
*/
public String getBase(PIPEngine pipEngine, PIPRequest pipRequest, PIPFinder pipFinder) throws PIPException;
@@ -66,16 +66,16 @@
* @param pipRequest the <code>PIPRequest</code> to convert
* @param pipFinder the <code>PIPFinder</code> to use when resolving required attributes
* @return the filter string to use or null if the given <code>PIPRequest</code> cannot be satisfied by this <code>LDAPResolver</code>
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error retrieving any required attributes
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error retrieving any required attributes
*/
public String getFilterString(PIPEngine pipEngine, PIPRequest pipRequest, PIPFinder pipFinder) throws PIPException;
/**
- * Converts a {@link javax.naming.directory.SearchResult} into a <code>List</code> of {@link com.att.research.xacml.api.Attribute}s.
+ * Converts a {@link javax.naming.directory.SearchResult} into a <code>List</code> of {@link org.apache.openaz.xacml.api.Attribute}s.
*
* @param searchResult the <code>SearchResult</code> to convert
* @return a <code>List</code> of <code>Attribute</code>s or null if the <code>SearchResult</code> connot be converted.
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error decoding the <code>SearchResult</code>
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error decoding the <code>SearchResult</code>
*/
public List<Attribute> decodeResult(SearchResult searchResult) throws PIPException;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/package-info.java
index a42060e..0a14c7b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/ldap/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines.ldap;
+package org.apache.openaz.xacml.std.pip.engines.ldap;
/**
* com.att.research.xacml.std.pip.engines.ldap contains an implementation of the {@link com.att.research.xacml.api.pip.PIPEngine}
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/package-info.java
index 6b1bb1c..93f18cd 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/engines/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.engines;
+package org.apache.openaz.xacml.std.pip.engines;
/**
* com.att.research.xacml.std.pip.engines contains the standard implementation of the PIPEngine interface
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/ConfigurableEngineFinder.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/ConfigurableEngineFinder.java
index 9d97ac2..edaefe1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/ConfigurableEngineFinder.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/ConfigurableEngineFinder.java
@@ -28,18 +28,17 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.finders;
+package org.apache.openaz.xacml.std.pip.finders;
import java.util.Collection;
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.PIPRequest;
-import com.att.research.xacml.std.pip.engines.ConfigurableEngine;
-import com.att.research.xacml.util.AttributeUtils;
+import org.apache.openaz.xacml.api.pip.PIPException;
+import org.apache.openaz.xacml.api.pip.PIPRequest;
+import org.apache.openaz.xacml.std.pip.engines.ConfigurableEngine;
+import org.apache.openaz.xacml.util.AttributeUtils;
/**
* ConfigurableEngineFinder extends {@link EngineFinder} with a method for configuring
@@ -58,7 +57,7 @@
*
* @param className the <code>String</code> class name of the engine
* @return an instance of the given class name
- * @throws com.att.research.xacml.api.pip.PIPException
+ * @throws org.apache.openaz.xacml.api.pip.PIPException
*/
protected ConfigurableEngine newEngine(String className) throws PIPException {
Class<?> classForEngine = null;
@@ -119,7 +118,7 @@
* the list of PIP engines that should be created, configured, and registered.
*
* @param properties the <code>Properties</code> containing the engine configurations
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error creating and configuring the engines
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error creating and configuring the engines
*/
public void configure(Properties properties) throws PIPException {
String engineIds = properties.getProperty(PROP_PIP_ENGINES);
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/EngineFinder.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/EngineFinder.java
index 9d3ef1f..3f49748 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/EngineFinder.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/EngineFinder.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.finders;
+package org.apache.openaz.xacml.std.pip.finders;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,20 +38,20 @@
import java.util.List;
import java.util.Map;
-import com.att.research.xacml.api.Status;
-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.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.pip.StdMutablePIPResponse;
-import com.att.research.xacml.std.pip.StdPIPResponse;
+import org.apache.openaz.xacml.api.Status;
+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.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.std.StdStatus;
+import org.apache.openaz.xacml.std.StdStatusCode;
+import org.apache.openaz.xacml.std.pip.StdMutablePIPResponse;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
/**
- * EngineFinder implements the {@link com.att.research.xacml.api.pip.PIPFinder} interface by maintaining a simple list of
- * registered {@link com.att.research.xacml.api.pip.PIPEngine} objects.
+ * EngineFinder implements the {@link org.apache.openaz.xacml.api.pip.PIPFinder} interface by maintaining a simple list of
+ * registered {@link org.apache.openaz.xacml.api.pip.PIPEngine} objects.
*
*/
public class EngineFinder implements PIPFinder {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/RequestFinder.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/RequestFinder.java
index 12228b9..0edf3bf 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/RequestFinder.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/RequestFinder.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.finders;
+package org.apache.openaz.xacml.std.pip.finders;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,20 +38,20 @@
import java.util.List;
import java.util.Map;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.api.XACML3;
-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.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.engines.EnvironmentEngine;
-import com.att.research.xacml.std.pip.engines.RequestEngine;
+import org.apache.openaz.xacml.api.Status;
+import org.apache.openaz.xacml.api.XACML3;
+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.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
+import org.apache.openaz.xacml.std.pip.engines.EnvironmentEngine;
+import org.apache.openaz.xacml.std.pip.engines.RequestEngine;
/**
- * RequestFinder implements the {@link com.att.research.xacml.api.pip.PIPFinder} interface by wrapping another
- * <code>PIPFinder</code> a {@link com.att.research.xacml.std.pip.engines.RequestEngine} and a {@link com.att.research.xacml.std.pip.engines.EnvironmentEngine}.
+ * RequestFinder implements the {@link org.apache.openaz.xacml.api.pip.PIPFinder} interface by wrapping another
+ * <code>PIPFinder</code> a {@link org.apache.openaz.xacml.std.pip.engines.RequestEngine} and a {@link org.apache.openaz.xacml.std.pip.engines.EnvironmentEngine}.
* When attributes are requested, the
* <code>RequestEngine</code> is searched first, followed by the <code>EnvironmentEngine</code> and if no results are found, the wrapped <code>PIPFinder</code> is searched.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/WrappingFinder.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/WrappingFinder.java
index d17ba7b..f0fcef9 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/WrappingFinder.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/WrappingFinder.java
@@ -28,17 +28,17 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.finders;
+package org.apache.openaz.xacml.std.pip.finders;
-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.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.pip.StdPIPResponse;
+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.PIPRequest;
+import org.apache.openaz.xacml.api.pip.PIPResponse;
+import org.apache.openaz.xacml.std.pip.StdPIPResponse;
/**
- * WrappingFinder implements {@link com.att.research.xacml.api.pip.PIPFinder} by wrapping another
+ * WrappingFinder implements {@link org.apache.openaz.xacml.api.pip.PIPFinder} by wrapping another
* <code>PIPFinder</code> to intercept calls to <code>getAttributes</code> and do some other processing
* before calling it on the wrapped <code>PIPFinder</code>.
*
@@ -55,14 +55,14 @@
}
/**
- * Gets the {@link com.att.research.xacml.api.pip.PIPResponse} from the <code>getAttributes</code> call on the wrapped
+ * Gets the {@link org.apache.openaz.xacml.api.pip.PIPResponse} from the <code>getAttributes</code> call on the wrapped
* <code>PIPFinder</code>, using the given <code>PIPFinder</code> as the root for recursive calls.
*
* @param pipRequest the <code>PIPRequest</code>
* @param exclude the <code>PIPEngine</code> to exclude from recursive calls
* @param pipFinderParent the <code>PIPFinder</code> to start from for recursive calls
* @return the <code>PIPResponse</code> from the wrapped <code>PIPFinder</code> or the empty <code>PIPResponse</code> if there is no wrapped <code>PIPFinder</code>
- * @throws com.att.research.xacml.api.pip.PIPException if there is an error getting attributes from the wrapped <code>PIPFinder</code>
+ * @throws org.apache.openaz.xacml.api.pip.PIPException if there is an error getting attributes from the wrapped <code>PIPFinder</code>
*/
protected PIPResponse getAttributesWrapped(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent) throws PIPException {
PIPFinder thisWrappedFinder = this.getWrappedFinder();
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/package-info.java
index fd29be2..7248377 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/finders/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip.finders;
+package org.apache.openaz.xacml.std.pip.finders;
/**
* com.att.research.xacml.std.pip.finders contains the standard implementation of the PIPFinder interface
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/package-info.java
index b63f1cb..74f6e83 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/pip/package-info.java
@@ -29,7 +29,7 @@
* All Rights Reserved
*/
-package com.att.research.xacml.std.pip;
+package org.apache.openaz.xacml.std.pip;
/**
* com.att.research.xacml.std.pip contains the standard implementation of the PIP interface
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/LoggingTraceEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/LoggingTraceEngine.java
index c624b3e..5d02595 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/LoggingTraceEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/LoggingTraceEngine.java
@@ -28,19 +28,18 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.trace;
+package org.apache.openaz.xacml.std.trace;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import com.att.research.xacml.api.trace.TraceEngine;
-import com.att.research.xacml.api.trace.TraceEvent;
-import com.att.research.xacml.api.trace.Traceable;
+import org.apache.openaz.xacml.api.trace.TraceEngine;
+import org.apache.openaz.xacml.api.trace.TraceEvent;
+import org.apache.openaz.xacml.api.trace.Traceable;
/**
- * Implements the {@link com.att.research.xacml.api.trace.TraceEngine} interface to log {@link com.att.research.xacml.api.trace.TraceEvent}s
+ * Implements the {@link org.apache.openaz.xacml.api.trace.TraceEngine} interface to log {@link org.apache.openaz.xacml.api.trace.TraceEvent}s
* using the Apache Commons logging system with debug messages.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/LoggingTraceEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/LoggingTraceEngineFactory.java
index 9d794b5..8ba79b4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/LoggingTraceEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/LoggingTraceEngineFactory.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.trace;
+package org.apache.openaz.xacml.std.trace;
import java.util.Properties;
-import com.att.research.xacml.api.trace.TraceEngine;
-import com.att.research.xacml.api.trace.TraceEngineFactory;
+import org.apache.openaz.xacml.api.trace.TraceEngine;
+import org.apache.openaz.xacml.api.trace.TraceEngineFactory;
/**
- * Extends the {@link com.att.research.xacml.api.trace.TraceEngineFactory} class to implement the <code>getTraceEngine</code> method to return
+ * Extends the {@link org.apache.openaz.xacml.api.trace.TraceEngineFactory} class to implement the <code>getTraceEngine</code> method to return
* an instance of the {@link LoggingTraceEngine} class.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/NullTraceEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/NullTraceEngine.java
index 7caef4f..6a7237a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/NullTraceEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/NullTraceEngine.java
@@ -28,16 +28,16 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.trace;
+package org.apache.openaz.xacml.std.trace;
import java.util.Properties;
-import com.att.research.xacml.api.trace.TraceEngine;
-import com.att.research.xacml.api.trace.TraceEvent;
+import org.apache.openaz.xacml.api.trace.TraceEngine;
+import org.apache.openaz.xacml.api.trace.TraceEvent;
/**
- * Implements the {@link com.att.research.xacml.api.trace.TraceEngine} interface to just ignore {@link com.att.research.xacml.api.trace.TraceEvent}s.
- * This is the default implementation, returned by the default {@link com.att.research.xacml.api.trace.TraceEngineFactory}.
+ * Implements the {@link org.apache.openaz.xacml.api.trace.TraceEngine} interface to just ignore {@link org.apache.openaz.xacml.api.trace.TraceEvent}s.
+ * This is the default implementation, returned by the default {@link org.apache.openaz.xacml.api.trace.TraceEngineFactory}.
*
*/
public class NullTraceEngine implements TraceEngine {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/NullTraceEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/NullTraceEngineFactory.java
index bd64dbd..3bc74b2 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/NullTraceEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/NullTraceEngineFactory.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.trace;
+package org.apache.openaz.xacml.std.trace;
import java.util.Properties;
-import com.att.research.xacml.api.trace.TraceEngine;
-import com.att.research.xacml.api.trace.TraceEngineFactory;
+import org.apache.openaz.xacml.api.trace.TraceEngine;
+import org.apache.openaz.xacml.api.trace.TraceEngineFactory;
/**
- * Extends the {@link com.att.research.xacml.api.trace.TraceEngineFactory} class to implement the <code>getTraceEngine</code> method to return
+ * Extends the {@link org.apache.openaz.xacml.api.trace.TraceEngineFactory} class to implement the <code>getTraceEngine</code> method to return
* an instance of the {@link NullTraceEngine} class.
*
*/
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/StdTraceEvent.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/StdTraceEvent.java
index c6d08ee..1aa93ad 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/StdTraceEvent.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/StdTraceEvent.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.std.trace;
+package org.apache.openaz.xacml.std.trace;
import java.util.Date;
-import com.att.research.xacml.api.trace.TraceEvent;
-import com.att.research.xacml.api.trace.Traceable;
+import org.apache.openaz.xacml.api.trace.TraceEvent;
+import org.apache.openaz.xacml.api.trace.Traceable;
/**
- * Immutable implementation of the {@link com.att.research.xacml.api.trace.TraceEvent} interface.
+ * Immutable implementation of the {@link org.apache.openaz.xacml.api.trace.TraceEvent} interface.
*
*
* @param <T>
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/package-info.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/package-info.java
index b8b0521..ce4478e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/package-info.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/trace/package-info.java
@@ -30,7 +30,7 @@
*/
/**
- * Provides standard implementations of the interfaces defined in the {@link com.att.research.xacml.api.trace} package.
+ * Provides standard implementations of the interfaces defined in the {@link org.apache.openaz.xacml.api.trace} package.
*
*/
-package com.att.research.xacml.std.trace;
+package org.apache.openaz.xacml.std.trace;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/AttributeUtils.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/AttributeUtils.java
index 06af475..6720c80 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/AttributeUtils.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/AttributeUtils.java
@@ -28,15 +28,15 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Request;
-import com.att.research.xacml.api.RequestAttributes;
-import com.att.research.xacml.api.RequestDefaults;
-import com.att.research.xacml.api.RequestReference;
-import com.att.research.xacml.api.pip.PIPRequest;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeValue;
+import org.apache.openaz.xacml.api.Request;
+import org.apache.openaz.xacml.api.RequestAttributes;
+import org.apache.openaz.xacml.api.RequestDefaults;
+import org.apache.openaz.xacml.api.RequestReference;
+import org.apache.openaz.xacml.api.pip.PIPRequest;
public class AttributeUtils {
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/CalendarTest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/CalendarTest.java
index 61ff31e..8ffe12b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/CalendarTest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/CalendarTest.java
@@ -18,7 +18,7 @@
*
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.util.Calendar;
import java.util.TimeZone;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/FactoryException.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/FactoryException.java
index 1eb57ec..7668688 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/FactoryException.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/FactoryException.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
public class FactoryException extends Exception {
private static final long serialVersionUID = -6575223164395937720L;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/FactoryFinder.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/FactoryFinder.java
index c2a0b59..090fd21 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/FactoryFinder.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/FactoryFinder.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/ListUtil.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/ListUtil.java
index 931ae2d..64f9b54 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/ListUtil.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/ListUtil.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.util.Collection;
import java.util.Iterator;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/ObjUtil.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/ObjUtil.java
index ed584d0..b2ac739 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/ObjUtil.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/ObjUtil.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/StringUtils.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/StringUtils.java
index a354562..e33e000 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/StringUtils.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/StringUtils.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.util.Iterator;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/Wrapper.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/Wrapper.java
index f3b1526..72cc854 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/Wrapper.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/Wrapper.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
/**
* Defines an object that delegates its <code>equals</code>, <code>hashCode</code> and <code>toString</code> methods to
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLObjectCopy.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLObjectCopy.java
index 276f14c..a86393a 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLObjectCopy.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLObjectCopy.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.util.List;
import java.util.Map;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyAggregator.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyAggregator.java
index 52be9d6..5c10b0d 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyAggregator.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyAggregator.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -43,6 +43,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Advice;
+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.Obligation;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdAttribute;
+import org.apache.openaz.xacml.std.StdAttributeValue;
+import org.apache.openaz.xacml.util.XACMLPolicyScanner.CallbackResult;
+import org.apache.openaz.xacml.util.XACMLPolicyScanner.SimpleCallback;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AdviceExpressionType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.ApplyType;
@@ -58,17 +68,6 @@
import oasis.names.tc.xacml._3_0.core.schema.wd_17.VariableDefinitionType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.VariableReferenceType;
-import com.att.research.xacml.api.Advice;
-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.Obligation;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdAttribute;
-import com.att.research.xacml.std.StdAttributeValue;
-import com.att.research.xacml.util.XACMLPolicyScanner.CallbackResult;
-import com.att.research.xacml.util.XACMLPolicyScanner.SimpleCallback;
-
/**
* This class extends the SimpleCallback class and aggregates specific data items in a policy.
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyScanner.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyScanner.java
index 56509ce..296e806 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyScanner.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyScanner.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.io.IOException;
import java.io.InputStream;
@@ -64,22 +64,21 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.api.Advice;
+import org.apache.openaz.xacml.api.Attribute;
+import org.apache.openaz.xacml.api.AttributeAssignment;
+import org.apache.openaz.xacml.api.Obligation;
+import org.apache.openaz.xacml.std.IdentifierImpl;
+import org.apache.openaz.xacml.std.StdAttribute;
+import org.apache.openaz.xacml.std.StdAttributeAssignment;
+import org.apache.openaz.xacml.std.StdAttributeValue;
+import org.apache.openaz.xacml.std.StdMutableAdvice;
+import org.apache.openaz.xacml.std.StdMutableObligation;
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.Advice;
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.Obligation;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdAttribute;
-import com.att.research.xacml.std.StdAttributeAssignment;
-import com.att.research.xacml.std.StdAttributeValue;
-import com.att.research.xacml.std.StdMutableAdvice;
-import com.att.research.xacml.std.StdMutableObligation;
-
/**
* class XACMLPolicyScanner
*
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyWriter.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyWriter.java
index 22377b6..3d270b4 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyWriter.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLPolicyWriter.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.io.OutputStream;
import java.nio.file.Files;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLProperties.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLProperties.java
index 5e15a51..3ab28ee 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLProperties.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLProperties.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.io.File;
import java.io.FileInputStream;
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLRepair.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLRepair.java
index 59420bc..48c836b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLRepair.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLRepair.java
@@ -28,7 +28,7 @@
* Unpublished and Not for Publication
* All Rights Reserved
*/
-package com.att.research.xacml.util;
+package org.apache.openaz.xacml.util;
import java.io.File;
import java.io.FileInputStream;
@@ -41,12 +41,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.openaz.xacml.std.dom.DOMDocumentRepair;
+import org.apache.openaz.xacml.std.dom.DOMStructureException;
+import org.apache.openaz.xacml.std.dom.DOMUtil;
import org.w3c.dom.Document;
-import com.att.research.xacml.std.dom.DOMDocumentRepair;
-import com.att.research.xacml.std.dom.DOMStructureException;
-import com.att.research.xacml.std.dom.DOMUtil;
-
/**
* XACMLRepair is an application class that can load individual XACML documents or directories of XACML documents, make any needed
* repairs on them, and write them back out to an output file or directory.
diff --git a/openaz-xacml/src/main/resources/xacml.properties b/openaz-xacml/src/main/resources/xacml.properties
index 8394be9..b46b095 100755
--- a/openaz-xacml/src/main/resources/xacml.properties
+++ b/openaz-xacml/src/main/resources/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/pom.xml b/pom.xml
index 65ab5ba..c832063 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openliberty.openaz</groupId>
+ <groupId>org.apache.openaz</groupId>
<artifactId>openaz</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
