change project structure

Change-Id: Ie2b844f4fff8a3a26c2b34f8a5ee747f498f1bb2
Issue-Id: USECASEUI-36
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>

diff --git a/pom.xml b/pom.xml
index 32866ac..434e3f6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,17 @@
     </parent>
 
     <groupId>org.onap.usecase-ui.server</groupId>
-    <artifactId>usecase-ui-server</artifactId>
+    <artifactId>usecase-ui-server-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>usecase-ui/server</name>
+    <packaging>pom</packaging>
+    <name>usecase-ui-server</name>
     <description>project for usecase-ui server</description>
 
+    <modules>
+      <module>server</module>
+      <!--module>standalone</module-->
+    </modules>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -186,7 +191,7 @@
         <dependency>
             <groupId>org.openecomp.sdc.jtosca</groupId>
             <artifactId>jtosca</artifactId>
-            <version>1.1.3-SNAPSHOT</version>
+            <version>1.1.11-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/server/pom.xml b/server/pom.xml
new file mode 100644 (file)
index 0000000..c4ab57a
--- /dev/null
+++ b/server/pom.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+
+    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.
+ -->
+<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>
+
+    <parent>
+        <groupId>org.onap.usecase-ui.server</groupId>
+        <artifactId>usecase-ui-server-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.usecase-ui.server</groupId>
+    <artifactId>usecase-ui-server</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>usecase-ui/server</name>
+    <description>project for usecase-ui server</description>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <hibernate.version>5.0.11.Final</hibernate.version>
+        <spring.version>4.3.4.RELEASE</spring.version>
+        <javax.persistence.version>1.0.2</javax.persistence.version>
+        <common.csv.version>1.4</common.csv.version>
+        <jackson.version>2.9.0</jackson.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <!-- Import dependency management from Spring Boot -->
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>1.4.2.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-rest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-rest-hal-browser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jersey</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.restdocs</groupId>
+            <artifactId>spring-restdocs-mockmvc</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>persistence-api</artifactId>
+            <version>${javax.persistence.version}</version>
+        </dependency>
+
+        <!-- commons-csv -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
+            <version>${common.csv.version}</version>
+        </dependency>
+
+        <!-- jackson-databind -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <!-- jackson-core -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <!-- jackson-annotations -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>retrofit</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-jackson</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openecomp.sdc.jtosca</groupId>
+            <artifactId>jtosca</artifactId>
+            <version>1.1.11-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>23.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <executable>true</executable>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+</project>

diff --git a/src/main/java/org/onap/usecaseui/server/UsecaseuiServerApplication.java b/server/src/main/java/org/onap/usecaseui/server/UsecaseuiServerApplication.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/UsecaseuiServerApplication.java
rename to server/src/main/java/org/onap/usecaseui/server/UsecaseuiServerApplication.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/ActiveAlarmInfo.java b/server/src/main/java/org/onap/usecaseui/server/bean/ActiveAlarmInfo.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/ActiveAlarmInfo.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/ActiveAlarmInfo.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/AlarmsHeader.java b/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsHeader.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/AlarmsHeader.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/AlarmsHeader.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/AlarmsInformation.java b/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsInformation.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/AlarmsInformation.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/AlarmsInformation.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplate.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplate.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplate.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplate.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplateInput.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplateInput.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplateInput.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplateInput.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplateInputRsp.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplateInputRsp.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplateInputRsp.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/lcm/ServiceTemplateInputRsp.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/lcm/TemplateInput.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/TemplateInput.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/lcm/TemplateInput.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/lcm/TemplateInput.java

diff --git a/src/main/java/org/onap/usecaseui/server/bean/lcm/VfNsPackageInfo.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/VfNsPackageInfo.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/bean/lcm/VfNsPackageInfo.java
rename to server/src/main/java/org/onap/usecaseui/server/bean/lcm/VfNsPackageInfo.java

diff --git a/src/main/java/org/onap/usecaseui/server/constant/Constant.java b/server/src/main/java/org/onap/usecaseui/server/constant/Constant.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/constant/Constant.java
rename to server/src/main/java/org/onap/usecaseui/server/constant/Constant.java

diff --git a/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
rename to server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java

diff --git a/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java b/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java
rename to server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java

diff --git a/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java
rename to server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java

diff --git a/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
rename to server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java

diff --git a/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java
rename to server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java

diff --git a/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java
rename to server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java

diff --git a/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java
rename to server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java

diff --git a/src/main/java/org/onap/usecaseui/server/dao/UsecaseuiDataSource.java b/server/src/main/java/org/onap/usecaseui/server/dao/UsecaseuiDataSource.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/dao/UsecaseuiDataSource.java
rename to server/src/main/java/org/onap/usecaseui/server/dao/UsecaseuiDataSource.java

diff --git a/src/main/java/org/onap/usecaseui/server/exception/ErrorCodeException.java b/server/src/main/java/org/onap/usecaseui/server/exception/ErrorCodeException.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/exception/ErrorCodeException.java
rename to server/src/main/java/org/onap/usecaseui/server/exception/ErrorCodeException.java

diff --git a/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java b/server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java
rename to server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java

diff --git a/src/main/java/org/onap/usecaseui/server/listener/UsecaseServerEventListener.java b/server/src/main/java/org/onap/usecaseui/server/listener/UsecaseServerEventListener.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/listener/UsecaseServerEventListener.java
rename to server/src/main/java/org/onap/usecaseui/server/listener/UsecaseServerEventListener.java

