aboutsummaryrefslogtreecommitdiffstats
path: root/workflow-designer-be/src/main/resources
diff options
context:
space:
mode:
authortalig <talig@amdocs.com>2019-11-20 15:13:47 +0200
committertalig <talig@amdocs.com>2019-11-20 15:14:44 +0200
commitc54aacb32df8fcb27375d1b131f76afc0a34d0c7 (patch)
tree8f2f0d927051a65a391744af845fdd760fbd523a /workflow-designer-be/src/main/resources
parent820f4ec65a28ed822d4205b05ac6fbbd910a46cc (diff)
Use versioning, zusammen and session libs from sdc-common-be
zusammen-lib in sdc-common-be uses cassandra 3.6.0 withoutJMXReporting (cassandra 3.4.0 with spring boot 2.1.0 caused: java.lang.NoClassDefFoundError: com/codahale/metrics/JmxReporter) Change-Id: I248442d519b2ad5f4869e9384e447e9004d24586 Issue-ID: SDC-2541 Signed-off-by: talig <talig@amdocs.com>
Diffstat (limited to 'workflow-designer-be/src/main/resources')
-rw-r--r--workflow-designer-be/src/main/resources/application-dev.properties58
-rw-r--r--workflow-designer-be/src/main/resources/application.properties1
2 files changed, 1 insertions, 58 deletions
diff --git a/workflow-designer-be/src/main/resources/application-dev.properties b/workflow-designer-be/src/main/resources/application-dev.properties
deleted file mode 100644
index 2fdd9076..00000000
--- a/workflow-designer-be/src/main/resources/application-dev.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-#/
-# Copyright � 2016-2018 European Support Limited
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#/
-server.servlet.context-path=/
-http.port=${HTTP_PORT:8080}
-
-server.port=${SERVER_PORT:8443}
-server.ssl.enabled=${SERVER_SSL_ENABLED:true}
-server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:!ppJ.JvWn0hGh)oVF]([Kv)^}
-server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:/etc/server-https-keystore/org.onap.sdc.p12}
-server.ssl.key-store-type=${SERVER_SSL_KEYSTORE_TYPE:PKCS12}
-
-sdc.be.protocol=${SDC_PROTOCOL:https}
-sdc.be.endpoint=${SDC_ENDPOINT:}
-sdc.be.external.user=${SDC_USER:}
-sdc.be.external.password=${SDC_PASSWORD:}
-
-#CASSANDRA
-spring.data.cassandra.contact-points=${CS_HOSTS:localhost}
-spring.data.cassandra.keyspace-name=workflow
-spring.data.cassandra.port=${CS_PORT:9042}
-spring.data.cassandra.username=${CS_USER:}
-spring.data.cassandra.password=${CS_PASSWORD:}
-zusammen.cassandra.isAuthenticate=${CS_AUTHENTICATE:false}
-spring.data.cassandra.ssl=${CS_SSL_ENABLED:false}
-zusammen.cassandra.trustStorePath=${CS_TRUST_STORE_PATH:}
-zusammen.cassandra.trustStorePassword=${CS_TRUST_STORE_PASSWORD:}
-
-#Actuators
-management.endpoint.health.show-details=always
-
-#Headers are comma separated list
-onap.logging.requestIdHeader=X-ECOMP-RequestID,X-ONAP-RequestID
-onap.logging.partnerNameHeader=USER_ID
-
-logging.level.org.springframework=INFO
-logging.level.org.onap.sdc.workflow=INFO
-
-#output to a temp_folder/file
-logging.file=${java.io.tmpdir}/application.log
-
-# Logging pattern for the console
-logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} - %msg%n
-
-# Logging pattern for file
-logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%
diff --git a/workflow-designer-be/src/main/resources/application.properties b/workflow-designer-be/src/main/resources/application.properties
index 5a4b7af7..7dcc2c4b 100644
--- a/workflow-designer-be/src/main/resources/application.properties
+++ b/workflow-designer-be/src/main/resources/application.properties
@@ -44,6 +44,7 @@ zusammen.cassandra.isAuthenticate=${CS_AUTHENTICATE:false}
spring.data.cassandra.ssl=${CS_SSL_ENABLED:false}
zusammen.cassandra.trustStorePath=${CS_TRUST_STORE_PATH:}
zusammen.cassandra.trustStorePassword=${CS_TRUST_STORE_PASSWORD:}
+spring.data.cassandra.jmx-enabled=false
#Actuators
management.endpoint.health.show-details=always