Merge "[DMAAP-DR-PROV] Remove aaf & cadi"

[dmaap/datarouter.git] / datarouter-prov / src / test / resources / h2Database.properties

diff --git a/datarouter-prov/src/test/resources/h2Database.properties b/datarouter-prov/src/test/resources/h2Database.properties
index 9596871..1aa631d 100755 (executable)
--- a/datarouter-prov/src/test/resources/h2Database.properties
+++ b/datarouter-prov/src/test/resources/h2Database.properties
@@ -25,12 +25,18 @@
 org.onap.dmaap.datarouter.db.driver                        = org.h2.Driver
 org.onap.dmaap.datarouter.db.url                           = jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
 org.onap.dmaap.datarouter.provserver.isaddressauthenabled  = true
-org.onap.dmaap.datarouter.provserver.cadi.enabled          = true
 org.onap.dmaap.datarouter.provserver.https.relaxation      = false
 org.onap.dmaap.datarouter.provserver.accesslog.dir         = unit-test-logs
 org.onap.dmaap.datarouter.provserver.spooldir              = src/test/resources
 org.onap.dmaap.datarouter.provserver.dbscripts             = src/test/resources
 org.onap.dmaap.datarouter.provserver.localhost             = 127.0.0.1
 org.onap.dmaap.datarouter.provserver.tlsenabled            = true
+org.onap.dmaap.datarouter.provserver.keystoretype          = PKCS12
+org.onap.dmaap.datarouter.provserver.keystorepath          = src/test/resources/certs/org.onap.dmaap-dr-prov.p12
+org.onap.dmaap.datarouter.provserver.keystorepassword      = secret
+org.onap.dmaap.datarouter.provserver.keymanagerpassword    = secret
+org.onap.dmaap.datarouter.provserver.truststoretype        = jks
+org.onap.dmaap.datarouter.provserver.truststorepath        = src/test/resources/certs/truststore.jks
+org.onap.dmaap.datarouter.provserver.truststorepassword    = secret
 org.onap.dmaap.datarouter.nodeserver.https.port            = 8443
 org.onap.dmaap.datarouter.nodeserver.http.port             = 8080