Rename things to new name

Issue-ID: NONRTRIC-717
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: I357a740e63eb98cdc295bd14b9753182f2167eb9

diff --git a/Dockerfile b/Dockerfile
index ed4be95..cdba409 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,27 +21,27 @@ FROM openjdk:11-jre-slim
 
 ARG JAR
 
-WORKDIR /opt/app/r-app-catalogue
-RUN mkdir -p /var/log/r-app-catalogue
-RUN mkdir -p /opt/app/r-app-catalogue/etc/cert/
+WORKDIR /opt/app/rappcatalogue
+RUN mkdir -p /var/log/rappcatalogue
+RUN mkdir -p /opt/app/rappcatalogue/etc/cert/
 
 EXPOSE 8680 8633
 
-ADD /config/application.yaml /opt/app/r-app-catalogue/config/application.yaml
-ADD /config/r-app-catalogue-keystore.jks /opt/app/r-app-catalogue/etc/cert/keystore.jks
-ADD target/${JAR} /opt/app/r-app-catalogue/r-app-catalogue.jar
+ADD /config/application.yaml /opt/app/rappcatalogue/config/application.yaml
+ADD /config/rappcatalogue-keystore.jks /opt/app/rappcatalogue/etc/cert/keystore.jks
+ADD target/${JAR} /opt/app/rappcatalogue/rappcatalogue.jar
 
 ARG user=nonrtric
 ARG group=nonrtric
 
 RUN groupadd $user && \
     useradd -r -g $group $user
-RUN chown -R $user:$group /opt/app/r-app-catalogue
-RUN chown -R $user:$group /var/log/r-app-catalogue
+RUN chown -R $user:$group /opt/app/rappcatalogue
+RUN chown -R $user:$group /var/log/rappcatalogue
 
 USER ${user}
 
-CMD ["java", "-jar", "/opt/app/r-app-catalogue/r-app-catalogue.jar"]
+CMD ["java", "-jar", "/opt/app/rappcatalogue/rappcatalogue.jar"]
 
 
 

diff --git a/config/application.yaml b/config/application.yaml
index 1ef0bdc..c363691 100644 (file)
--- a/config/application.yaml
+++ b/config/application.yaml
@@ -24,7 +24,7 @@ server:
    http-port: 8680
    ssl:
       key-store-type: JKS
-      key-store: /opt/app/r-app-catalogue/etc/cert/keystore.jks
+      key-store: /opt/app/rappcatalogue/etc/cert/keystore.jks
       key-store-password: r-app-catalogue
       key-password: r-app-catalogue
       key-alias: server-cert

diff --git a/config/r-app-catalogue-keystore.jks b/config/rappcatalogue-keystore.jks
similarity index 100%
rename from config/r-app-catalogue-keystore.jks
rename to config/rappcatalogue-keystore.jks

diff --git a/pom.xml b/pom.xml
index 38b7b6d..28cde06 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -272,7 +272,7 @@
                 <inherited>false</inherited>
                 <executions>
                     <execution>
-                        <id>generate-r-app-catalogue-image</id>
+                        <id>generate-rappcatalogue-image</id>
                         <phase>package</phase>
                         <goals>
                             <goal>build</goal>
@@ -298,7 +298,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>push-r-app-catalogue-image</id>
+                        <id>push-rappcatalogue-image</id>
                         <goals>
                             <goal>build</goal>
                             <goal>push</goal>

diff --git a/src/test/java/org/oransc/rappcatalogue/HttpsRequestTest.java b/src/test/java/org/oransc/rappcatalogue/HttpsRequestTest.java
index 642ca70..5e12f13 100644 (file)
--- a/src/test/java/org/oransc/rappcatalogue/HttpsRequestTest.java
+++ b/src/test/java/org/oransc/rappcatalogue/HttpsRequestTest.java
@@ -51,7 +51,7 @@ import org.springframework.web.client.ResourceAccessException;
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @TestPropertySource(
     properties = { //
-        "server.ssl.key-store=./config/r-app-catalogue-keystore.jks", //
+        "server.ssl.key-store=./config/rappcatalogue-keystore.jks", //
         "server.http-port=0"})
 class HttpsRequestTest {