diff --git a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml
index 3d72835c75..790e295273 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml
@@ -78,11 +78,6 @@
org.wso2.carbon
org.wso2.carbon.logging
-
- org.wso2.carbon
- org.wso2.carbon.logging
- ${carbon.kernel.version}
-
diff --git a/components/policy-mgt/org.wso2.carbon.policy.evalutor/src/main/java/org/wso2/carbon/policy/evaluator/PDPException.java b/components/policy-mgt/org.wso2.carbon.policy.evalutor/src/main/java/org/wso2/carbon/policy/evaluator/PDPException.java
index 799efadeb0..c650e371a4 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.evalutor/src/main/java/org/wso2/carbon/policy/evaluator/PDPException.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.evalutor/src/main/java/org/wso2/carbon/policy/evaluator/PDPException.java
@@ -18,5 +18,37 @@
package org.wso2.carbon.policy.evaluator;
-public class PDPException {
+public class PDPException extends Exception {
+
+ private String pdpErrorMessage;
+
+ public String getPdpErrorMessage() {
+ return pdpErrorMessage;
+ }
+
+ public void setPdpErrorMessage(String pdpErrorMessage) {
+ this.pdpErrorMessage = pdpErrorMessage;
+ }
+
+ public PDPException(String message) {
+ setPdpErrorMessage(message);
+ }
+
+ public PDPException(String message, Exception ex) {
+ super(message, ex);
+ setPdpErrorMessage(message);
+ }
+
+ public PDPException(String message, Throwable cause) {
+ super(message, cause);
+ setPdpErrorMessage(message);
+ }
+
+ public PDPException(Throwable cause) {
+ super(cause);
+ }
+
+ public PDPException(){
+ super();
+ }
}
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/Policy.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/Policy.java
index ddebf9e1e1..29184b24bd 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/Policy.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/Policy.java
@@ -18,9 +18,12 @@
package org.wso2.carbon.policy.mgt.common;
+import java.util.List;
+
public class Policy {
private int id;
private String policyName;
+ private List featuresList;
public static class Features {