summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTej, Tarun <tt3868@att.com>2017-10-10 10:07:44 -0400
committerTej, Tarun <tt3868@att.com>2017-10-10 10:33:09 -0400
commit08a9f3a8d9831a351f54a5862b5ff58f3f5e7993 (patch)
treec8ac6fd6ce878b8df5825d679188a829a6aabf7b
parent3313f394e1df65cad8b31841f529c34e506288e4 (diff)
Fixing policy build issues
Reverting back the changes made to properties and removing javax.json version which is build on jdk9 Issue-Id: POLICY-295 Change-Id: I1dfbd6be94f3f845d64c9aa96107138f23b34158 Signed-off-by: Tej, Tarun <tt3868@att.com>
-rw-r--r--ONAP-PDP-REST/src/test/resources/xacml.pdp.properties2
-rw-r--r--ONAP-PDP/pom.xml5
-rw-r--r--packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties4
3 files changed, 3 insertions, 8 deletions
diff --git a/ONAP-PDP-REST/src/test/resources/xacml.pdp.properties b/ONAP-PDP-REST/src/test/resources/xacml.pdp.properties
index 2013a1f9d..bb174b9fd 100644
--- a/ONAP-PDP-REST/src/test/resources/xacml.pdp.properties
+++ b/ONAP-PDP-REST/src/test/resources/xacml.pdp.properties
@@ -42,7 +42,7 @@ aafClient.impl.className=org.onap.policy.utils.AAFPolicyClientImpl
# AT&T RESTful PDP Implementation Factories
#
xacml.pipFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPolicyFinderFactory
+xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.XACMLPdpPolicyFinderFactory
#
# 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.
diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml
index 0310d390e..bd0507465 100644
--- a/ONAP-PDP/pom.xml
+++ b/ONAP-PDP/pom.xml
@@ -49,11 +49,6 @@
<version>4.4.4</version>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
diff --git a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
index f8ec66df5..fe5277d98 100644
--- a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
+++ b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
@@ -42,7 +42,7 @@ aafClient.impl.className=org.onap.policy.utils.AAFPolicyClientImpl
# AT&T RESTful PDP Implementation Factories
#
xacml.pipFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPolicyFinderFactory
+xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.XACMLPdpPolicyFinderFactory
#
# 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.
@@ -107,7 +107,7 @@ xacml.rest.pap.userid=${{PDP_PAP_PDP_HTTP_USER_ID}}
# pass PAP
xacml.rest.pap.password=${{PDP_PAP_PDP_HTTP_PASSWORD}}
# Delay for Notifications Don't change this. Value in milliSec.
-xacml.rest.notification.delay=30
+xacml.rest.notification.delay=30
# Client interval to ping notification service.
CLIENT_INTERVAL=15000
# Request Buffer Size.