From: liboNet Date: Thu, 21 Mar 2019 18:35:16 +0000 (+0800) Subject: add packages support for artifact broker X-Git-Tag: 1.3.0~20 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=74c55a7fa750262c3063f6ae8655f209ac63722b add packages support for artifact broker add a submodule of packages to generate a .zip file. update related pom.xml to make it friendly readable. use the 9014 as healthcheck targetPort Change-Id: I98ed96639bbf6ecfeb87f1bffe2e55e7a62ac062 Issue-ID: MULTICLOUD-546 Signed-off-by: liboNet --- diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index 875a14f..36ae6d9 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -24,7 +24,7 @@ 1.3.0-SNAPSHOT 4.0.0 - main + multicloud-framework-artifactbroker-main ${project.artifactId} The main module of Policy Distribution that handles startup, lifecycle management, and parameters. diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml new file mode 100644 index 0000000..a90cd49 --- /dev/null +++ b/artifactbroker/packages/pom.xml @@ -0,0 +1,66 @@ + + + + 4.0.0 + + org.onap.multicloud.framework.broker + multicloud-framework-artifactbroker + 1.3.0-SNAPSHOT + + + multicloud-framework-artifactbroker-package + ${project.artifactId} + [${project.parent.artifactId}] + + + + org.onap.multicloud.framework.broker + multicloud-framework-artifactbroker-main + ${project.version} + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + generate-complete-tar + package + + single + + + false + + src/main/package/tarball/assembly.xml + + + + + + + + diff --git a/artifactbroker/packages/src/main/package/tarball/assembly.xml b/artifactbroker/packages/src/main/package/tarball/assembly.xml new file mode 100644 index 0000000..0c28db1 --- /dev/null +++ b/artifactbroker/packages/src/main/package/tarball/assembly.xml @@ -0,0 +1,70 @@ + + + + tarball + + zip + + false + + + true + /lib + false + runtime + + *:jar + + + + + + ${project.basedir}/src/main/resources + + policyLogger.properties + + /bin/config + unix + + + ${project.basedir}/src/main/resources/etc + + + *.json + *.xml + + /etc + unix + + *.formatted + + + + ${project.basedir}/src/main/resources/etc/ssl + + + policy* + + /etc/ssl + keep + + + diff --git a/artifactbroker/packages/src/main/resources/etc/defaultConfig.json b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json new file mode 100644 index 0000000..cb8e1ea --- /dev/null +++ b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json @@ -0,0 +1,10 @@ +{ + "name":"SDCDistributionGroup", + "restServerParameters":{ + "host":"0.0.0.0", + "port":9014, + "userName":"healthcheck", + "password":"zb!XztG34", + "https":true + } +} diff --git a/artifactbroker/packages/src/main/resources/etc/logback.xml b/artifactbroker/packages/src/main/resources/etc/logback.xml new file mode 100644 index 0000000..ebe06a8 --- /dev/null +++ b/artifactbroker/packages/src/main/resources/etc/logback.xml @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> + + + + + + + + + + + + + + + + + + + + ${defaultPattern} + + + + + + + + + + + + + ${logDirectory}/${auditLogName}.log + + ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log.zip + + + 50MB + 30 + 10GB + + + + ${defaultAuditPattern} + + + + + 256 + + + + + + + + ${logDirectory}/${metricsLogName}.log + + ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log.zip + + + 50MB + 30 + 10GB + + + + ${defaultMetricPattern} + + + + + 256 + + + + + + + + ${logDirectory}/${errorLogName}.log + + ${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log.zip + + + 50MB + 30 + 10GB + + + ERROR + + + ${defaultErrorPattern} + + + + + 256 + + + + + + + ${debugLogDirectory}/${debugLogName}.log + + ${debugLogDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log.zip + + + 50MB + 30 + 10GB + + + DEBUG + + + + ${debugLoggerPattern} + + + + + 256 + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/artifactbroker/packages/src/main/resources/etc/ssl/policy-keystore b/artifactbroker/packages/src/main/resources/etc/ssl/policy-keystore new file mode 100644 index 0000000..7d2b1ec Binary files /dev/null and b/artifactbroker/packages/src/main/resources/etc/ssl/policy-keystore differ diff --git a/artifactbroker/packages/src/main/resources/etc/ssl/policy-truststore b/artifactbroker/packages/src/main/resources/etc/ssl/policy-truststore new file mode 100644 index 0000000..8834ac2 Binary files /dev/null and b/artifactbroker/packages/src/main/resources/etc/ssl/policy-truststore differ diff --git a/artifactbroker/packages/src/main/resources/policyLogger.properties b/artifactbroker/packages/src/main/resources/policyLogger.properties new file mode 100644 index 0000000..0ff9ebe --- /dev/null +++ b/artifactbroker/packages/src/main/resources/policyLogger.properties @@ -0,0 +1,44 @@ +### +# ============LICENSE_START======================================================= +# Copyright (C) 2018 Ericsson. All rights reserved. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +### + +################################## Set concurrentHashMap and timer info ####################### +#Timer initial delay and the delay between in milliseconds before task is to be execute. +timer.delay.time=1000 +#Timer scheduleAtFixedRate period - time in milliseconds between successive task executions. +check.interval= 30000 +#Longest time an event info can be stored in the concurrentHashMap for logging - in seconds. +event.expired.time=86400 +#Size of the concurrentHashMap which stores the event starting time, etc - when its size reaches this limit, the Timer gets executed +#to remove all expired records from this concurrentHashMap. +concurrentHashMap.limit=5000 +#Size of the concurrentHashMap - when its size drops to this point, stop the Timer +stop.check.point=2500 +################################### Set logging format ############################################# +# set EELF for EELF logging format, set LOG4J for using log4j, set SYSTEMOUT for using system.out.println +logger.type=EELF +#################################### Set level for EELF or SYSTEMOUT logging ################################## +# Set level for debug file. Set DEBUG to enable .info, .warn and .debug; set INFO for enable .info and .warn; set OFF to disable all +debugLogger.level=INFO +# Set level for metrics file. Set OFF to disable; set ON to enable +metricsLogger.level=ON +# Set level for error file. Set OFF to disable; set ON to enable +error.level=ON +# Set level for audit file. Set OFF to disable; set ON to enable +audit.level=ON diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index 971eac7..201a780 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -40,6 +40,7 @@ main + packages