update cert1.1.18

Issue-ID: DMAAP-1411
Change-Id: Id5228e5957dd970f38d61d946461308be95ae2fc
Signed-off-by: su622b <su622b@att.com>

4 files changed, 36 insertions, 28 deletions

diff --git a/src/main/config/org.onap.dmaap.mr.keyfile b/src/main/config/org.onap.dmaap.mr.keyfile
index 8d07c91..72d3b73 100644
--- a/src/main/config/org.onap.dmaap.mr.keyfile
+++ b/src/main/config/org.onap.dmaap.mr.keyfile
@@ -1,27 +1,27 @@
-7Fyq0ekAS4OuD_1ceEI_yRJkXkUrwXxuAg8iwuA8VGsHHsSHQ4K3qOMpohP80HTeCvCi9nlLCHHq
-FSiHDcGSaK3Dd0yY33PvYbaQ1117JonMrLxkkXt2452NodIpqcmzEBUdSP9QospaenQoECzD0Ddd
-H-R8yn5l3g96nqoDFf6rC8p_baT9u2ysRg9XSAbRPd96v73bSUXOJ39YWBepQU112yPghJk4OUNw
-wnugkhmgkllGuxyWLhz7xuiCPJi5Pa8ZKm8ClStV_rRVzJ-zfhwEwcAARni5BryQfFtk7v2kK8KO
-ECGQTJTbfItp1jJx16gYHNxc-BJd_XJ_8Ygx6qQntSLV5e4GmN8lSKNwFmPrWnd3EEahuC-p3no-
-RNr1JfV4y-3FDsbghiMAvVza2W61mthx26IHhhZYQuGvMSYNX3eawHADK129H9QyxBluN3lyKEQb
-FkVXOw2__uvDQ3-yhZ-g1JdcWDAprZqrNICt1Q8bvEEQqQuHAAbmQjNLu8DdVtTwhe6GFiZ2PteI
-YMsdIH2eqrJ7pUlRtVFY4mzRLviDvhqxGEqdzPHgXkcC7SsT-XzK2dKRpbVf3VF7xszLw5FB6Wjn
-4K-emWVhWFLklUk0QCipkbH2fYiFytG-WD0L9WTKFHXOUfhBz4lvnvZtKWvlIueNXI3ojuzNNjXo
-j-NWd6eUqLlhD016hOlQrebgp4RC4oOoqba5RLqGv6byEqwNniYMFPyuE3dnX6s_o9TEuJ4he3lY
-8WG4UP2ncvhBEjJfv4eXmjyYcETG_xVDm--7PBELBQupEnnO7pn4mI83irL9gjxn139GcIv_CL_U
-unlzIAVi703fUF-zE4xZMbjLxqvm2R2KkoXqZgfK6ZLMVa4kaH0yJ06j_rtkRhJOhYxB08eI_VBr
-BE65dpbHrVxFJnR-BRNQsgFkJ6UhH2yHN5Y7OxsAOGKLBeyD2efm5KFEdFWzdgPjBsCaCIbiROvQ
-fypV0rgeD8YD_N6zjIIIm8LoQt6XueNTyKKsMB7EuiOjphTZ0eVui9sUB3jUHqq_glQuJbqPNClY
-lGa4nQquUXB5RgJPQ-Ydcd8SDLvfBAAzqZ7_2ZBvWjn39qbdg0EEAjuEGuHEX7ZmK40aTgMq86FY
-ltclqODvPLKzcNcZtsiAidP78vtFsapPBbGAXA2Y1w4y5y-FNfiTkllWnnw-Fc-kKuv7M3nKwQVm
-12w7d4hYIcqrBdzjMwvp6m2VlPGMHfy4ABJmHfBy0hCkBFp1eD7qCDUljFpf_xJ1vZt1lix35BLO
-04spUGLihthH1yIAd_3CUI_JSMVMs5aNBwQymwmgs8kg3ton60TXbQjLTLRzmybpPrNwKMcXVCDS
-5DQLvLwpk2snME7e3mb2jk-MWN7QddA-i0DqPKM5iiqIFwfmyvE7SXM3epR3bmrhAAmEVCxdTYh8
-Xp-DJAx9R7EhQLZlz_ynnykTZDjbjgYoCzgEVzgcs8E6uWEZoT4ajgTfrAN9SQIi99xiNCHYo0BF
-InuVAx_HSE8nrGgJOAsUxvs8BTuKvvi_6zPD4zJB0UodKXlkn1nnckeU-cwVo0oIME17Rrr3zjlD
-1kJfqN0Xteixj8kYx6qUyPg1wB0nu5JoWZ_8oAAppevFcU-H8TyCoIzxh0I3SBZ-9G9nQZjfhsz0
-KKZfVjaYpuWYQ_eDmMRQ84HZYabcZ7mRbWCHuW1-iecIQbB8UmLf3_5W2BO2Cy0sY_jgTUx8YOgC
-_rh-kjhwnt8_k-0mpxSlf1TxGSP7_6_rEjtYaxYoSo4Wdc3rdQwbZWOcUYytyivbxIkA45Q0qG2N
-GyDEfV9hH6XxZn5M3aZsKVfGW95Gre7vvkMlWZi0NoifCJ-JTebJsvBglTUn-Vy0vXfQ5_88DyN5
-E-3BakAtTlYrcIrt1Cp6SjkPFA6Ia96dYoEk-Eto_3GulHb1cA-BiAwvsnXA6MVAWXPfvUc6M0Rl
-GiBQBMNds-g8u4ldGHJ_Wbu1O5RZxvjsRz4VWyXVh-ii3fBcs_YFGH8Ggmr_l1_uUH3z1jJE
\ No newline at end of file
+yJhToh1HtF7641JOeljPtn4ECRn7dncPKtUh9XN4Hv1GX2q1MSVsDI2qQ7i2Q8hH1G3Ko_x0fl1p
+PLn2bOh9cOOGKxQrWxY0724Cme1MMc_drOl7TNk5DPmiw-teI6BdpS_wPtfDGLql9xuxIMWPdv_P
+Id9LSzdW_Fa4FepgcxAj6jOK7jQBmJIsedxIpAVFU0bjmMwybe_BRe1x8yEBrfQo8Si0cfjYdQYP
+XBTAnJ46zejAPJh2U4MyBhYzz2Zr1nMux2wjHc52z8J7_YpfveNSpr9UwOzSo0VqAEORISQDS7Cb
+Cc9jeYmxPkVCEraHWq5jtOpVdwxwTSh1PJ8_pgnhQ4AgQS-5JyRdHWvzwGa2RW8i3ZF1qfJBP4wb
+lyXiNYKSU5jDd-wNP0b9WDILGFRKuAHjz1wKB1IHyQTBX7dpjouuZysEkZS348NVLfAmb1klKp5Q
+1lq2H4TdQnPaG6tV_wyI0ZrZsf4TCeDxYRxEAZc3ILefM_72Zc-UWEHQ_Q4Qck30fJzoHFgEm5Rm
+8XofzAfHOcjoa7o8mEVi9veNpqTeNa8b2DLqYehcE_rMYU_y1AgWsnWgiIX1AEzLyUyfliS2PxQh
+ZI3HLMrzfV--pOuQp_CnrcHclvkX3u5ZJ01a6jq7ONpr712YNmUEoD6s1UR0wEEeO61Cun8zfty8
+m-qXD3k-re64WDizw-pHXHYmIS9a4jL7D0R4KysJRf6iZTAUy4ROy6aS-wMYGgy0r7sEOZY6zp4h
+MBczN5-3O7r-dKjOrr1RWXS3zt71oJNSGcnG41KKOnUeNpFBmIzVfoIp9KR5zdcg-gGrA8Xi_tBj
+-rAqYfaNMBUDDtFCLhCHwuhKpR0Y0gG_-8J43yi3bfWOYMWkgPRHrJIiIO-SNUW_pobbRqQzIT3h
+V5IcEc5pa-lnJnBNS5b_-cHsA0x4g1FPmDmjsGBYZmiaPSvXPzhpZVsww1p9nVL63rYLMOTSps1V
+Lj9_UYWef7jD409vZRqeLQGi7lMNeC7oLv_hi_l05rZUkpegMLYmIWzjhzW8OuYdiHGuboV9TyUR
+QWn5e_bypQBAJhYqaYNADzV9duW0v3SW89zP9TlkJ6tfvhcVXRQn4MUzIC9h_0q3cf_9Wemx7UPW
+tGML52lYWcEbVbGF9yFtOm3qVPi4sVFO61vOtIoQhIIL3oa9gOWO9yPCjNm4lD-C4jAWHjtJdMr8
+cGtBplAHGly63VQs9RRUr42A95JMtsuJIPNDWP5-I-9R77NALdzjKEJE2FngGW8Ud4pJQ1sikPH3
+F4kVn1L2NpAilVrjlyb_y89mskrWaSdHCE2P1_gtkWHXfXIfKK0UFQt17s8hk0MfL6JSUDUE4IKN
+tK70iHwmqY9VbYKYLf-8Gl7CW_Q9MumHjGsktwVZinpH4kOUREr6tyve4rZv8wN6mbNPVJ5gw_PE
+I4bvSiEstMgelbkheMC4l-zc3q9C_fNZmLmdav8PLUrkS_NxnZ4hJQCDTjhbMqLIwknXU9SkDyPb
+Dgh049PyJrYzv2_TpYoS6M_o3HjApMkRKlV_TEcbGoX06gAUYTiEWAQU6wm0TdsIdxjEXAWeTiX7
+ddI_vEioFemoKjE5iRWNaKL85xsTsQj6bQi1eSj1F0lxqnSGRldiMAPMrfqKDJ7xFpXS7nyQfLjY
+m1H-Y3bk0iBBZbU0JKXerE_jlr3s7rcdarpwY1pdODoUJBk-EiKezm6zWuG9o3IisPNSqqOs4Cax
+QAE3dt-1TpCxkw7Rpgm8eTwPMPOD3gj7Szcs2sEh-0UIk8y7uZCSRz0ZCsQj-jJl97WQV1ky89xS
+c9ECqzDTgl2cVrih9aQu863_yHnjm9tNTxMH4DudB5JcmM96BX4CfS9qgVzAqCGvW9KS37wy0bK_
+iSCAhAWNT5L9E3fUyg--V_gmVjxGb8Y020cc4_pkqSbAAC8qjQhDWHLy_M2RzQrPmQMdP2PZ5-AU
+Pw6HdHmVTOLZeYuVS1rXx4AYWXkgKHiSRqO6bal1opzOnSpbw-Q1bQu0wZ1MarXodEtJFaOr
\ No newline at end of file
diff --git a/src/main/config/org.onap.dmaap.mr.p12 b/src/main/config/org.onap.dmaap.mr.p12
index 1cffc61..1a0e8a4 100644
--- a/src/main/config/org.onap.dmaap.mr.p12
+++ b/src/main/config/org.onap.dmaap.mr.p12
diff --git a/src/main/config/org.onap.dmaap.mr.trust.jks b/src/main/config/org.onap.dmaap.mr.trust.jks
index 5fccb66..aae6d81 100644
--- a/src/main/config/org.onap.dmaap.mr.trust.jks
+++ b/src/main/config/org.onap.dmaap.mr.trust.jks
diff --git a/src/main/resources/docker/startup.sh b/src/main/resources/docker/startup.sh
index 3898d86..9fb3414 100644
--- a/src/main/resources/docker/startup.sh
+++ b/src/main/resources/docker/startup.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #*******************************************************************************
 #  ============LICENSE_START=======================================================
 #  org.onap.dmaap
