6 files changed, 36 insertions, 53 deletions
diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks
index 4bbd3580..2320dc9f 100644
--- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks
+++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks
diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile b/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile
index 85bfa61f..0d187ccf 100755..100644
--- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile
+++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile
@@ -1,27 +1,27 @@
-j4IkjDmzOE_ZdHuN_cePYmySXrhmqM4WuGp86_RTiBlJ1TTvUaP_SOSZOqH0fxjk32gRvxJ01_iO
-mLtbQ-wZKk-fwCK_o6xrXJcN0G_Y8VGK2OMeqypm98ji25CSMvTdFLaohdPJwiRNMdmwwyF5q1Od
-pKviCISBlQ49ytwy3Mv0x7aV3kjkDWSgpx9TiMbWoAKlddcdQMUTEMh0CT0nLGv9uhwmRQ4I8UuE
-IzvR1Rit9HayMlXFND6n0IWggYqtAeRV-8wDrI2rAXGOrfLF0RC5-c0Wd0N000BWXvsT_nCYBCM6
-ffA5eAKCJmOVjJFzQTRXJq7Zhwij0CtEPgqqaipKUQhHaft9xeKXW3SPhREIn75F2u2uCcU1sNmd
-ytAk7yBPwdEcCQD-KVE9ZB3_57H0WIEr45SpU5ZePJkt2YV85H2Tlc_hGK18gTAcvGqDO3qELmV5
-SBHX5X_ZNL93mOkt37R0SGRdMZVIPJXNTgl4fGAsapvU7Y7sGMYrf2Ea0D-3hctk-aOKuuPEI1Ug
-0lqKjghJdvHYRFbm4C_7H-ai7UcBuixBd54Mp-hyBX-gjnFZuMHazFX2toKNe9RgDXIavHzTfF-l
-8fjdQpTplc2ECLINf-X6gs7w0zPYv04kLKixwlFff4ZocoxelGDEBlYYGNNxQBZvQtUX_dZetXF1
-VPNnwTB7Sp0fqaXR2aVaZNFSZYeL7VdxkiT0becNRa9QE9s2gU7oO_KTE8JyAiJyO-ojAvSUi-p_
-rq2Ivmab_L4t6GwMpv-EmRcntUQ_PM4s_XvJL2RmmSPWoNvbgCS0IilpYi2CPnEEgxqX37-Unx8m
-tYoNkiN-j9rA3Hr4EjEhrbOLf2wAh6RUeULerBpLKnf0Ans6UhjT7XVDaNvzxtAE-GrUCKHQ0ml2
-P_vzDBlGKobaRo-WQzQA-mZKGo1W4Q-qwFdusUflgfJ7iTrvw62jn30f4xGZcaP5Oa-9JvdZJggW
-1UvAM-85LdjGTxuI9KXbqRLWZk46B-UF7mDOce6dbRXjY48bZWIHEXcpzPQg6QA02cO10TN5K89V
-qXeCnz03ePf0u6YhMAOt5xiUvJpd1y_WI0jh4SH2dT26SegcuRTVLnEG0aL6ClypObwj3FLB1Pek
-UESqziiG4mQf_rzBAdPqcjbP8oeM2-mz09VYNyUOQ-7gk6bMAMWVqBx0uDxgIwUzr2UMbahB2Kg6
-9V7yE7obAKZa8x5oMiDGnvgjL9QeHwhUsNbwhhgqTDnB10vj4gh8RkNK8OsxQ53Nofj2PQZfY0GJ
-a6It7DCmnAgQ9N51RvCeodmmK9Zh3n_zoxt8gA-eV8zbidXZYQwYWx6ai7ooP7yol2bE_TLDDY9l
-_oYO_db73wSmqgTvoAdmrQGO4NI_g2iYN-Gd4XK4V_xgYPKyY5tHNSd4OKr_UuYiSioyNxE4IK1t
-zWyJ3tUXAyeq_ZjUDjabsnGnxmgujShRfK-rBh_1AapY3Oh99-aehETtcXihUmFX4lohowniWTA3
-MF1MMlRM5N1phF7xFgkAaZJfkQ-inqgWYvQ9XuW0LfumN4QeO8KnfknukSSgZ86PYTrgJKDIOKWn
-UYsxSoE_U02WxQThW8ayrFtKRLGR2x9bMaKzaON0tfltwyQO7ttsKlSyORIWVrGO48CyEDxpDs8U
-RDvN_SgFq1gWarCKLL0HDUdLGMfimZP7sPfVEKkprMlDp_gpx7kD7SaB1m7xuNjhBd-6I3gqSR7g
-lizTgKmuGalPRGorxX72vlTEYqLtgNWok6e9qjMGhEYCf02li6Ksoxp4ZejN_9S1-FGlcuq3SE9f
-Pm0HckGtPJ8u3u2mmLpT1QzzS0RG3XJU5kNJvZcSEG0GOsU7OnWTXoZnleFJvEoQrOuQeZJLyuxn
-mnmd49xrTirtxkLB83L8HQdAHvY5Phx8LbR9NJYvkH1MIEbBrrfUUx-x_llROOAYdPxvtpYcMkSt
-ApZwRgyvaBiwUirWbnlpmf8QV1MYMlZeBbbqPZIC4eaqcxOSmZa8ox4aR3XQg9zjCxm_jXdE
-\ No newline at end of file
+6-tNRI8kimOFIXwcTbENGrkJzim1NFAcA4iRrbWVSteGmgX0-RzgwYEy4wnNju7jlOUfRVKqJSYL
+0qcHP1Z9AbX_K5zqJ2CATFO_0tlvNbocvoh6IecTlvL6V00hlVzP1JjCedUN0cO13TSnc4_NpWWj
+nVZ9EaFQTmFL0NiYj-TPqRolhnQCIMDruBI6ImOIrnWxIcOEpH_6zmivzHhzRVbKVRNFEDq_F5J9
+fp2P3PXrYWU7rglKQtWcJpo3kMyC65zoPNVc-gMr4pfnpTTqzim5vVQyv-9w0QSwzvpKaydWPkm8
+E-kTotAQJ7r843U67U16-JTVb4n-7NummoNwshHo60BUb2xZd418VnIURD79QWt1zzOVFIs5f_LB
+pebds0dtdL_cPGzuY23Z4SBWU2LTihziJDzYCIo-6PIL5-XeWqkwBrLRcy9-JffHYbaNVCf9g0Ml
+cbnteUjuET-ea2-M-d1PwOIIr_ziU3UpMClQJ1GRZEuy4Aco9qJgMUqoJVJfEI_4CdLNVMTRwg1-
+T81PoIf0nN_cje8pQlu3LX_B0oozdJd5yfGqsM021jsXPs0uJ5KuLPHP8NvY_uDqaqANXRUEG2ke
+d57X6nF2CXcXXFKO0cf8-L35UrzbYgaZt5XsPP_sDl4WkKqJxKjREvrzjE4DXHfwrGqCMg7E767O
+y9-uPF5SpfgUer8jtQcFlREAl050CwMzv90TBb2UqM3Ydi6qq80miKBqXVbKMgqdBs7qIVxXLm43
+TR-krMmMnimWBI6SVxEFREXnzHePItLazefHwZTqn7_0Tu_WPqZltLIKo_waKV57nrnH3EJtd7lu
+GI5vIp46XQ6k-5LHOkfibKmImEKl19pFUvJehEjgVE6C3_2RnEmpG3T779_KJZKEy1sMqrud2QPX
+2rZPnfEJEaEkYW8jibKwZtNQ0HpRarg1sc0p4mrl6dGGqLbdPBSsxLdAkm9gLRKkMPsS_gtfjjWZ
+oPmUydEHu2fhUOjqsADpa76QSlPsun2-aL1CEiUAwzow9e68gxmnMQz02rc_cXElhskH2dDPod2w
+h2c6PfVkji5rvk-nDFJQ0MwMbpl1ctSI4_gZU4j_OD6nSh4RbXgC4wwzfqAGe_A-9UNq2bkmC1BA
+CDzjZXZRtZTCjgyaAH9yt6bsGTNxCfqD_OiRv7rQrO0yy-o4kGTidlW9Xwk_THgVn9-hF76JiDc-
+bw9DxTzJwQxHxrg7JNicFbpXP071rdaXRrXWxUQ7X7ZRWrZuCJ87qhOqfd3iE2VylI3vwEaqrDGD
+AULLczDd50X594-_pN8bCW_Nya5vjvRWNZmv1Uh0_YtbmotCj4Fz9vlTs5bIbfnyUp5sCk7jZZrv
+RGGFTU3mwa7jq-0uzY-jYdosDyU2PXMI0WZsSiSF08g_K7y0nnoSEa9kPtOWPTcotEXsTeZ5cgpj
+Bufi_U1SoW-kKG5-eyNDbputpvEFy00zrcSj3U8A6m2YkCxRQ7m_s9wnISiwVdVKuSCQ08MvyOrs
+10a3HHPB7T1BDA6sPVpDrGBjq7piVDQZvEgA9CGIrcyHrRR8_96DGKbMboUaY9vNG2NBJc7zcBRw
+AHs6cc-LKxB1mMUPNJZHxDNQOCk_nnbzGSG2AWppZHEmTpmB0tg0ZM03aqDrGgOK07xREZSZaAMY
+TmVNJSgEIOA2mEDoP2qOHdT5eQmn7xK34HSWJBKR6l1N30K626oomF70DVgqRSqkSZ0rhDBZzNzy
+VlZ4hG_ZZCJOcm_AUShWOsS6JJ11s23uJKkZQeaTZCWc0KVqhtWbKTE8CVyRzm1XcyRONdJVnvXN
+P4ANxGMzsaRZDC31gJYbSirZoTobLQ5OZxgNaNY9cBsEuK6r3sznPORG98d9y33x4Xa5HUedrHju
+HxAAADMCZwK0ITdWPPsk9lsag-tNor16nfLXj20y2JdLaZfx2PnluQjCitwskuZhTcWmHRZ0Ry7t
+ZxfxCSh5IOnAowFu1G2t0RiooKh4v26wOLTCzFiV0ZSmw1VSflkabxsIY9K2rh4-24QwQaAt
+\ No newline at end of file
diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks
index db9eae39..808c1b92 100644
--- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 9c82ff3a..a12164dc 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.dmaap.datarouter</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>datarouter-node</artifactId>
diff --git a/datarouter-node/src/main/resources/node.properties b/datarouter-node/src/main/resources/node.properties
index 27e91c90..7c076359 100644
--- a/datarouter-node/src/main/resources/node.properties
+++ b/datarouter-node/src/main/resources/node.properties
@@ -63,10 +63,10 @@ KeyStoreType = jks
 KeyStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
 #
 #    The password for the https keystore
