Change in name from NonRT to Non-RT

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

diff --git a/README.md b/README.md
index 0317f18..d5771d1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # O-RAN-SC NonRT RIC Controlpanel Web Application
 
-The O-RAN NonRT RIC Controlpanel provides administrative and operator functions for a NearRT RIC through the A1 API.
+The O-RAN Non-RT RIC Controlpanel provides administrative and operator functions for a Near-RT RIC through the A1 API.
 This web app consists of an Angular (version 8) front end
 and a Java (version 11) Spring-Boot (version 2.1) back end.
 

diff --git a/pom.xml b/pom.xml
index 78b2a28..868f8f5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@ limitations under the License.
        </parent>
        <groupId>org.o-ran-sc.portal.nonrtric.controlpanel</groupId>
        <artifactId>nonrtric-controlpanel-parent</artifactId>
-       <name>NonRT RIC Controlpanel project</name>
+       <name>Non-RT RIC Controlpanel project</name>
        <packaging>pom</packaging>
        <version>1.0.0-SNAPSHOT</version>
        <properties>

diff --git a/webapp-backend/README.md b/webapp-backend/README.md
index 9a06c6c..4867adc 100644 (file)
--- a/webapp-backend/README.md
+++ b/webapp-backend/README.md
@@ -1,6 +1,6 @@
-# NonRT RIC Controlpanel Web Application Backend
+# Non-RT RIC Controlpanel Web Application Backend
 
-The NonRT RIC Controlpanel back-end provides REST services to the Controlpanel
+The Non-RT RIC Controlpanel back-end provides REST services to the Controlpanel
 front-end Typescript features running in the user's browser.  For
 production use, it also serves the Angular application files.
 

diff --git a/webapp-backend/config/key.properties.template b/webapp-backend/config/key.properties.template
index 79c63d0..74e7727 100644 (file)
--- a/webapp-backend/config/key.properties.template
+++ b/webapp-backend/config/key.properties.template
@@ -16,6 +16,6 @@
 # limitations under the License.
 # ========================LICENSE_END===================================
 
-# Template for the file that provides a secret key for the NonRT RIC Controlpanel.
+# Template for the file that provides a secret key for the Non-RT RIC Controlpanel.
 
 cipher.enc.key =

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 0efb93e..e7ca3ad 100644 (file)
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -33,7 +33,7 @@ limitations under the License.
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>nonrtric-controlpanel-be</artifactId>
-    <name>NonRT RIC Controlpanel Webapp backend</name>
+    <name>Non-RT RIC Controlpanel Webapp backend</name>
     <properties>
         <epsdk-fw.version>2.6.0</epsdk-fw.version>
         <springfox.version>2.9.2</springfox.version>

diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SwaggerConfiguration.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SwaggerConfiguration.java
index 7e7cd94..b0184d4 100644 (file)
--- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SwaggerConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SwaggerConfiguration.java
@@ -56,10 +56,10 @@ public class SwaggerConfiguration {
     private ApiInfo apiInfo() {
         final String version = ControlpanelApplication.class.getPackage().getImplementationVersion();
         return new ApiInfoBuilder() //
-            .title("NonRT RIC Controlpanel backend") //
-            .description("Proxies access to NearRT RIC.")//
+            .title("Non-RT RIC Controlpanel backend") //
+            .description("Proxies access to Near-RT RIC.")//
             .termsOfServiceUrl("Terms of service") //
-            .contact(new Contact("NonRT RIC Controlpanel Dev Team", //
+            .contact(new Contact("Non-RT RIC Controlpanel Dev Team", //
                 "http://no-docs-yet.org/", //
                 "noreply@O-RAN-SC.org")) //
             .license("Apache 2.0 License").licenseUrl("http://www.apache.org/licenses/LICENSE-2.0") //

diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/portalapi/PortalAuthenticationFilter.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/portalapi/PortalAuthenticationFilter.java
index 3e0fea6..6a0e4c5 100644 (file)
--- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/portalapi/PortalAuthenticationFilter.java
+++ b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/portalapi/PortalAuthenticationFilter.java
@@ -230,7 +230,7 @@ public class PortalAuthenticationFilter implements Filter {
             System.getProperty("line.separator"), //
             "<html>", //
             "<head>", //
-            "<title>NonRT RIC Controlpanel</title>", //
+            "<title>Non-RT RIC Controlpanel</title>", //
             "<style>", //
             "html, body { ", //
             "  font-family: Helvetica, Arial, sans-serif;", //
@@ -238,7 +238,7 @@ public class PortalAuthenticationFilter implements Filter {
             "</style>", //
             "</head>", //
             "<body>", //
-            "<h2>NonRT RIC Controlpanel</h2>", //
+            "<h2>Non-RT RIC Controlpanel</h2>", //
             "<h4>Please log in.</h4>", //
             "<p>", //
             aHref, "Click here to authenticate at the ONAP Portal</a>", //

diff --git a/webapp-backend/src/main/resources/application.properties b/webapp-backend/src/main/resources/application.properties
index 725f658..64866be 100644 (file)
--- a/webapp-backend/src/main/resources/application.properties
+++ b/webapp-backend/src/main/resources/application.properties
@@ -17,7 +17,7 @@
 # limitations under the License.
 # ========================LICENSE_END===================================
 
-# Defines NonRT RIC Controlpanel property keys and default values.
+# Defines Non-RT RIC Controlpanel property keys and default values.
 # Create a copy in the launch directory to override values; or
 # copy to "application-abc.properties" as mentioned in the README.
 
@@ -37,7 +37,7 @@ portalapi.decryptor = org.oransc.portal.nonrtric.controlpanel.portalapi.PortalSd
 portalapi.usercookie = UserId
 
 # portal credentials must be supplied at deployment time
-portalapi.appname = NonRT RIC Controlpanel
+portalapi.appname = Non-RT RIC Controlpanel
 portalapi.username =
 portalapi.password =
 

diff --git a/webapp-backend/src/main/resources/static/error.html b/webapp-backend/src/main/resources/static/error.html
index f52c9b1..c786381 100644 (file)
--- a/webapp-backend/src/main/resources/static/error.html
+++ b/webapp-backend/src/main/resources/static/error.html
@@ -29,7 +29,7 @@ html, body {
 </style>
 </head>
 <body>
-<h2>NonRT RIC Controlpanel Error</h2>
+<h2>Non-RT RIC Controlpanel Error</h2>
 <h4>The previous request could not be processed.</h4>
 <a href="/">Click here to reload the application</a>
 </body>

diff --git a/webapp-frontend/README.md b/webapp-frontend/README.md
index 311464a..fce6e33 100644 (file)
--- a/webapp-frontend/README.md
+++ b/webapp-frontend/README.md
@@ -1,4 +1,4 @@
-# NonRT RIC Controlpanel Web Application Frontend
+# Non-RT RIC Controlpanel Web Application Frontend
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.3.
 

diff --git a/webapp-frontend/pom.xml b/webapp-frontend/pom.xml
index c1ca2bf..6dfa858 100644 (file)
--- a/webapp-frontend/pom.xml
+++ b/webapp-frontend/pom.xml
@@ -29,7 +29,7 @@ limitations under the License.
                <version>1.0.0-SNAPSHOT</version>
        </parent>
        <artifactId>nonrtric-controlpanel-fe</artifactId>
-       <name>NonRT RIC Controlpanel Webapp frontend</name>
+       <name>Non-RT RIC Controlpanel Webapp frontend</name>
        <build>
                <plugins>
                        <plugin>

diff --git a/webapp-frontend/src/app/controlpanel.component.html b/webapp-frontend/src/app/controlpanel.component.html
index 6d47fde..bc7a835 100644 (file)
--- a/webapp-frontend/src/app/controlpanel.component.html
+++ b/webapp-frontend/src/app/controlpanel.component.html
@@ -36,7 +36,7 @@
         <svg class="logo__icon" viewBox="150.3 22.2 400 50">
           <text [ngClass]="{'logo__text-dark': darkMode}" class="logo__text" fill="#432c85" font-size="30"
             font-weight="600" letter-spacing=".1em" transform="translate(149 56)">
-            <tspan x="0" y="0">NonRT RIC Controlpanel</tspan>
+            <tspan x="0" y="0">Non-RT RIC Controlpanel</tspan>
           </text>
         </svg>
 
@@ -77,7 +77,7 @@
           <svg class="logo__icon" viewBox="150.3 22.2 400 50">
             <text [ngClass]="{'logo__text-dark': darkMode}" class="logo__text" fill="#432c85" font-size="30"
               font-weight="600" letter-spacing=".1em" transform="translate(149 56)">
-              <tspan x="0" y="0">NonRT RIC Controlpanel</tspan>
+              <tspan x="0" y="0">Non-RT RIC Controlpanel</tspan>
             </text>
           </svg>
 

diff --git a/webapp-frontend/src/index.html b/webapp-frontend/src/index.html
index 56b34c9..817c092 100644 (file)
--- a/webapp-frontend/src/index.html
+++ b/webapp-frontend/src/index.html
@@ -22,7 +22,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>NonRT RIC Controlpanel</title>
+    <title>Non-RT RIC Controlpanel</title>
     <base href="/">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" type="image/x-icon" href="assets/oran-logo.png">