Changes for packaging services-onappf and some refactoring

1) Added the code for packaging PDP-A.
2) Updating the package names.
3) Updating the dependencies in services-onappf. Some dependencies can
be removed as they are brought in while packaging.
4) Some other minor changes.

Change-Id: Idf62d7854f3435806a9e8aa975138fbfd45e3ea8
Issue-ID: POLICY-1632
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>

5 files changed, 137 insertions, 1 deletions

diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index de2ccf773..078088bad 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -40,7 +40,11 @@
             <artifactId>services-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.services</groupId>
+            <artifactId>services-onappf</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <!-- Client Servlet applications -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.client</groupId>
@@ -279,6 +283,15 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
+                                    <groupId>org.onap.policy.apex-pdp.services</groupId>
+                                    <artifactId>services-onappf</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/etc/onappf</outputDirectory>
+                                    <includes>config/*</includes>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.auth</groupId>
                                     <artifactId>cli-editor</artifactId>
                                     <version>${project.version}</version>
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
index 848498b1e..9798fa545 100644
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
@@ -82,6 +82,7 @@ set APEX_APP_MAP[eng-deployment]=java -Dlogback.configurationFile=%APEX_HOME%\et
 set APEX_APP_MAP[eng-monitoring]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-monitoring-%_VERSION%-monitoring.jar
 set APEX_APP_MAP[full-client]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-full-%_VERSION%-full.jar
 set APEX_APP_MAP[event-generator]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator
+set APEX_APP_MAP[onappf]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.services.onappf.ApexStarterMain
 
 :: array of applications with name=description
 :: declare -A APEX_APP_DESCR_MAP
@@ -96,6 +97,7 @@ set APEX_APP_DESCR_MAP[eng-deployment]=starts the APEX deployment client in a si
 set APEX_APP_DESCR_MAP[eng-monitoring]=starts the APEX engine monitoring client in a simple webserver
 set APEX_APP_DESCR_MAP[full-client]=starts the full APEX client (rest editor, deployment, monitoring) in a simple webserver
 set APEX_APP_DESCR_MAP["event-generator"]=starts the event generator in a simple webserver for performance testing
+set APEX_APP_DESCR_MAP[onappf]=starts the ApexStarter which handles the Apex Engine based on instructions from PAP
 
 :: no command line means help, -h means help
 if "%1" == "" goto Help
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
index c5569baaa..52e1f3df9 100755
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
@@ -91,6 +91,7 @@ APEX_APP_MAP["eng-deployment"]="java -Dlogback.configurationFile=$APEX_HOME/etc/
 APEX_APP_MAP["eng-monitoring"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-monitoring-$_version-monitoring.jar"
 APEX_APP_MAP["full-client"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-full-$_version-full.jar"
 APEX_APP_MAP["event-gen"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator"
+APEX_APP_MAP["onappf"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.services.onappf.ApexStarterMain"
 
 ## array of applications with name=description
 declare -A APEX_APP_DESCR_MAP
@@ -105,6 +106,7 @@ APEX_APP_DESCR_MAP["eng-deployment"]="starts the APEX deployment client in a sim
 APEX_APP_DESCR_MAP["eng-monitoring"]="starts the APEX engine monitoring client in a simple webserver"
 APEX_APP_DESCR_MAP["full-client"]="starts the full APEX client (rest editor, deployment, monitoring) in a simple webserver"
 APEX_APP_DESCR_MAP["event-generator"]="starts the event generator in a simple webserver for performance testing"
+APEX_APP_DESCR_MAP["onappf"]="starts the ApexStarter which handles the Apex Engine based on instructions from PAP"
 
 ##
 ## Help screen and exit condition (i.e. too few arguments)
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.bat
new file mode 100644
index 000000000..45531233d
--- /dev/null
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.bat
@@ -0,0 +1,52 @@
+:: ============LICENSE_START=======================================================
+::  Copyright (C) 2019 Nordix Foundation.
+:: ================================================================================
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::      http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+::
+:: SPDX-License-Identifier: Apache-2.0
+:: ============LICENSE_END=========================================================
+
+::
+:: Script to run the onappf PDP-A, calls apexApps.bat
+::
+:: @package    org.onap.policy.apex
+:: @author     Ajith Sreekumar <ajith.sreekumar@est.tech>
+:: @version    v1.0.0
+
+::
+:: DO NOT CHANGE CODE BELOW, unless you know what you are doing
+::
+
+@echo off
+setlocal enableDelayedExpansion
+
+
+if defined APEX_HOME (
+   if exist "%APEX_HOME%\" (
+      set _dummy=dir
+   ) else (
+      echo[
+      echo Apex directory 'APEX_HOME' not a directory
+      echo Please set environment for 'APEX_HOME'
+      echo[
+      exit /b
+   )
+) else (
+    echo[
+    echo Apex directory 'APEX_HOME' not set
+    echo Please set environment for 'APEX_HOME'
+    echo[
+    exit /b
+)
+
+%APEX_HOME%\bin\apexApps.bat onappf %*
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.sh
new file mode 100644
index 000000000..3eaa25937
--- /dev/null
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+
+
+##
+## Script to run onappf PDP-A, calls apexApps.sh
+##
+## @package    org.onap.policy.apex
+## @author     Ajith Sreekumar <ajith.sreekumar@est.tech>
+## @version    v1.0.0
+
+
+if [ -z $APEX_USER ]
+then
+   APEX_USER="apexuser"
+fi
+
+id $APEX_USER > /dev/null 2>& 1
+if [ "$?" -ne "0" ]
+then
+   echo 'cannot run apex, user "'$APEX_USER'" does not exit'
+   exit
+fi
+
+if [ $(whoami) != "$APEX_USER" ]
+then
+   echo 'Apex must be run as user "'$APEX_USER'"'
+   exit
+fi
+
+if [ -z $APEX_HOME ]
+then
+   APEX_HOME="/opt/app/policy/apex-pdp"
+fi
+
+if [ ! -d $APEX_HOME ]
+then
+   echo
+   echo 'Apex directory "'$APEX_HOME'" not set or not a directory'
+   echo "Please set environment for 'APEX_HOME'"
+   exit
+fi
+
+if [ $(whoami) == "$APEX_USER" ]
+then
+   $APEX_HOME/bin/apexApps.sh onappf $*
+else
+   su $APEX_USER -c "$APEX_HOME/bin/apexApps.sh onappf $*"
+fi