From e89d4c2ab8033c9482965f0e2f811e059378d37d Mon Sep 17 00:00:00 2001
From: Chenfei Gao <cgao@research.att.com>
Date: Thu, 5 Mar 2020 14:18:34 -0500
Subject: [PATCH] Added xacml.properties to packages for native app

Issue-ID: POLICY-2182
Change-Id: Ife38e989aeda445c9fc2531bb92426f2d28bb818
Signed-off-by: Chenfei Gao <cgao@research.att.com>
---
 applications/native/pom.xml                        |  4 +--
 .../native/src/test/resources/xacml.properties     | 30 +++------------------
 .../src/main/package/tarball/assembly.xml          |  9 +++++++
 .../main/resources/apps/native/xacml.properties    | 31 ++++++++++++++++++++++
 4 files changed, 46 insertions(+), 28 deletions(-)
 create mode 100644 packages/policy-xacmlpdp-tarball/src/main/resources/apps/native/xacml.properties

diff --git a/applications/native/pom.xml b/applications/native/pom.xml
index f65a7d30..bd775081 100644
--- a/applications/native/pom.xml
+++ b/applications/native/pom.xml
@@ -10,7 +10,7 @@
 
   <name>${project.artifactId}</name>
   <description>This modules contains the xacml application that evaluates native policies and requests.</description>
-  
+
   <dependencies>
       <dependency>
           <groupId>org.onap.policy.xacml-pdp.applications</groupId>
@@ -25,4 +25,4 @@
       </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/applications/native/src/test/resources/xacml.properties b/applications/native/src/test/resources/xacml.properties
index 3d4d025c..5ea247cf 100644
--- a/applications/native/src/test/resources/xacml.properties
+++ b/applications/native/src/test/resources/xacml.properties
@@ -22,32 +22,10 @@ xacml.att.policyFinderFactory=org.onap.policy.pdp.xacml.application.common.OnapP
 #
 # Use a root combining algorithm
 #
-xacml.att.policyFinderFactory.combineRootPolicies=urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:deny-overrides
+xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-permit-overrides
 
 #
-# PIP Engine Definitions
+# Policies to load
 #
-count-recent-operations.classname=org.onap.policy.pdp.xacml.application.common.operationshistory.CountRecentOperationsPip
-count-recent-operations.issuer=urn:org:onap:xacml:guard:count-recent-operations
-count-recent-operations.name=CountRecentOperations
-count-recent-operations.description=Returns operation counts based on time window
-count-recent-operations.persistenceunit=OperationsHistoryPUTest
-
-get-operation-outcome.classname=org.onap.policy.pdp.xacml.application.common.operationshistory.GetOperationOutcomePip
-get-operation-outcome.issuer=urn:org:onap:xacml:guard:get-operation-outcome
-get-operation-outcome.name=GetOperationOutcome
-get-operation-outcome.description=Returns operation outcome
-get-operation-outcome.persistenceunit=OperationsHistoryPUTest
-
-#
-# Make pips available to finder
-#
-xacml.pip.engines=count-recent-operations,get-operation-outcome
-
-#
-# JPA Properties
-#
-javax.persistence.jdbc.driver=org.h2.Driver
-javax.persistence.jdbc.url=jdbc:h2:mem:testdb;DATABASE_TO_UPPER=FALSE
-javax.persistence.jdbc.user=policy
-javax.persistence.jdbc.password=P01icY
+xacml.rootPolicies=
+xacml.referencedPolicies=
\ No newline at end of file
diff --git a/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml b/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
index b54b9da3..94be287a 100644
--- a/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
+++ b/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
@@ -113,5 +113,14 @@
             <outputDirectory>${file.separator}apps${file.separator}optimization</outputDirectory>
             <lineEnding>unix</lineEnding>
         </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources/apps/native
+            </directory>
+            <includes>
+                <include>*.properties</include>
+            </includes>
+            <outputDirectory>${file.separator}apps${file.separator}native</outputDirectory>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
     </fileSets>
 </assembly>
diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/apps/native/xacml.properties b/packages/policy-xacmlpdp-tarball/src/main/resources/apps/native/xacml.properties
new file mode 100644
index 00000000..5ea247cf
--- /dev/null
+++ b/packages/policy-xacmlpdp-tarball/src/main/resources/apps/native/xacml.properties
@@ -0,0 +1,31 @@
+#
+# Properties that the embedded PDP engine uses to configure and load
+#
+# 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.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
+#
+# ONAP PDP Implementation Factories
+#
+xacml.att.policyFinderFactory=org.onap.policy.pdp.xacml.application.common.OnapPolicyFinderFactory
+
+#
+# Use a root combining algorithm
+#
+xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-permit-overrides
+
+#
+# Policies to load
+#
+xacml.rootPolicies=
+xacml.referencedPolicies=
\ No newline at end of file
-- 
2.16.6