Re-structuring maven modules

Change-Id: Icd4e4e474c784c1599e95d59b0d2b1c4cf397bf6
Issue-ID: SO-3487
Signed-off-by: Mukesh <mukeshsharma@est.tech>

17 files changed, 67 insertions, 65 deletions

diff --git a/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/pom.xml b/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/pom.xml
deleted file mode 100644
index 63a46c6..0000000
--- a/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/pom.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-pkgm</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-pkgm-adapter</artifactId>
-  <name>ETSI SOL003 VNF Package Management Adapter</name>
-</project>
\ No newline at end of file
diff --git a/etsi-sol003-pkgm/etsi-sol003-pkgm-api/pom.xml b/etsi-sol003-pkgm/etsi-sol003-pkgm-api/pom.xml
deleted file mode 100644
index 9b3709b..0000000
--- a/etsi-sol003-pkgm/etsi-sol003-pkgm-api/pom.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-pkgm</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-pkgm-api</artifactId>
-  <name>ETSI SOL003 VNF Package Management Adapter API</name>
-</project>
\ No newline at end of file
diff --git a/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/pom.xml b/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/pom.xml
deleted file mode 100644
index 98816ad..0000000
--- a/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/pom.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-pkgm</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-pkgm-ext-clients</artifactId>
-  <name>ETSI SOL003 VNF Package Management Adapter Ext Clients</name>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2195785..d8e1a42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>so</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.onap.so.adapters</groupId>
+    <groupId>org.onap.so.so-etsi-sol003-adapter</groupId>
     <artifactId>so-etsi-sol003-adapter</artifactId>
     <version>1.7.1-SNAPSHOT</version>
     <name>SO ETSI SOL003 Adapter</name>
@@ -47,9 +47,9 @@
     </build>
 
     <modules>
-        <module>etsi-sol003-adapter-common</module>
-        <module>etsi-sol003-pkgm</module>
-        <module>etsi-sol003-lcm</module>
-        <module>etsi-sol003-adapter-application</module>
+        <module>so-etsi-sol003-adapter-common</module>
+        <module>so-etsi-sol003-adapter-pkgm</module>
+        <module>so-etsi-sol003-adapter-lcm</module>
+        <module>so-etsi-sol003-adapter-application</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/etsi-sol003-adapter-common/pom.xml b/so-etsi-sol003-adapter-application/pom.xml
index 39444d4..02cf7e3 100644
--- a/etsi-sol003-adapter-common/pom.xml
+++ b/so-etsi-sol003-adapter-application/pom.xml
@@ -1,10 +1,10 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.onap.so.adapters</groupId>
+    <groupId>org.onap.so.so-etsi-sol003-adapter</groupId>
     <artifactId>so-etsi-sol003-adapter</artifactId>
     <version>1.7.1-SNAPSHOT</version>
   </parent>
-  <artifactId>etsi-sol003-adapter-common</artifactId>
-  <name>ETSI SOL003 Adapter Common</name>
+  <artifactId>so-etsi-sol003-adapter-application</artifactId>
+  <name>SO ETSI SOL003 Application Jar</name>
 </project>
\ No newline at end of file
diff --git a/etsi-sol003-adapter-application/pom.xml b/so-etsi-sol003-adapter-common/pom.xml
index d80c742..cb1467a 100644
--- a/etsi-sol003-adapter-application/pom.xml
+++ b/so-etsi-sol003-adapter-common/pom.xml
@@ -1,10 +1,10 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.onap.so.adapters</groupId>
+    <groupId>org.onap.so.so-etsi-sol003-adapter</groupId>
     <artifactId>so-etsi-sol003-adapter</artifactId>
     <version>1.7.1-SNAPSHOT</version>
   </parent>
-  <artifactId>etsi-sol003-adapter-application</artifactId>
-  <name>ETSI SOL003 Application Jar</name>
+  <artifactId>so-etsi-sol003-adapter-common</artifactId>
+  <name>SO ETSI SOL003 Adapter Common</name>
 </project>
