summaryrefslogtreecommitdiffstats
path: root/models-sim/models-sim-dmaap
diff options
context:
space:
mode:
authora.sreekumar <ajith.sreekumar@bell.ca>2020-06-12 10:40:23 +0100
committera.sreekumar <ajith.sreekumar@bell.ca>2020-06-12 10:59:02 +0100
commitc34fdc19686d70af12e8873b0b01b96dd54c1aa3 (patch)
tree9fd4df62f69b868bfbca8851be21af402f97bf11 /models-sim/models-sim-dmaap
parent2b3254009c353b654a0ebe9a5f5b73836e37360a (diff)
Remove logback.xml files bundled as part of jar
Change-Id: I4d603ea67eca5d8d75b9df004e1ff4a6be2b2a9e Issue-ID: POLICY-2627 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
Diffstat (limited to 'models-sim/models-sim-dmaap')
-rw-r--r--models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh2
-rw-r--r--models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml10
-rw-r--r--models-sim/models-sim-dmaap/src/main/resources/logback.xml46
3 files changed, 2 insertions, 56 deletions
diff --git a/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh b/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh
index 0d152e1db..deb168f5d 100644
--- a/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh
+++ b/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh
@@ -2,6 +2,7 @@
#
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
+# 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.
@@ -50,6 +51,5 @@ $JAVA_HOME/bin/java \
-Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" \
-Djavax.net.ssl.trustStore="$TRUSTSTORE" \
-Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" \
- -Dlogback.configurationFile=$DMAAP_SIM_HOME/etc/logback.xml \
org.onap.policy.models.sim.dmaap.startstop.Main \
-c $CONFIG_FILE
diff --git a/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml b/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml
index 8717701b6..08e202938 100644
--- a/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml
+++ b/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml
@@ -1,6 +1,7 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2019 Nordix Foundation.
+ 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.
@@ -47,15 +48,6 @@
<fileMode>755</fileMode>
</fileSet>
<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/etc
</directory>
<includes>
diff --git a/models-sim/models-sim-dmaap/src/main/resources/logback.xml b/models-sim/models-sim-dmaap/src/main/resources/logback.xml
deleted file mode 100644
index 0e48d611f..000000000
--- a/models-sim/models-sim-dmaap/src/main/resources/logback.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- ============LICENSE_START=======================================================
- Copyright (C) 2019 Nordix Foundation.
- ================================================================================
- 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>DMaaPSim</contextName>
- <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
- <property name="LOG_DIR" value="${java.io.tmpdir}/pf_logging/" />
-
- <!-- USE FOR STD OUT ONLY -->
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
- </encoder>
- </appender>
-
- <root level="info">
- <appender-ref ref="STDOUT" />
- </root>
-
- <logger name="org.eclipse.jetty" level="info" additivity="false">
- <appender-ref ref="STDOUT" />
- </logger>
-
- <logger name="org.onap.policy.models.sim.dmaap" level="debug" additivity="false">
- <appender-ref ref="STDOUT" />
- </logger>
-
-</configuration>