6 files changed, 21 insertions, 7 deletions
diff --git a/aai-resources/appconfig/aai_keystore b/aai-resources/appconfig/aai_keystore
new file mode 100644
index 0000000..1ddef0c
--- /dev/null
+++ b/aai-resources/appconfig/aai_keystore
diff --git a/aai-resources/appconfig/aaiconfig.properties b/aai-resources/appconfig/aaiconfig.properties
index 0116f9e..435507a 100644
--- a/aai-resources/appconfig/aaiconfig.properties
+++ b/aai-resources/appconfig/aaiconfig.properties
@@ -40,9 +40,9 @@ aai.config.nodename=AutomaticallyOverwritten
 aai.auth.cspcookies_on=false
 aai.dbmodel.filename=ex5.json
 
-aai.server.url.base=https://aai.api.simpledemo.openecomp.org:8443/aai/
-aai.server.url=https://aai.api.simpledemo.openecomp.org:8443/aai/v11/
-aai.global.callback.url=https://aai.api.simpledemo.openecomp.org:8443/aai/
+aai.server.url.base=https://aai.api.simpledemo.onap.org:8443/aai/
+aai.server.url=https://aai.api.simpledemo.onap.org:8443/aai/v11/
+aai.global.callback.url=https://aai.api.simpledemo.onap.org:8443/aai/
 
 aai.tools.enableBasicAuth=true
 aai.tools.username=AAI
diff --git a/aai-resources/appconfig/application.properties b/aai-resources/appconfig/application.properties
index 6f25fbc..b9c51ea 100644
--- a/aai-resources/appconfig/application.properties
+++ b/aai-resources/appconfig/application.properties
@@ -2,7 +2,7 @@
 info.build.artifact=aai-resources
 info.build.name=resources
 info.build.description=Resources Microservice
-info.build.version=1.1.0
+info.build.version=1.2.0
 
 spring.application.name=aai-resources
 spring.jersey.type=filter
@@ -44,7 +44,7 @@ server.ssl.key-store-type=JKS
 # JMS bind address host port
 jms.bind.address=tcp://localhost:61647
 dmaap.ribbon.eureka.enabled=false
-dmaap.ribbon.listOfServers=mr.api.simpledemo.openecomp.org:3904
+dmaap.ribbon.listOfServers=mr.api.simpledemo.onap.org:3904
 # Number of milliseconds to wait before making ping requests again
 dmaap.ribbon.ServerListRefreshInterval=75000
 dmaap.ribbon.NFLoadBalancerPingInterval=75000
@@ -57,6 +57,8 @@ dmaap.ribbon.ServerDownFailureLimit=1
 dmaap.ribbon.securePorts=3905
 
 # Custom Dmaap Specific Configuration
+dmaap.ribbon.username=
+dmaap.ribbon.password=
 dmaap.ribbon.health.endpoint=/topics/AAI-EVENT
 # Number of seconds to wait for the ping to work and might need to increase this if the pings are all failing
 dmaap.ribbon.pingport.timeout=3
diff --git a/aai-resources/appconfig/realm.properties b/aai-resources/appconfig/realm.properties
new file mode 100644
index 0000000..fb692cc
--- /dev/null
+++ b/aai-resources/appconfig/realm.properties
@@ -0,0 +1,12 @@
+# format : username: password[,rolename ...]
+# default username/password: AAI/AAI, MSO/MSO, ModelLoader/ModelLoader...
+AAI:OBF:1gfr1ev31gg7,admin
+MSO:OBF:1jzx1lz31k01,admin
+SDNC:OBF:1itr1i0l1i151isv,admin
+DCAE:OBF:1g8u1f9d1f991g8w,admin
+POLICY:OBF:1mk61i171ima1im41i0j1mko,admin
+ASDC:OBF:1f991j0u1j001f9d,admin
+VID:OBF:1jm91i0v1jl9,admin
+APPC:OBF:1f991ksf1ksf1f9d,admin
+ModelLoader:OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw,admin
+AaiUI:OBF:1gfr1p571unz1p4j1gg7,admin
diff --git a/aai-resources/appconfig/titan-cached.properties b/aai-resources/appconfig/titan-cached.properties
index d8486bc..97bb818 100644
--- a/aai-resources/appconfig/titan-cached.properties
+++ b/aai-resources/appconfig/titan-cached.properties
@@ -23,7 +23,7 @@
 query.fast-property=true
 # the following parameters are not reloaded automatically and require a manual bounce
 storage.backend=hbase
-storage.hostname=aai.hbase.simpledemo.openecomp.org
+storage.hostname=aai.hbase.simpledemo.onap.org
 
 #schema.default=none
 storage.lock.wait-time=300
diff --git a/aai-resources/appconfig/titan-realtime.properties b/aai-resources/appconfig/titan-realtime.properties
index dd9b665..0c97b75 100644
--- a/aai-resources/appconfig/titan-realtime.properties
+++ b/aai-resources/appconfig/titan-realtime.properties
@@ -23,7 +23,7 @@
 query.fast-property=true
 # the following parameters are not reloaded automatically and require a manual bounce
 storage.backend=hbase
-storage.hostname=aai.hbase.simpledemo.openecomp.org
+storage.hostname=aai.hbase.simpledemo.onap.org
 
 #schema.default=none
 storage.lock.wait-time=300