From: Eddy Hautot <eh552t@intl.att.com>
Date: Tue, 24 Apr 2018 22:38:06 +0000 (+0000)
Subject: Merge changes Ib3c339b2,I47888da8,Ifdc5a4d9,I2f7b7417,If10e2dff, ...
X-Git-Tag: v2.0.0~35
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8c61814411a5390a946476dee876a320f3c5a4d7;hp=-c;p=clamp.git

Merge changes Ib3c339b2,I47888da8,Ifdc5a4d9,I2f7b7417,If10e2dff, ...

* changes:
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
---

8c61814411a5390a946476dee876a320f3c5a4d7
diff --combined src/main/resources/application.properties
index 2ff9205d,ec053e02..aa928207
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@@ -18,7 -18,7 +18,7 @@@
  # limitations under the License.
  # ============LICENSE_END============================================
  # ===================================================================
- # ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ #
  ###
  
  info.build.artifact=@project.artifactId@
@@@ -125,9 -125,9 +125,9 @@@ clamp.config.sdc.decode.service_ids=cla
  #
  #
  # Configuration Settings for Policy Engine Components
 -clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8085/pdp/ , testpdp, alpha123
 -clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8085/pdp/ , testpdp, alpha123
 -clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8085/pap/ , testpap, alpha123
 +clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
 +clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
 +clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123
  clamp.config.policy.notificationType=websocket
  clamp.config.policy.notificationUebServers=localhost
  clamp.config.policy.notificationTopic=
@@@ -170,9 -170,9 +170,9 @@@ clamp.config.op.controller=amsterda
  clamp.config.op.policy.appc=APPC
  #
  # Sdc service properties
 -clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8085/sdc/v1/catalog/
 -clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8085
 -clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8085/sdc/v1/catalog/services
 +clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/
 +clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080
 +clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services
  clamp.config.sdc.serviceUsername=clamp
  clamp.config.sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981
  clamp.config.sdc.artifactLabel=blueprintclampcockpit
@@@ -196,12 -196,12 +196,12 @@@ clamp.config.action.insert.test.event=f
  clamp.config.clds.service.cache.invalidate.after.seconds=120
  
  #DCAE Inventory Url Properties
 -clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8085
 +clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080
  clamp.config.dcae.intentory.retry.interval=10000
  clamp.config.dcae.intentory.retry.limit=3
  
  #DCAE Dispatcher Url Properties
 -clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8085
 +clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8080
  clamp.config.dcae.header.requestId = X-ECOMP-RequestID
  
  #Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !