From a70761c096192e38800bf38d6c7f61f52bf72007 Mon Sep 17 00:00:00 2001 From: hb123f Date: Wed, 20 Mar 2019 12:20:44 -0400 Subject: CADI AAF Integration and merging the code Issue-ID: PORTAL-319 CADI AAF Integration and code merge Change-Id: I6e44f3b2741858d8d403b77a49ec9a0153084801 Signed-off-by: hb123f --- deliveries/properties_simpledemo/ONAPPORTAL/music.properties | 3 ++- deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties | 3 ++- deliveries/server.xml | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'deliveries') diff --git a/deliveries/properties_simpledemo/ONAPPORTAL/music.properties b/deliveries/properties_simpledemo/ONAPPORTAL/music.properties index b33ca269..cc369bbe 100644 --- a/deliveries/properties_simpledemo/ONAPPORTAL/music.properties +++ b/deliveries/properties_simpledemo/ONAPPORTAL/music.properties @@ -19,7 +19,8 @@ music.atomic.put = true cassandra.host=portal-cassandra zookeeper.host=portal-zk cassandra.user=root -cassandra.password=Aa123456 +#cassandra.password=Aa123456 +cassandra.password=rDmtV8/HL+t3SF9SQDZbC8uw2C4cTzuSPtCeLNtXAe8= music.exclude.api = /portalApi/healthCheck,/portalApi/healthCheckSuspend,/portalApi/healthCheckResume diff --git a/deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties b/deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties index a28efe6d..d8278b1a 100644 --- a/deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties +++ b/deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties @@ -19,7 +19,8 @@ music.atomic.put = true cassandra.host=portal-cassandra zookeeper.host=portal-zk cassandra.user=root -cassandra.password=Aa123456 +#cassandra.password=Aa123456 +cassandra.password=rDmtV8/HL+t3SF9SQDZbC8uw2C4cTzuSPtCeLNtXAe8= music.exclude.api = /portalApi/healthCheck,/portalApi/healthCheckSuspend,/portalApi/healthCheckResume diff --git a/deliveries/server.xml b/deliveries/server.xml index 0ccc500f..e23771cc 100644 --- a/deliveries/server.xml +++ b/deliveries/server.xml @@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - Modifications to this file for use in ONAP are also subject to the Apache-2.0 license. -->