diff --git a/src/main/java/org/onap/usecaseui/server/security/RestfulSecurityConfig.java b/server/src/main/java/org/onap/usecaseui/server/security/RestfulSecurityConfig.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/security/RestfulSecurityConfig.java
rename to server/src/main/java/org/onap/usecaseui/server/security/RestfulSecurityConfig.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/AlarmService.java b/server/src/main/java/org/onap/usecaseui/server/service/AlarmService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/AlarmService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/AlarmService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/AlarmsHeaderService.java b/server/src/main/java/org/onap/usecaseui/server/service/AlarmsHeaderService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/AlarmsHeaderService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/AlarmsHeaderService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/AlarmsInformationService.java b/server/src/main/java/org/onap/usecaseui/server/service/AlarmsInformationService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/AlarmsInformationService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/AlarmsInformationService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/InitializationService.java b/server/src/main/java/org/onap/usecaseui/server/service/InitializationService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/InitializationService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/InitializationService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/PerformanceHeaderService.java b/server/src/main/java/org/onap/usecaseui/server/service/PerformanceHeaderService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/PerformanceHeaderService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/PerformanceHeaderService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/PerformanceInformationService.java b/server/src/main/java/org/onap/usecaseui/server/service/PerformanceInformationService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/PerformanceInformationService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/PerformanceInformationService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/impl/AlarmServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmServiceImpl.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/impl/AlarmServiceImpl.java
rename to server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmServiceImpl.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
rename to server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
rename to server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/impl/InitializationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/InitializationServiceImpl.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/impl/InitializationServiceImpl.java
rename to server/src/main/java/org/onap/usecaseui/server/service/impl/InitializationServiceImpl.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java
rename to server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java
rename to server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/CustomerService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/CustomerService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/CustomerService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/CustomerService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceInstanceService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/ServiceInstanceService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceInstanceService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceLcmService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceLcmService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/ServiceLcmService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceLcmService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceTemplateService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceTemplateService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/ServiceTemplateService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceTemplateService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAICustomer.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAICustomer.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAICustomer.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAICustomer.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ServiceInstance.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ServiceInstance.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ServiceInstance.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ServiceInstance.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/VimInfo.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/VimInfo.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/VimInfo.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/VimInfo.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/exceptions/AAIException.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/exceptions/AAIException.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/exceptions/AAIException.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/exceptions/AAIException.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/SDCCatalogService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/SDCCatalogService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/SDCCatalogService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/SDCCatalogService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/SDCServiceTemplate.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/SDCServiceTemplate.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/SDCServiceTemplate.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/SDCServiceTemplate.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/Vnf.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/Vnf.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/Vnf.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/Vnf.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/consts/SDCConsts.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/consts/SDCConsts.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/consts/SDCConsts.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/consts/SDCConsts.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/exceptions/SDCCatalogException.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/exceptions/SDCCatalogException.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/exceptions/SDCCatalogException.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/exceptions/SDCCatalogException.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/OperationProgressInformation.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/OperationProgressInformation.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/OperationProgressInformation.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/OperationProgressInformation.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/ServiceInstantiationRequest.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/ServiceInstantiationRequest.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/ServiceInstantiationRequest.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/ServiceInstantiationRequest.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/ServiceOperation.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/ServiceOperation.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/ServiceOperation.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/ServiceOperation.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/exceptions/SOException.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/exceptions/SOException.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/exceptions/SOException.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/exceptions/SOException.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java

diff --git a/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java
rename to server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java

diff --git a/src/main/java/org/onap/usecaseui/server/util/CSVUtils.java b/server/src/main/java/org/onap/usecaseui/server/util/CSVUtils.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/util/CSVUtils.java
rename to server/src/main/java/org/onap/usecaseui/server/util/CSVUtils.java

diff --git a/src/main/java/org/onap/usecaseui/server/util/DataUtils.java b/server/src/main/java/org/onap/usecaseui/server/util/DataUtils.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/util/DataUtils.java
rename to server/src/main/java/org/onap/usecaseui/server/util/DataUtils.java

diff --git a/src/main/java/org/onap/usecaseui/server/util/Page.java b/server/src/main/java/org/onap/usecaseui/server/util/Page.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/util/Page.java
rename to server/src/main/java/org/onap/usecaseui/server/util/Page.java

diff --git a/src/main/java/org/onap/usecaseui/server/util/RestfulServices.java b/server/src/main/java/org/onap/usecaseui/server/util/RestfulServices.java
similarity index 100%
rename from src/main/java/org/onap/usecaseui/server/util/RestfulServices.java
rename to server/src/main/java/org/onap/usecaseui/server/util/RestfulServices.java

diff --git a/src/main/resources/application.properties b/server/src/main/resources/application.properties
similarity index 100%
rename from src/main/resources/application.properties
rename to server/src/main/resources/application.properties

diff --git a/src/test/java/org/onap/usecaseui/server/UsecaseuiServerApplicationTests.java b/server/src/test/java/org/onap/usecaseui/server/UsecaseuiServerApplicationTests.java
similarity index 100%
rename from src/test/java/org/onap/usecaseui/server/UsecaseuiServerApplicationTests.java
rename to server/src/test/java/org/onap/usecaseui/server/UsecaseuiServerApplicationTests.java