Revise groupIds in POM files; no functional changes

Harmonize package name components like ric.plt to ric-plt.
Clean up some comments in POM files also.

Change-Id: I7d17b2fc71fc89194cb1cefd594b0d7fbd58857e
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

diff --git a/dashboard/a1-med-client/pom.xml b/dashboard/a1-med-client/pom.xml
index 227b09c..34ee440 100644 (file)
--- a/dashboard/a1-med-client/pom.xml
+++ b/dashboard/a1-med-client/pom.xml
@@ -28,9 +28,9 @@ limitations under the License.
                <version>2.0.1-SNAPSHOT</version>
        </parent>
        <!-- This groupId will NOT allow deployment in LF -->
-       <groupId>org.o-ran-sc.ric.plt.a1med.client</groupId>
+       <groupId>org.o-ran-sc.ric-plt.a1.client</groupId>
        <artifactId>a1-med-client</artifactId>
-       <name>RIC A1 Mediator client</name>
+       <name>RIC A1 Mediator Client</name>
        <!-- Update to match submodule tag -->
        <version>2.1.0-SNAPSHOT</version>
        <properties>
@@ -39,7 +39,7 @@ limitations under the License.
                <!-- Jenkins invokes maven with -Dbuild.number=.. -->
                <build.number>0</build.number>
                <!-- same as groupId BUT without hyphens -->
-               <client.base.package.name>org.oransc.ric.a1med.client</client.base.package.name>
+               <client.base.package.name>org.oransc.ricplt.a1.client</client.base.package.name>
        </properties>
        <!-- Successful compilation requires generated code dependencies -->
        <dependencies>