\ No newline at end of file
diff --git a/etsi-sol003-lcm/pom.xml b/so-etsi-sol003-adapter-lcm/pom.xml
index 209717e..0bd68bb 100644
--- a/etsi-sol003-lcm/pom.xml
+++ b/so-etsi-sol003-adapter-lcm/pom.xml
@@ -2,17 +2,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.so.adapters</groupId>
+        <groupId>org.onap.so.so-etsi-sol003-adapter</groupId>
         <artifactId>so-etsi-sol003-adapter</artifactId>
         <version>1.7.1-SNAPSHOT</version>
     </parent>
-    <artifactId>etsi-sol003-lcm</artifactId>
-    <name>ETSI SOL003 Life Cycle Management</name>
+    <groupId>org.onap.so.so-etsi-sol003-adapter.lcm</groupId>
+    <artifactId>so-etsi-sol003-adapter-lcm</artifactId>
+    <name>SO ETSI SOL003 Life Cycle Management</name>
     <packaging>pom</packaging>
 
     <modules>
-        <module>etsi-sol003-lcm-api</module>
-        <module>etsi-sol003-lcm-ext-clients</module>
-        <module>etsi-sol003-lcm-adapter</module>
+        <module>so-etsi-sol003-adapter-lcm-api</module>
+        <module>so-etsi-sol003-adapter-lcm-ext-clients</module>
+        <module>so-etsi-sol003-adapter-lcm-service</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/etsi-sol003-lcm/etsi-sol003-lcm-api/pom.xml b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-api/pom.xml
index aa8eed3..facf00b 100644
--- a/etsi-sol003-lcm/etsi-sol003-lcm-api/pom.xml
+++ b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-api/pom.xml
@@ -2,12 +2,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.so.adapters</groupId>
-        <artifactId>etsi-sol003-lcm</artifactId>
+        <groupId>org.onap.so.so-etsi-sol003-adapter.lcm</groupId>
+        <artifactId>so-etsi-sol003-adapter-lcm</artifactId>
         <version>1.7.1-SNAPSHOT</version>
     </parent>
-    <artifactId>etsi-sol003-lcm-api</artifactId>
-    <name>ETSI SOL003 Life Cycle Management Adapter API</name>
+    <artifactId>so-etsi-sol003-adapter-lcm-api</artifactId>
+    <name>SO ETSI SOL003 Life Cycle Management Adapter API</name>
     <build>
         <plugins>
             <plugin>
diff --git a/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-api/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json
index d3b6eba..d3b6eba 100644
--- a/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json
+++ b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-api/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json
diff --git a/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-api/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json
index aab56ee..aab56ee 100644
--- a/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json
+++ b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-api/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json
diff --git a/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/etsisol003adapter.yaml b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-api/src/main/resources/etsisol003adapter.yaml
index 578708d..578708d 100644
--- a/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/etsisol003adapter.yaml
+++ b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-api/src/main/resources/etsisol003adapter.yaml
diff --git a/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-ext-clients/pom.xml b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-ext-clients/pom.xml
new file mode 100644
index 0000000..e29ece6
--- /dev/null
+++ b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-ext-clients/pom.xml
@@ -0,0 +1,10 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.so-etsi-sol003-adapter.lcm</groupId>
+    <artifactId>so-etsi-sol003-adapter-lcm</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>so-etsi-sol003-adapter-lcm-ext-clients</artifactId>
+  <name>SO ETSI SOL003 Life Cycle Management Adapter Ext Clients</name>
+</project>
\ No newline at end of file
diff --git a/etsi-sol003-lcm/etsi-sol003-lcm-adapter/pom.xml b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-service/pom.xml
index c4b06f5..0d1d5d4 100644
--- a/etsi-sol003-lcm/etsi-sol003-lcm-adapter/pom.xml
+++ b/so-etsi-sol003-adapter-lcm/so-etsi-sol003-adapter-lcm-service/pom.xml
@@ -1,10 +1,10 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-lcm</artifactId>
+    <groupId>org.onap.so.so-etsi-sol003-adapter.lcm</groupId>
+    <artifactId>so-etsi-sol003-adapter-lcm</artifactId>
     <version>1.7.1-SNAPSHOT</version>
   </parent>
-  <artifactId>etsi-sol003-lcm-adapter</artifactId>
-  <name>ETSI SOL003 Life Cycle Management Adapter</name>
+  <artifactId>so-etsi-sol003-adapter-lcm-service</artifactId>
+  <name>SO ETSI SOL003 Life Cycle Management Service</name>
 </project>
