From e63aa2efcd5dff2af82b39368d5989763c9cdd6f Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Tue, 8 Aug 2017 03:13:42 -0700 Subject: Rework of the designer UI (part4) Rework of the designer UI (part4) + Modification of all Clamp configurations iin resource folder Change-Id: I2adb7ad336c8d7decaed847cb167d1f125c10b0e Issue-Id: CLAMP-1 Signed-off-by: Determe, Sebastien (sd378r) --- src/main/resources/application.properties | 57 ++++++++++++++++++------------- 1 file changed, 34 insertions(+), 23 deletions(-) (limited to 'src/main/resources/application.properties') diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2f6809646..fd908c874 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -30,7 +30,7 @@ info.build.version=@project.version@ server.contextPath=/ #Modified engine-rest applicationpath spring.jersey.application-path=/engine-rest -spring.profiles.active=clamp-default +spring.profiles.active=clamp-default,clamp-spring-authentication spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration #The max number of active threads in this pool @@ -62,39 +62,40 @@ kubernetes.namespace=com-att-ajsc #server.port=0 #Camunda Process Engine DataSource connection Details -spring.datasource.url=jdbc:mysql://localhost:${docker.mariadb.port.host}/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true -spring.datasource.username=camunda -spring.datasource.password=ndMSpw4CAM -spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.camunda.url=jdbc:mysql://localhost:${docker.mariadb.port.host}/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true +spring.datasource.camunda.username=camunda +spring.datasource.camunda.password=ndMSpw4CAM +spring.datasource.camunda.driverClassName=com.mysql.jdbc.Driver +spring.datasource.camunda.validationQuery=SELECT 1 +spring.datasource.camunda.validationQueryTimeout=20000 +spring.datasource.camunda.validationInterval=60000 +spring.datasource.camunda.testWhileIdle = true +# Automatically test whether a connection provided is good or not +spring.datasource.camunda.testOnBorrow=true #Camunda application properties #Camunda history level camunda.bpm.history-level=auto #clds datasource connection details -spring.cldsdatasource.driver-class-name=com.mysql.jdbc.Driver -spring.cldsdatasource.url=jdbc:mysql://localhost:${docker.mariadb.port.host}/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true -spring.cldsdatasource.username=clds -spring.cldsdatasource.password=sidnnd83K -spring.cldsdatasource.poolinitialsize=1 -spring.cldsdatasource.poolmaxactive=5 -spring.cldsdatasource.poolmaxwait=5000 -spring.cldsdatasource.pooltestonborrow=true -spring.cldsdatasource.poolvalidationquery=SELECT 1 -spring.cldsdatasource.poolvalidationquerytimeout=5000 +spring.datasource.cldsdb.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.cldsdb.url=jdbc:mysql://localhost:${docker.mariadb.port.host}/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true +spring.datasource.cldsdb.username=clds +spring.datasource.cldsdb.password=sidnnd83K +spring.datasource.cldsdb.driverClassName=com.mysql.jdbc.Driver +spring.datasource.cldsdb.validationQuery=SELECT 1 +spring.datasource.cldsdb.validationQueryTimeout=20000 +spring.datasource.cldsdb.validationInterval=60000 +spring.datasource.cldsdb.testWhileIdle = true +# Automatically test whether a connection provided is good or not +spring.datasource.cldsdb.testOnBorrow=true #Async Executor default Parameters async.core.pool.size=10 async.max.pool.size=20 async.queue.capacity=500 -#CSI Logging Queue -JMS_WMQ_PROVIDER_URL=aftdsc://AFTUAT/34.07/-84.28 -JMS_WMQ_CONNECTION_FACTORY_NAME=aftdsc://AFTUAT/?service=CSILOG,version=4.0,bindingType=fusionBus,envContext=Q,Q30A=YES -JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME=com.att.aft.jms.FusionCtxFactory -JMS_WMQ_AUDIT_DESTINATION_NAME=queue:///CSILOGQL.M2E.DASHBOARD01.NOT.Q30A -JMS_WMQ_PERF_DESTINATION_NAME=queue:///CSILOGQL.M2E.PERFORMANCE01.NOT.Q30A -csiEnable=true +org.onap.clamp.config.dcae.url=http://localhost:9000/closedloop-dcae-services #GRM Edge endpoint details service.name=ajsc6camundademo @@ -105,4 +106,14 @@ application.name=AJSC6CAMUNDA org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.properties org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties -org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.properties +org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json +org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties + +#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case ! +CLDS_PERMISSION_TYPE_CL=permission-type-cl +CLDS_PERMISSION_TYPE_CL_MANAGE=permission-type-cl-manage +CLDS_PERMISSION_TYPE_CL_EVENT=permission-type-cl-event +CLDS_PERMISSION_TYPE_FILTER_VF=permission-type-filter-vf +CLDS_PERMISSION_TYPE_TEMPLATE=permission-type-template +#This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties +CLDS_PERMISSION_INSTANCE=dev \ No newline at end of file -- cgit 1.2.3-korg