diff --git a/dashboard/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java b/dashboard/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java
index 7066f2f..8e5cef4 100644 (file)
--- a/dashboard/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java
+++ b/dashboard/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java
@@ -21,8 +21,8 @@ package org.oransc.ric.portal.dashboard.a1med.client.test;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.oransc.ric.a1med.client.api.A1MediatorApi;
-import org.oransc.ric.a1med.client.invoker.ApiClient;
+import org.oransc.ricplt.a1.client.api.A1MediatorApi;
+import org.oransc.ricplt.a1.client.invoker.ApiClient;
 import org.springframework.web.client.RestClientException;
 
 /**

diff --git a/dashboard/app-mgr-client/pom.xml b/dashboard/app-mgr-client/pom.xml
index 6f60811..3c1ae83 100644 (file)
--- a/dashboard/app-mgr-client/pom.xml
+++ b/dashboard/app-mgr-client/pom.xml
@@ -28,9 +28,9 @@ limitations under the License.
                <version>2.0.1-SNAPSHOT</version>
        </parent>
        <!-- This groupId will NOT allow deployment in LF -->
-       <groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
+       <groupId>org.o-ran-sc.ric-plt.appmgr.client</groupId>
        <artifactId>app-mgr-client</artifactId>
-       <name>RIC App Manager client</name>
+       <name>RIC App Manager Client</name>
        <!-- Update to match submodule tag -->
        <version>0.3.3-SNAPSHOT</version>
        <properties>
@@ -39,7 +39,7 @@ limitations under the License.
                <!-- Jenkins invokes maven with -Dbuild.number=.. -->
                <build.number>0</build.number>
                <!-- same as groupId BUT without hyphens -->
-               <client.base.package.name>org.oransc.ric.plt.appmgr.client</client.base.package.name>
+               <client.base.package.name>org.oransc.ricplt.appmgr.client</client.base.package.name>
        </properties>
        <!-- Successful compilation requires generated code dependencies -->
        <dependencies>

diff --git a/dashboard/app-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/appmgr/client/test/AppManagerClientTest.java b/dashboard/app-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/appmgr/client/test/AppManagerClientTest.java
index a459375..614e173 100644 (file)
--- a/dashboard/app-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/appmgr/client/test/AppManagerClientTest.java
+++ b/dashboard/app-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/appmgr/client/test/AppManagerClientTest.java
@@ -21,11 +21,11 @@ package org.oransc.ric.portal.dashboard.appmgr.client.test;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.oransc.ric.plt.appmgr.client.api.HealthApi;
-import org.oransc.ric.plt.appmgr.client.api.XappApi;
-import org.oransc.ric.plt.appmgr.client.invoker.ApiClient;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps;
-import org.oransc.ric.plt.appmgr.client.model.Xapp;
+import org.oransc.ricplt.appmgr.client.api.HealthApi;
+import org.oransc.ricplt.appmgr.client.api.XappApi;
+import org.oransc.ricplt.appmgr.client.invoker.ApiClient;
+import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps;
+import org.oransc.ricplt.appmgr.client.model.Xapp;
 import org.springframework.web.client.RestClientException;
 
 /**

diff --git a/dashboard/e2-mgr-client/pom.xml b/dashboard/e2-mgr-client/pom.xml
index 08a13df..d19f810 100644 (file)
--- a/dashboard/e2-mgr-client/pom.xml
+++ b/dashboard/e2-mgr-client/pom.xml
@@ -28,9 +28,9 @@ limitations under the License.
                <version>2.0.1-SNAPSHOT</version>
        </parent>
        <!-- This groupId will NOT allow deployment in LF -->
-       <groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
+       <groupId>org.o-ran-sc.ric-plt.e2mgr.client</groupId>
        <artifactId>e2-mgr-client</artifactId>
-       <name>RIC E2 Manager client</name>
+       <name>RIC E2 Manager Client</name>
        <version>3.0.3-SNAPSHOT</version>
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@ limitations under the License.
                <!-- Jenkins invokes maven with -Dbuild.number=.. -->
                <build.number>0</build.number>
                <!-- same as groupId BUT without hyphens -->
-               <client.base.package.name>org.oransc.ric.e2mgr.client</client.base.package.name>
+               <client.base.package.name>org.oransc.ricplt.e2mgr.client</client.base.package.name>
        </properties>
        <!-- Successful compilation requires generated code dependencies -->
        <dependencies>

diff --git a/dashboard/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java b/dashboard/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java
index 14e5258..f242009 100644 (file)
--- a/dashboard/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java
+++ b/dashboard/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java
@@ -21,8 +21,8 @@ package org.oransc.ric.portal.dashboard.e2mgr.client.test;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
-import org.oransc.ric.e2mgr.client.invoker.ApiClient;
+import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi;
+import org.oransc.ricplt.e2mgr.client.invoker.ApiClient;
 import org.springframework.web.client.RestClientException;
 
 /**

diff --git a/dashboard/pom.xml b/dashboard/pom.xml
index 3723fc3..b61a4b0 100644 (file)
--- a/dashboard/pom.xml
+++ b/dashboard/pom.xml
@@ -23,7 +23,6 @@ limitations under the License.
        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>
        <parent>
-               <!-- this group Id must match LF gerrit repository -->
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-parent</artifactId>
                <version>2.2.4.RELEASE</version>
@@ -31,7 +30,7 @@ limitations under the License.
        </parent>
        <groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
        <artifactId>ric-dash-parent</artifactId>
-       <name>RIC Dashboard project</name>
+       <name>RIC Dashboard Project</name>
        <packaging>pom</packaging>
        <version>2.0.1-SNAPSHOT</version>
        <properties>

diff --git a/dashboard/webapp-backend/pom.xml b/dashboard/webapp-backend/pom.xml
index f1dfa7f..5e94421 100644 (file)
--- a/dashboard/webapp-backend/pom.xml
+++ b/dashboard/webapp-backend/pom.xml
@@ -27,8 +27,9 @@ limitations under the License.
                <artifactId>ric-dash-parent</artifactId>
                <version>2.0.1-SNAPSHOT</version>
        </parent>
+       <!-- reuse parent groupId -->
        <artifactId>ric-dash-be</artifactId>
-       <name>RIC Dashboard Webapp backend</name>
+       <name>RIC Dashboard Webapp Backend</name>
        <properties>
                <springfox.version>2.9.2</springfox.version>
                <!-- Set by Jenkins -->
@@ -44,17 +45,17 @@ limitations under the License.
        <dependencies>
                <!-- Platform components -->
                <dependency>
-                       <groupId>org.o-ran-sc.ric.plt.a1med.client</groupId>
+                       <groupId>org.o-ran-sc.ric-plt.a1.client</groupId>
                        <artifactId>a1-med-client</artifactId>
                        <version>2.1.0-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
+                       <groupId>org.o-ran-sc.ric-plt.appmgr.client</groupId>
                        <artifactId>app-mgr-client</artifactId>
                        <version>0.3.3-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
+                       <groupId>org.o-ran-sc.ric-plt.e2mgr.client</groupId>
                        <artifactId>e2-mgr-client</artifactId>
                        <version>3.0.3-SNAPSHOT</version>
                </dependency>

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorApiBuilder.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorApiBuilder.java
index 21f3033..4604e3c 100644 (file)
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorApiBuilder.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorApiBuilder.java
@@ -21,10 +21,10 @@ package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.a1med.client.api.A1MediatorApi;
-import org.oransc.ric.a1med.client.invoker.ApiClient;
 import org.oransc.ric.portal.dashboard.model.RicInstance;
 import org.oransc.ric.portal.dashboard.model.RicRegionList;
+import org.oransc.ricplt.a1.client.api.A1MediatorApi;
+import org.oransc.ricplt.a1.client.invoker.ApiClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.client.RestTemplate;

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerApiBuilder.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerApiBuilder.java
index c92baa7..5ea3d95 100644 (file)
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerApiBuilder.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerApiBuilder.java
@@ -21,11 +21,11 @@ package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.plt.appmgr.client.api.HealthApi;
-import org.oransc.ric.plt.appmgr.client.api.XappApi;
-import org.oransc.ric.plt.appmgr.client.invoker.ApiClient;
 import org.oransc.ric.portal.dashboard.model.RicInstance;
 import org.oransc.ric.portal.dashboard.model.RicRegionList;
+import org.oransc.ricplt.appmgr.client.api.HealthApi;
+import org.oransc.ricplt.appmgr.client.api.XappApi;
+import org.oransc.ricplt.appmgr.client.invoker.ApiClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.client.RestTemplate;

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerApiBuilder.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerApiBuilder.java
index c029184..9b8a01c 100644 (file)
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerApiBuilder.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerApiBuilder.java
@@ -21,11 +21,11 @@ package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
-import org.oransc.ric.e2mgr.client.api.NodebApi;
-import org.oransc.ric.e2mgr.client.invoker.ApiClient;
 import org.oransc.ric.portal.dashboard.model.RicInstance;
 import org.oransc.ric.portal.dashboard.model.RicRegionList;
+import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi;
+import org.oransc.ricplt.e2mgr.client.api.NodebApi;
+import org.oransc.ricplt.e2mgr.client.invoker.ApiClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.client.RestTemplate;

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediatorController.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediatorController.java
index 2b64e8d..c31fc0b 100644 (file)
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediatorController.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediatorController.java
@@ -22,12 +22,12 @@ package org.oransc.ric.portal.dashboard.controller;
 import java.lang.invoke.MethodHandles;
 import java.util.List;
 
-import org.oransc.ric.a1med.client.api.A1MediatorApi;
-import org.oransc.ric.a1med.client.model.PolicyTypeSchema;
 import org.oransc.ric.portal.dashboard.DashboardApplication;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.config.A1MediatorApiBuilder;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
+import org.oransc.ricplt.a1.client.api.A1MediatorApi;
+import org.oransc.ricplt.a1.client.model.PolicyTypeSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java
index b9695f5..cd3d8a9 100644 (file)
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java
@@ -21,21 +21,21 @@ package org.oransc.ric.portal.dashboard.controller;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.plt.appmgr.client.api.HealthApi;
-import org.oransc.ric.plt.appmgr.client.api.XappApi;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployableXapps;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps;
-import org.oransc.ric.plt.appmgr.client.model.AllXappConfig;
-import org.oransc.ric.plt.appmgr.client.model.ConfigValidationErrors;
-import org.oransc.ric.plt.appmgr.client.model.XAppConfig;
-import org.oransc.ric.plt.appmgr.client.model.Xapp;
-import org.oransc.ric.plt.appmgr.client.model.XappDescriptor;
 import org.oransc.ric.portal.dashboard.DashboardApplication;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.config.AppManagerApiBuilder;
 import org.oransc.ric.portal.dashboard.model.AppTransport;
 import org.oransc.ric.portal.dashboard.model.DashboardDeployableXapps;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
+import org.oransc.ricplt.appmgr.client.api.HealthApi;
+import org.oransc.ricplt.appmgr.client.api.XappApi;
+import org.oransc.ricplt.appmgr.client.model.AllDeployableXapps;
+import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps;
+import org.oransc.ricplt.appmgr.client.model.AllXappConfig;
+import org.oransc.ricplt.appmgr.client.model.ConfigValidationErrors;
+import org.oransc.ricplt.appmgr.client.model.XAppConfig;
+import org.oransc.ricplt.appmgr.client.model.Xapp;
+import org.oransc.ricplt.appmgr.client.model.XappDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java
index 296d33b..ea0422e 100644 (file)
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java
@@ -23,17 +23,17 @@ import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
-import org.oransc.ric.e2mgr.client.api.NodebApi;
-import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
-import org.oransc.ric.e2mgr.client.model.NodebIdentity;
-import org.oransc.ric.e2mgr.client.model.ResetRequest;
-import org.oransc.ric.e2mgr.client.model.SetupRequest;
 import org.oransc.ric.portal.dashboard.DashboardApplication;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.config.E2ManagerApiBuilder;
 import org.oransc.ric.portal.dashboard.model.RanDetailsTransport;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
+import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi;
+import org.oransc.ricplt.e2mgr.client.api.NodebApi;
+import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse;
+import org.oransc.ricplt.e2mgr.client.model.NodebIdentity;
+import org.oransc.ricplt.e2mgr.client.model.ResetRequest;
+import org.oransc.ricplt.e2mgr.client.model.SetupRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RanDetailsTransport.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RanDetailsTransport.java
index bb581aa..6045127 100644 (file)
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RanDetailsTransport.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RanDetailsTransport.java
@@ -19,8 +19,8 @@
  */
 package org.oransc.ric.portal.dashboard.model;
 
