From: su622b <sunil.unnava@att.com>
Date: Wed, 25 Apr 2018 18:22:54 +0000 (-0400)
Subject: Added the Keystore
X-Git-Tag: v1.1.4~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=61986ce57b32cb8ca7766c5207d34bd3c9b6595a;hp=35b26080b50f47547640a4ef8c6aa284f3024a6f;p=dmaap%2Fmessagerouter%2Fmessageservice.git

Added the Keystore

Issue-ID: DMAAP-245
Change-Id: I8dde99c342c96b43fb475c8e6698222976d74853
Signed-off-by: su622b <sunil.unnava@att.com>
---

diff --git a/ajsc-shared-config/etc/keystore.jks b/ajsc-shared-config/etc/keystore.jks
index 3bfe928..da9297f 100644
Binary files a/ajsc-shared-config/etc/keystore.jks and b/ajsc-shared-config/etc/keystore.jks differ
diff --git a/demo/docker_files/__docker-compose.yml b/demo/docker_files/__docker-compose.yml
index 2159781..1983ed7 100644
--- a/demo/docker_files/__docker-compose.yml
+++ b/demo/docker_files/__docker-compose.yml
@@ -46,7 +46,7 @@ services:
     volumes:
       - ./MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties 
       - ./cadi.properties:/appl/dmaapMR1/etc/cadi.properties 
-      - ./mykey:/appl/dmaapMR1/etc/keyfile 
+      - ./keystore.jks:/appl/dmaapMR1/bundleconfig/etc/keystore.jks 
     depends_on:
       - zookeeper
       - kafka
diff --git a/demo/docker_files/keystore.jks b/demo/docker_files/keystore.jks
new file mode 100644
index 0000000..da9297f
Binary files /dev/null and b/demo/docker_files/keystore.jks differ
diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml
index 7a42776..ee626bb 100644
--- a/src/main/config/ajsc-jetty.xml
+++ b/src/main/config/ajsc-jetty.xml
@@ -87,8 +87,8 @@
 	
 	 <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
              <Set name="KeyStorePath"><SystemProperty name="AJSC_HOME" />/bundleconfig/etc/keystore.jks</Set>
-                  <Set name="KeyStorePassword">changeit</Set>
-                       <Set name="KeyManagerPassword">changeit</Set>
+                  <Set name="KeyStorePassword">Messaging for All</Set>
+                       <Set name="KeyManagerPassword">Messaging for All</Set>
          </New>
          <Call id="sslConnector" name="addConnector">
                  <Arg>