diff options
Diffstat (limited to 'models-sim/policy-models-simulators')
3 files changed, 2 insertions, 65 deletions
diff --git a/models-sim/policy-models-simulators/src/main/package/docker/simulators.sh b/models-sim/policy-models-simulators/src/main/package/docker/simulators.sh index 57e742708..7e38f374c 100644 --- a/models-sim/policy-models-simulators/src/main/package/docker/simulators.sh +++ b/models-sim/policy-models-simulators/src/main/package/docker/simulators.sh @@ -4,6 +4,7 @@ # ONAP # ================================================================================ # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Modifications copyright (C) 2020 Bell Canada. 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. @@ -34,7 +35,6 @@ TRUSTSTORE_PASSWD="Pol1cy_0nap" ${JAVA_HOME}/bin/java \ -cp "${SIMULATOR_HOME}/etc:${SIMULATOR_HOME}/lib/*" \ - -Dlogback.configurationFile=${SIMULATOR_HOME}/etc/logback.xml \ -Djavax.net.ssl.keyStore="${KEYSTORE}" \ -Djavax.net.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ diff --git a/models-sim/policy-models-simulators/src/main/package/tarball/assembly.xml b/models-sim/policy-models-simulators/src/main/package/tarball/assembly.xml index 8496fd3c6..9a2fd65df 100644 --- a/models-sim/policy-models-simulators/src/main/package/tarball/assembly.xml +++ b/models-sim/policy-models-simulators/src/main/package/tarball/assembly.xml @@ -1,6 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + Modifications copyright (C) 2020 Bell Canada. 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. @@ -37,14 +38,6 @@ </dependencySets> <fileSets> <fileSet> - <directory>${project.basedir}/src/main/resources</directory> - <includes> - <include>logback.xml</include> - </includes> - <outputDirectory>etc</outputDirectory> - <lineEnding>unix</lineEnding> - </fileSet> - <fileSet> <directory>${project.basedir}/src/main/resources/ssl </directory> <includes> diff --git a/models-sim/policy-models-simulators/src/main/resources/logback.xml b/models-sim/policy-models-simulators/src/main/resources/logback.xml deleted file mode 100644 index da9821aef..000000000 --- a/models-sim/policy-models-simulators/src/main/resources/logback.xml +++ /dev/null @@ -1,56 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2020 AT&T Intellectual Property. 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========================================================= ---> - -<configuration scan="true" scanPeriod="30 seconds" debug="false"> - - <contextName>Simulators</contextName> - <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /> - <property name="logDir" value="${POLICY_LOGS}" /> - - <appender name="DebugOut" - class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${logDir}/debug.log</file> - <rollingPolicy - class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${logDir}/debug.%d{yyyy-MM-dd}.%i.log.zip - </fileNamePattern> - <maxFileSize>50MB</maxFileSize> - <maxHistory>10</maxHistory> - <totalSizeCap>500MB</totalSizeCap> - </rollingPolicy> - <encoder> - <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n - </Pattern> - </encoder> - </appender> - - <root level="info"> - <appender-ref ref="DebugOut" /> - </root> - - <logger name="org.eclipse.jetty" level="info" additivity="false"> - <appender-ref ref="DebugOut" /> - </logger> - - <logger name="org.onap.policy.models.sim.dmaap" level="debug" additivity="false"> - <appender-ref ref="DebugOut" /> - </logger> - -</configuration> |