-import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
-import org.oransc.ric.e2mgr.client.model.NodebIdentity;
+import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse;
+import org.oransc.ricplt.e2mgr.client.model.NodebIdentity;
 
 public class RanDetailsTransport implements IDashboardResponse {
 

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java
index 67b2176..b1ff3f9 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java
@@ -31,10 +31,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.oransc.ric.a1med.client.api.A1MediatorApi;
-import org.oransc.ric.a1med.client.invoker.ApiClient;
-import org.oransc.ric.a1med.client.model.PolicyTypeSchema;
 import org.oransc.ric.portal.dashboard.TestUtils;
+import org.oransc.ricplt.a1.client.api.A1MediatorApi;
+import org.oransc.ricplt.a1.client.invoker.ApiClient;
+import org.oransc.ricplt.a1.client.model.PolicyTypeSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
index 36f6ff3..32a775f 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
@@ -26,23 +26,23 @@ import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.plt.appmgr.client.api.HealthApi;
-import org.oransc.ric.plt.appmgr.client.api.XappApi;
-import org.oransc.ric.plt.appmgr.client.invoker.ApiClient;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployableXapps;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps;
-import org.oransc.ric.plt.appmgr.client.model.AllXappConfig;
-import org.oransc.ric.plt.appmgr.client.model.ConfigMetadata;
-import org.oransc.ric.plt.appmgr.client.model.ConfigValidationError;
-import org.oransc.ric.plt.appmgr.client.model.ConfigValidationErrors;
-import org.oransc.ric.plt.appmgr.client.model.EventType;
-import org.oransc.ric.plt.appmgr.client.model.SubscriptionRequest;
-import org.oransc.ric.plt.appmgr.client.model.SubscriptionResponse;
-import org.oransc.ric.plt.appmgr.client.model.XAppConfig;
-import org.oransc.ric.plt.appmgr.client.model.Xapp;
-import org.oransc.ric.plt.appmgr.client.model.Xapp.StatusEnum;
-import org.oransc.ric.plt.appmgr.client.model.XappDescriptor;
-import org.oransc.ric.plt.appmgr.client.model.XappInstance;
+import org.oransc.ricplt.appmgr.client.api.HealthApi;
+import org.oransc.ricplt.appmgr.client.api.XappApi;
+import org.oransc.ricplt.appmgr.client.invoker.ApiClient;
+import org.oransc.ricplt.appmgr.client.model.AllDeployableXapps;
+import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps;
+import org.oransc.ricplt.appmgr.client.model.AllXappConfig;
+import org.oransc.ricplt.appmgr.client.model.ConfigMetadata;
+import org.oransc.ricplt.appmgr.client.model.ConfigValidationError;
+import org.oransc.ricplt.appmgr.client.model.ConfigValidationErrors;
+import org.oransc.ricplt.appmgr.client.model.EventType;
+import org.oransc.ricplt.appmgr.client.model.SubscriptionRequest;
+import org.oransc.ricplt.appmgr.client.model.SubscriptionResponse;
+import org.oransc.ricplt.appmgr.client.model.XAppConfig;
+import org.oransc.ricplt.appmgr.client.model.Xapp;
+import org.oransc.ricplt.appmgr.client.model.Xapp.StatusEnum;
+import org.oransc.ricplt.appmgr.client.model.XappDescriptor;
+import org.oransc.ricplt.appmgr.client.model.XappInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
index 16d2486..812ba20 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
@@ -30,14 +30,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
-import org.oransc.ric.e2mgr.client.api.NodebApi;
-import org.oransc.ric.e2mgr.client.invoker.ApiClient;
-import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
-import org.oransc.ric.e2mgr.client.model.NodebIdentity;
-import org.oransc.ric.e2mgr.client.model.NodebIdentityGlobalNbId;
-import org.oransc.ric.e2mgr.client.model.ResetRequest;
-import org.oransc.ric.e2mgr.client.model.SetupRequest;
+import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi;
+import org.oransc.ricplt.e2mgr.client.api.NodebApi;
+import org.oransc.ricplt.e2mgr.client.invoker.ApiClient;
+import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse;
+import org.oransc.ricplt.e2mgr.client.model.NodebIdentity;
+import org.oransc.ricplt.e2mgr.client.model.NodebIdentityGlobalNbId;
+import org.oransc.ricplt.e2mgr.client.model.ResetRequest;
+import org.oransc.ricplt.e2mgr.client.model.SetupRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/A1MediatorConfigTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/A1MediatorConfigTest.java
index 286cfed..cdea6d4 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/A1MediatorConfigTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/A1MediatorConfigTest.java
@@ -21,9 +21,9 @@ package org.oransc.ric.portal.dashboard.config.test;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.oransc.ric.a1med.client.api.A1MediatorApi;
 import org.oransc.ric.portal.dashboard.config.A1MediatorApiBuilder;
 import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
+import org.oransc.ricplt.a1.client.api.A1MediatorApi;
 
 public class A1MediatorConfigTest extends AbstractConfigTest {
 

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/AppManagerConfigTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/AppManagerConfigTest.java
index adb428f..7f23286 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/AppManagerConfigTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/AppManagerConfigTest.java
@@ -21,10 +21,10 @@ package org.oransc.ric.portal.dashboard.config.test;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.oransc.ric.plt.appmgr.client.api.HealthApi;
-import org.oransc.ric.plt.appmgr.client.api.XappApi;
 import org.oransc.ric.portal.dashboard.config.AppManagerApiBuilder;
 import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
+import org.oransc.ricplt.appmgr.client.api.HealthApi;
+import org.oransc.ricplt.appmgr.client.api.XappApi;
 
 public class AppManagerConfigTest extends AbstractConfigTest {
 

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/E2ManagerConfigTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/E2ManagerConfigTest.java
index 8f79e38..c89a9f4 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/E2ManagerConfigTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/E2ManagerConfigTest.java
@@ -21,10 +21,10 @@ package org.oransc.ric.portal.dashboard.config.test;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
-import org.oransc.ric.e2mgr.client.api.NodebApi;
 import org.oransc.ric.portal.dashboard.config.E2ManagerApiBuilder;
 import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
+import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi;
+import org.oransc.ricplt.e2mgr.client.api.NodebApi;
 
 public class E2ManagerConfigTest extends AbstractConfigTest {
 

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java
index 4021f5c..2a9b820 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java
@@ -27,11 +27,11 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.oransc.ric.a1med.client.model.PolicyTypeSchema;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.config.A1MediatorMockConfiguration;
 import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
+import org.oransc.ricplt.a1.client.model.PolicyTypeSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java
index 52a383e..779feaf 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java
@@ -24,15 +24,15 @@ import java.net.URI;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps;
-import org.oransc.ric.plt.appmgr.client.model.AllXappConfig;
-import org.oransc.ric.plt.appmgr.client.model.XAppConfig;
-import org.oransc.ric.plt.appmgr.client.model.Xapp;
-import org.oransc.ric.plt.appmgr.client.model.XappDescriptor;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
 import org.oransc.ric.portal.dashboard.model.DashboardDeployableXapps;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
+import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps;
+import org.oransc.ricplt.appmgr.client.model.AllXappConfig;
+import org.oransc.ricplt.appmgr.client.model.XAppConfig;
+import org.oransc.ricplt.appmgr.client.model.Xapp;
+import org.oransc.ricplt.appmgr.client.model.XappDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java
index e6744fe..96ff35e 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java
@@ -25,15 +25,15 @@ import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
-import org.oransc.ric.e2mgr.client.model.NodebIdentity;
-import org.oransc.ric.e2mgr.client.model.ResetRequest;
-import org.oransc.ric.e2mgr.client.model.SetupRequest;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.config.E2ManagerMockConfiguration;
 import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
 import org.oransc.ric.portal.dashboard.model.RanDetailsTransport;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
+import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse;
+import org.oransc.ricplt.e2mgr.client.model.NodebIdentity;
+import org.oransc.ricplt.e2mgr.client.model.ResetRequest;
+import org.oransc.ricplt.e2mgr.client.model.SetupRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java
index 8e2ddeb..17fb48f 100644 (file)
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java
@@ -26,10 +26,10 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.onap.portalsdk.core.restful.domain.EcompUser;
-import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
-import org.oransc.ric.e2mgr.client.model.NodebIdentity;
 import org.oransc.ric.portal.dashboard.DashboardUserManagerTest;
 import org.oransc.ric.portal.dashboard.exception.UnknownInstanceException;
+import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse;
+import org.oransc.ricplt.e2mgr.client.model.NodebIdentity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/dashboard/webapp-frontend/pom.xml b/dashboard/webapp-frontend/pom.xml
index c39db7f..d726109 100644 (file)
--- a/dashboard/webapp-frontend/pom.xml
+++ b/dashboard/webapp-frontend/pom.xml
@@ -27,8 +27,9 @@ limitations under the License.
                <artifactId>ric-dash-parent</artifactId>
                <version>2.0.1-SNAPSHOT</version>
        </parent>
+       <!-- reuse parent groupId -->
        <artifactId>ric-dash-fe</artifactId>
-       <name>RIC Dashboard Webapp frontend</name>
+       <name>RIC Dashboard Webapp Frontend</name>
        <build>
                <plugins>
                        <plugin>