diff options
| -rw-r--r-- | engine-d-standalone/src/main/assembly/conf/engine-d.yml | 150 | ||||
| -rw-r--r-- | engine-d/pom.xml | 10 | ||||
| -rw-r--r-- | pom.xml | 7 |
3 files changed, 75 insertions, 92 deletions
diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml index 4709864..ca4f243 100644 --- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml +++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml @@ -1,75 +1,75 @@ -#
-# Copyright 2017 ZTE Corporation.
-#
-# 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:
- type: simple
- rootPath: '/api/holmes-engine-mgmt/v1/*'
- applicationContextPath: /
- adminContextPath: /admin
- connector:
- type: https
- port: 9102
- keyStorePath: /home/holmes/conf/holmes.keystore
- keyStorePassword: holmes
- validateCerts: false
- validatePeers: false
-
-
-# Logging settings.
-logging:
-
- # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL.
- level: ALL
-
- # Logger-specific levels.
- loggers:
-
- # Sets the level for 'com.example.app' to DEBUG.
- org.onap.holmes.engine: ALL
-
- appenders:
- - type: console
- threshold: ALL
- timeZone: UTC
- logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"
- - type: file
- threshold: ERROR
- logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"
- currentLogFilename: /var/log/ONAP/holmes/engine-d-error.log
- archivedLogFilenamePattern: /var/log/ONAP/holmes/zip/engine-d-error-%d{yyyy-MM-dd}.log.gz
- archivedFileCount: 7
- - type: file
- threshold: DEBUG
- logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"
- currentLogFilename: /var/log/ONAP/holmes/engine-d-debug.log
- archivedLogFilenamePattern: /var/log/ONAP/holmes/zip/engine-d-debug-%d{yyyy-MM-dd}.log.gz
- archivedFileCount: 7
-
-
-database:
- driverClass: org.postgresql.Driver
- user: holmes
- password: holmespwd
- url: jdbc:postgresql://10.96.33.33:5432/holmes
- properties:
- charSet: UTF-8
- maxWaitForConnection: 1s
- validationQuery: "/* MyService Health Check */ SELECT 1"
- minSize: 8
- maxSize: 100
- checkConnectionWhileIdle: false
- evictionInterval: 10s
- minIdleTime: 1s
-
+# +# Copyright 2017 ZTE Corporation. +# +# 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: + type: simple + rootPath: '/api/holmes-engine-mgmt/v1/*' + applicationContextPath: / + adminContextPath: /admin + connector: + type: https + port: 9102 + keyStorePath: /home/holmes/conf/holmes.keystore + keyStorePassword: holmes + validateCerts: false + validatePeers: false + + +# Logging settings. +logging: + + # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL. + level: ALL + + # Logger-specific levels. + loggers: + + # Sets the level for 'com.example.app' to DEBUG. + org.onap.holmes.engine: ALL + + appenders: + - type: console + threshold: ALL + timeZone: UTC + logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n" + - type: file + threshold: ERROR + logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n" + currentLogFilename: /var/log/ONAP/holmes/engine-d-error.log + archivedLogFilenamePattern: /var/log/ONAP/holmes/zip/engine-d-error-%d{yyyy-MM-dd}.log.gz + archivedFileCount: 7 + - type: file + threshold: DEBUG + logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n" + currentLogFilename: /var/log/ONAP/holmes/engine-d-debug.log + archivedLogFilenamePattern: /var/log/ONAP/holmes/zip/engine-d-debug-%d{yyyy-MM-dd}.log.gz + archivedFileCount: 7 + + +database: + driverClass: org.postgresql.Driver + user: holmes + password: holmespwd + url: jdbc:postgresql://10.96.33.33:5432/holmes + properties: + charSet: UTF-8 + maxWaitForConnection: 1s + validationQuery: "/* MyService Health Check */ SELECT 1" + minSize: 8 + maxSize: 100 + checkConnectionWhileIdle: false + evictionInterval: 10s + minIdleTime: 1s + diff --git a/engine-d/pom.xml b/engine-d/pom.xml index 490d2e0..53f486a 100644 --- a/engine-d/pom.xml +++ b/engine-d/pom.xml @@ -228,16 +228,6 @@ <artifactId>postgresql</artifactId> </dependency> <dependency> - <groupId>org.quartz-scheduler</groupId> - <artifactId>quartz</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -54,7 +54,6 @@ <jaxrs.consumer.version>5.0</jaxrs.consumer.version> <slf4j.version>1.7.25</slf4j.version> <reflections.version>0.9.9</reflections.version> - <quartz.version>2.2.1</quartz.version> <packagename>onap-holmes-engine-d</packagename> <linux64id>linux64</linux64id> @@ -137,12 +136,6 @@ </dependency> <dependency> - <groupId>org.quartz-scheduler</groupId> - <artifactId>quartz</artifactId> - <version>${quartz.version}</version> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.8.2</version> |