From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 11 Apr 2019 23:08:28 +0000 (+0000)
Subject: Merge "Changes to handle PDPX deploy/undeploy"
X-Git-Tag: 3.0.2-ONAP~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=578c96027a8ba1bde8b50b45d4b846daf61ecfd5;hp=-c;p=policy%2Fxacml-pdp.git

Merge "Changes to handle PDPX deploy/undeploy"
---

578c96027a8ba1bde8b50b45d4b846daf61ecfd5
diff --combined packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
index 6da77283,768709f7..3b027650
--- a/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
+++ b/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
@@@ -42,7 -42,6 +42,7 @@@
              <includes>
                  <include>*.json</include>
                  <include>*.xml</include>
 +                <include>*.properties</include>
              </includes>
              <outputDirectory>/etc</outputDirectory>
              <lineEnding>unix</lineEnding>
@@@ -59,5 -58,32 +59,32 @@@
              <outputDirectory>/etc/ssl</outputDirectory>
              <lineEnding>keep</lineEnding>
          </fileSet>
+         <fileSet>
+             <directory>${project.basedir}/src/main/resources/apps/guard
+             </directory>
+             <includes>
+                 <include>*.properties</include>
+             </includes>
+             <outputDirectory>/apps/guard</outputDirectory>
+             <lineEnding>unix</lineEnding>
+         </fileSet>
+                 <fileSet>
+             <directory>${project.basedir}/src/main/resources/apps/monitoring
+             </directory>
+             <includes>
+                 <include>*.properties</include>
+             </includes>
+             <outputDirectory>/apps/monitoring</outputDirectory>
+             <lineEnding>unix</lineEnding>
+         </fileSet>
+                 <fileSet>
+             <directory>${project.basedir}/src/main/resources/apps/optimization
+             </directory>
+             <includes>
+                 <include>*.properties</include>
+             </includes>
+             <outputDirectory>/apps/optimization</outputDirectory>
+             <lineEnding>unix</lineEnding>
+         </fileSet>
      </fileSets>
  </assembly>