\ No newline at end of file
diff --git a/etsi-sol003-pkgm/pom.xml b/so-etsi-sol003-adapter-pkgm/pom.xml
index 85d9cd4..9b101b8 100644
--- a/etsi-sol003-pkgm/pom.xml
+++ b/so-etsi-sol003-adapter-pkgm/pom.xml
@@ -2,16 +2,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.so.adapters</groupId>
+        <groupId>org.onap.so.so-etsi-sol003-adapter</groupId>
         <artifactId>so-etsi-sol003-adapter</artifactId>
         <version>1.7.1-SNAPSHOT</version>
     </parent>
-    <artifactId>etsi-sol003-pkgm</artifactId>
-    <name>ETSI SOL003 VNF Package Management</name>
+    <groupId>org.onap.so.so-etsi-sol003-adapter.pkgm</groupId>
+    <artifactId>so-etsi-sol003-adapter-pkgm</artifactId>
+    <name>SO ETSI SOL003 VNF Package Management</name>
     <packaging>pom</packaging>
     <modules>
-        <module>etsi-sol003-pkgm-api</module>
-        <module>etsi-sol003-pkgm-ext-clients</module>
-        <module>etsi-sol003-pkgm-adapter</module>
+        <module>so-etsi-sol003-adapter-pkgm-api</module>
+        <module>so-etsi-sol003-adapter-pkgm-ext-clients</module>
+        <module>so-etsi-sol003-adapter-pkgm-service</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/etsi-sol003-lcm/etsi-sol003-lcm-ext-clients/pom.xml b/so-etsi-sol003-adapter-pkgm/so-etsi-sol003-adapter-pkgm-api/pom.xml
index 63ee5da..2fffd8a 100644
--- a/etsi-sol003-lcm/etsi-sol003-lcm-ext-clients/pom.xml
+++ b/so-etsi-sol003-adapter-pkgm/so-etsi-sol003-adapter-pkgm-api/pom.xml
@@ -1,10 +1,10 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-lcm</artifactId>
+    <groupId>org.onap.so.so-etsi-sol003-adapter.pkgm</groupId>
+    <artifactId>so-etsi-sol003-adapter-pkgm</artifactId>
     <version>1.7.1-SNAPSHOT</version>
   </parent>
-  <artifactId>etsi-sol003-lcm-ext-clients</artifactId>
-  <name>ETSI SOL003 Life Cycle Management Adapter Ext Clients</name>
+  <artifactId>so-etsi-sol003-adapter-pkgm-api</artifactId>
+  <name>SO ETSI SOL003 VNF Package Management Adapter API</name>
 </project>
\ No newline at end of file
diff --git a/so-etsi-sol003-adapter-pkgm/so-etsi-sol003-adapter-pkgm-ext-clients/pom.xml b/so-etsi-sol003-adapter-pkgm/so-etsi-sol003-adapter-pkgm-ext-clients/pom.xml
new file mode 100644
index 0000000..0903630
--- /dev/null
+++ b/so-etsi-sol003-adapter-pkgm/so-etsi-sol003-adapter-pkgm-ext-clients/pom.xml
@@ -0,0 +1,10 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.so-etsi-sol003-adapter.pkgm</groupId>
+    <artifactId>so-etsi-sol003-adapter-pkgm</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>so-etsi-sol003-adapter-pkgm-ext-clients</artifactId>
+  <name>SO ETSI SOL003 VNF Package Management Adapter Ext Clients</name>
+</project>
\ No newline at end of file
diff --git a/so-etsi-sol003-adapter-pkgm/so-etsi-sol003-adapter-pkgm-service/pom.xml b/so-etsi-sol003-adapter-pkgm/so-etsi-sol003-adapter-pkgm-service/pom.xml
new file mode 100644
index 0000000..569b4ca
--- /dev/null
+++ b/so-etsi-sol003-adapter-pkgm/so-etsi-sol003-adapter-pkgm-service/pom.xml
@@ -0,0 +1,10 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.so-etsi-sol003-adapter.pkgm</groupId>
+    <artifactId>so-etsi-sol003-adapter-pkgm</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>so-etsi-sol003-adapter-pkgm-service</artifactId>
+  <name>SO ETSI SOL003 VNF Package Management Service</name>
+</project>
\ No newline at end of file