aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--distribution/music/Dockerfile2
-rw-r--r--distribution/music/startup.sh4
-rwxr-xr-xjar/pom.xml40
-rwxr-xr-xpom.xml2
-rw-r--r--src/main/java/org/onap/music/eelf/logging/MusicLoggingServletFilter.java2
5 files changed, 25 insertions, 25 deletions
diff --git a/distribution/music/Dockerfile b/distribution/music/Dockerfile
index fcfb05fd..98e8ea41 100644
--- a/distribution/music/Dockerfile
+++ b/distribution/music/Dockerfile
@@ -24,7 +24,7 @@ LABEL purpose="Springboot for MUSIC"
RUN apt-get update && apt-get install -y netcat telnet vim vim-common curl
RUN groupadd --gid 1000 music && useradd --gid 1000 --uid 1000 music
RUN mkdir -p /opt/app/music/logs/MUSIC
-COPY MUSIC.jar /opt/app/music
+COPY MUSIC-SB.jar /opt/app/music
COPY startup.sh /opt/app/music
RUN mkdir -p /opt/app/music/logs && \
chown -R music:music /opt/app/music/ && \
diff --git a/distribution/music/startup.sh b/distribution/music/startup.sh
index a6d8308e..61536832 100644
--- a/distribution/music/startup.sh
+++ b/distribution/music/startup.sh
@@ -37,6 +37,6 @@ if [ ${EXTAP} ]; then
EXTAP_OPTION="--spring.config.location=file:${EXTAP_FILE}"
fi
fi
-echo "java -jar MUSIC.jar ${EXTAP_OPTION} --server.ssl.key-store-password=${PASSWORD} --aaf_password=enc:${PASSWORD} 2>&1 | tee ${LOGFILE}"
-java -jar MUSIC.jar ${EXTAP_OPTION} --server.ssl.key-store-password="${PASSWORD}" --aaf_password="enc:${PASSWORD}" 2>&1 | tee ${LOGFILE}
+echo "java -jar MUSIC-SB.jar ${EXTAP_OPTION} --server.ssl.key-store-password=${PASSWORD} --aaf_password=enc:${PASSWORD} 2>&1 | tee ${LOGFILE}"
+java -jar MUSIC-SB.jar ${EXTAP_OPTION} --server.ssl.key-store-password="${PASSWORD}" --aaf_password="enc:${PASSWORD}" 2>&1 | tee ${LOGFILE}
diff --git a/jar/pom.xml b/jar/pom.xml
index 81f0d8f6..af4bdb6d 100755
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -1,4 +1,4 @@
-<!--
+<!--
============LICENSE_START==========================================
org.onap.music
===================================================================
@@ -7,18 +7,18 @@
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.
-
+
============LICENSE_END=============================================
====================================================================
--->
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -215,15 +215,15 @@
<version>1.0.1-oss</version>
</dependency>
<!-- End Logging -->
-
- <!-- Cassandra -->
+
+ <!-- Cassandra -->
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>${cassandra.version}</version>
</dependency>
- <!-- /Cassandra -->
-
+ <!-- /Cassandra -->
+
<!-- Zookeeper -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -237,7 +237,7 @@
</exclusions>
</dependency>
<!-- /Zookeeper -->
-
+
<!-- Jersey -->
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -254,10 +254,10 @@
<artifactId>jersey-json</artifactId>
<version>${jersey1.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- <version>${jersey1.version}</version>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey1.version}</version>
</dependency>
<!-- /Jersey -->
@@ -447,14 +447,14 @@
</build>
</image>
<!-- Zookeeper -->
- <!-- <image> <name>onap/music/zookeeper_music</name>
- <alias>docker_zookeeper</alias> <build> <cleanup>true</cleanup> <tags> <tag>3.4-${timestamp}</tag>
- <tag>3.4-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/zookeeper</dockerFileDir>
+ <!-- <image> <name>onap/music/zookeeper_music</name>
+ <alias>docker_zookeeper</alias> <build> <cleanup>true</cleanup> <tags> <tag>3.4-${timestamp}</tag>
+ <tag>3.4-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/zookeeper</dockerFileDir>
</build> </image> -->
<!-- tomcat 8.5 -->
- <!-- <image> <name>onap/music/tomcat_music</name>
- <alias>docker_tomcat</alias> <build> <cleanup>true</cleanup> <tags> <tag>8.5-${timestamp}</tag>
- <tag>8.5-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/tomcat</dockerFileDir>
+ <!-- <image> <name>onap/music/tomcat_music</name>
+ <alias>docker_tomcat</alias> <build> <cleanup>true</cleanup> <tags> <tag>8.5-${timestamp}</tag>
+ <tag>8.5-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/tomcat</dockerFileDir>
</build> </image>\ -->
</images>
</configuration>
diff --git a/pom.xml b/pom.xml
index 085d3b7f..406e7864 100755
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,6 @@
</repositories>
<build>
- <!-- <finalName>${project.artifactId}-${project.version}-${timestamp}</finalName>-->
<finalName>${project.artifactId}</finalName>
<sourceDirectory>src/main/java</sourceDirectory>
<outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory>
@@ -146,6 +145,7 @@
<mainClass>org.onap.music.MusicApplication</mainClass>
<outputDirectory>./distribution/music/</outputDirectory>
<addResources>true</addResources>
+ <finalName>${project.artifactId}-SB</finalName>
</configuration>
<executions>
<execution>
diff --git a/src/main/java/org/onap/music/eelf/logging/MusicLoggingServletFilter.java b/src/main/java/org/onap/music/eelf/logging/MusicLoggingServletFilter.java
index 1cac7737..c8c6ba65 100644
--- a/src/main/java/org/onap/music/eelf/logging/MusicLoggingServletFilter.java
+++ b/src/main/java/org/onap/music/eelf/logging/MusicLoggingServletFilter.java
@@ -172,7 +172,7 @@ public class MusicLoggingServletFilter implements Filter {
}
private void populateMDCAndResponseHeader(Map<String, String> headerMap, String idKey, String mdcKey,
- boolean isRequired, HttpServletResponse httpResponse) throws IOException {
+ boolean isRequired, HttpServletResponse httpResponse) {
idKey = idKey.trim().toUpperCase();