@@ -27,5 +28,12 @@ echo "AJSC HOME directory is " $root_directory
 echo "AJSC Conf Directory is" $config_directory
 echo "Starting using" $runner_file
 
+if [ -z "${MR_JVM_ARGS}" ]; then
 
-java -jar  -XX:MaxPermSize=256m -XX:PermSize=32m  -DSOACLOUD_SERVICE_VERSION=0.0.1 -DAJSC_HOME=$root_directory -DAJSC_CONF_HOME=$config_directory -DAJSC_SHARED_CONFIG=$config_directory -DAJSC_HTTPS_PORT=3905 -Dplatform=NON-PROD -DPid=1306 -Dlogback.configurationFile=/appl/dmaapMR1/bundleconfig/etc/logback.xml -Xmx512m -Xms512m  $runner_file context=/ port=3904 sslport=3905
+java -jar   -Xmx512m -Xms512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=5555 -Dcom.sun.management.jmxremote.port=5555  -DSOACLOUD_SERVICE_VERSION=0.0.1 -DAJSC_HOME=$root_directory -DAJSC_CONF_HOME=$config_directory -DAJSC_SHARED_CONFIG=$config_directory -DAJSC_HTTPS_PORT=3905 -Dplatform=NON-PROD -DPid=1306 -Dlogback.configurationFile=/appl/dmaapMR1/bundleconfig/etc/logback.xml -Xmx512m -Xms512m  $runner_file context=/ port=3904 sslport=3905
+
+else
+
+java -jar  $MR_JVM_ARGS  -DSOACLOUD_SERVICE_VERSION=0.0.1 -DAJSC_HOME=$root_directory -DAJSC_CONF_HOME=$config_directory -DAJSC_SHARED_CONFIG=$config_directory -DAJSC_HTTPS_PORT=3905 -Dplatform=NON-PROD -DPid=1306 -Dlogback.configurationFile=/appl/dmaapMR1/bundleconfig/etc/logback.xml -Xmx512m -Xms512m  $runner_file context=/ port=3904 sslport=3905
+
+fi
\ No newline at end of file