Change pdp sim java version

[policy/models.git] / models-sim / policy-models-sim-pdp / src / main / package / docker / pdp-sim.sh

diff --git a/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh b/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh
index b0e3ba0..4642e21 100644 (file)
--- a/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh
+++ b/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
+#  Copyright (C) 2019-2020 Nordix Foundation.
+#  Modifications copyright (C) 2020 Bell Canada. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,19 +25,17 @@ then
        PDP_SIM_HOME=/opt/app/policy/pdp-sim
 fi
 
-JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+JAVA_HOME=/usr/lib/jvm/java-17-openjdk
 KEYSTORE="${PDP_SIM_HOME}/etc/ssl/policy-keystore"
 KEYSTORE_PASSWD="Pol1cy_0nap"
 TRUSTSTORE="${PDP_SIM_HOME}/etc/ssl/policy-truststore"
 TRUSTSTORE_PASSWD="Pol1cy_0nap"
 
-if [ "$#" -eq 2 ]
+if [ "$#" -eq 1 ]
 then
     CONFIG_FILE=$1
-    PROPERTIES_FILE=$2
 else
     CONFIG_FILE=${CONFIG_FILE}
-    PROPERTIES_FILE=${PROPERTIES_FILE}
 fi
 
 if [ -z "$CONFIG_FILE" ]
@@ -44,12 +43,7 @@ then
     CONFIG_FILE="$PDP_SIM_HOME/etc/config/OnapPfConfig.json"
 fi
 
-if [ -z "$PROPERTIES_FILE" ]
-then
-    PROPERTIES_FILE="$PDP_SIM_HOME/etc/config/topic.properties"
-fi
-
-echo "PDP simulatior configuration file: $CONFIG_FILE and properties file: $PROPERTIES_FILE"
+echo "PDP simulator configuration file:" $CONFIG_FILE
 
 $JAVA_HOME/bin/java \
     -cp "$PDP_SIM_HOME/etc:$PDP_SIM_HOME/lib/*" \
@@ -57,6 +51,5 @@ $JAVA_HOME/bin/java \
     -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" \
     -Djavax.net.ssl.trustStore="$TRUSTSTORE" \
     -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" \
-    -Dlogback.configurationFile=$PDP_SIM_HOME/etc/logback.xml \
     org.onap.policy.models.sim.pdp.PdpSimulatorMain \
-    -c $CONFIG_FILE -p $PROPERTIES_FILE
+    -c $CONFIG_FILE