-KeyStorePassword=]3V)($O&.Mv]W{f8^]6SxGNL
+KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8
 #
 #    The password for the private key in the https keystore
-KeyPassword=]3V)($O&.Mv]W{f8^]6SxGNL
+KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8
 #
 #    The type of truststore for https
 TrustStoreType = jks
@@ -75,7 +75,7 @@ TrustStoreType = jks
 TrustStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
 #
 #    The password for the https truststore
-TrustStorePassword=(Rd,&{]%ePdp}4JZjqoJ2G+g
+TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1&
 #
 #    The path to the file used to trigger an orderly shutdown
 QuiesceFile = etc/SHUTDOWN
diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java
index 9a3d82e5..6dc334fc 100644
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java
@@ -92,31 +92,14 @@ public class DeliveryQueueTest {
         files[0] = dirPath + FileName1;
     }
 
-    private void createFolder(String dirName) throws Exception {
-        String dirPath = dirName;
-
-        File newDirectory = new File(dirPath);
-        boolean isCreated = newDirectory.mkdirs();
-        if (isCreated) {
-            System.out.println("1. Successfully created directories, path: " + newDirectory.getCanonicalPath());
-        } else if (newDirectory.exists()) {
-            System.out.print("1. Directory path already exist, path: " + newDirectory.getCanonicalPath());
-        } else {
-            System.out.println("1. Unable to create directory");
-        }
+    private void createFolder(String dirName) {
+        File newDirectory = new File(dirName);
+        newDirectory.mkdirs();
     }
 
     private void createFile(String file, String dir) throws Exception {
-        String FileName = file;
-        String dirPath = dir;
-
-        File newFile = new File(dirPath + File.separator + FileName);
-        boolean isCreated = newFile.createNewFile();
-        if (isCreated) {
-            System.out.println("\n2. Successfully created new file, path: " + newFile.getCanonicalPath());
-        } else { //File may already exist
-            System.out.println("\n2. Unable to create new file: " + newFile.getCanonicalPath());
-        }
+        File newFile = new File(dir + File.separator + file);
+        newFile.createNewFile();
     }
 
     private void deleteFile(String fileName) {