Remove and Rename modules

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

examples/hawkbit-custom-theme-example/pom.xml

@@ -66,7 +66,7 @@
       </dependency>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-mgmt-ui</artifactId>
+         <artifactId>hawkbit-ui</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

examples/hawkbit-example-app/pom.xml

@@ -67,11 +67,6 @@
          <artifactId>hawkbit-mgmt-resource</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-system-resource</artifactId>
-         <version>${project.version}</version>
-      </dependency>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
          <artifactId>hawkbit-ddi-resource</artifactId>
@@ -84,7 +79,7 @@
       </dependency>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-mgmt-ui</artifactId>
+         <artifactId>hawkbit-ui</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/Start.java

@@ -12,7 +12,6 @@ import org.eclipse.hawkbit.RepositoryApplicationConfiguration;
 import org.eclipse.hawkbit.autoconfigure.security.EnableHawkbitManagedSecurityConfiguration;
 import org.eclipse.hawkbit.ddi.EnableDdiApi;
 import org.eclipse.hawkbit.mgmt.annotation.EnableMgmtApi;
-import org.eclipse.hawkbit.system.annotation.EnableSystemApi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Import;
@@ -27,7 +26,6 @@ import org.springframework.context.annotation.Import;
 @EnableHawkbitManagedSecurityConfiguration
 @EnableMgmtApi
 @EnableDdiApi
-@EnableSystemApi
 // Exception squid:S1118 - Spring boot standard behavior
 @SuppressWarnings({ "squid:S1118" })
 public class Start {

examples/hawkbit-example-core-feign-client/pom.xml

@@ -17,7 +17,7 @@
       <version>0.2.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>hawkbit-example-feign-core-client</artifactId>
+   <artifactId>hawkbit-example-core-feign-client</artifactId>
    <name>hawkBit-example :: Feign Core Client</name>
 
    <dependencies>

examples/hawkbit-example-ddi-feign-client/pom.xml

@@ -16,7 +16,7 @@
       <artifactId>hawkbit-examples-parent</artifactId>
       <version>0.2.0-SNAPSHOT</version>
    </parent>
-   <artifactId>hawkbit-example-ddi-client</artifactId>
+   <artifactId>hawkbit-example-ddi-feign-client</artifactId>
 
    <name>hawkBit-example :: DDI Feign Client</name>
 
@@ -35,7 +35,7 @@
    <dependencies>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-example-feign-core-client</artifactId>
+         <artifactId>hawkbit-example-core-feign-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

examples/hawkbit-example-mgmt-feign-client/pom.xml

@@ -17,13 +17,13 @@
       <version>0.2.0-SNAPSHOT</version>
    </parent>
    <packaging>jar</packaging>
-   <artifactId>hawkbit-example-mgmt-client</artifactId>
+   <artifactId>hawkbit-example-mgmt-feign-client</artifactId>
    <name>hawkBit-example :: Management client API</name>
 
    <dependencies>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-example-feign-core-client</artifactId>
+         <artifactId>hawkbit-example-core-feign-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -31,11 +31,6 @@
          <artifactId>hawkbit-mgmt-api</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-system-api</artifactId>
-         <version>${project.version}</version>
-      </dependency>
       <dependency>
          <groupId>com.google.guava</groupId>
          <artifactId>guava</artifactId>

examples/hawkbit-example-mgmt-feign-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/SystemClientResource.java

@@ -8,14 +8,14 @@
  */
 package org.eclipse.hawkbit.mgmt.client.resource;
 
-import org.eclipse.hawkbit.system.rest.api.SystemRestApi;
+import org.eclipse.hawkbit.mgmt.rest.api.MgmtSystemRestApi;
 import org.springframework.cloud.netflix.feign.FeignClient;
 
 /**
- * Client binding for the {@link SystemRestApi}.
+ * Client binding for the {@link MgmtSystemRestApi}.
  *
  */
 @FeignClient(url = "${hawkbit.url:localhost:8080}/" + SystemClientResource.PATH)
-public interface SystemClientResource extends SystemRestApi {
+public interface SystemClientResource extends MgmtSystemRestApi {
     static String PATH = "rest/v1/system";
 }

examples/hawkbit-example-mgmt-feign-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/SystemManagementClientResource.java

@@ -8,15 +8,15 @@
  */
 package org.eclipse.hawkbit.mgmt.client.resource;
 
-import org.eclipse.hawkbit.system.rest.api.SystemManagementRestApi;
+import org.eclipse.hawkbit.mgmt.rest.api.MgmtSystemManagementRestApi;
 import org.springframework.cloud.netflix.feign.FeignClient;
 
 /**
- * Client binding for the {@link SystemManagementRestApi}.
+ * Client binding for the {@link MgmtSystemManagementRestApi}.
  *
  */
 @FeignClient(url = "${hawkbit.url:localhost:8080}/" + SystemManagementClientResource.PATH)
-public interface SystemManagementClientResource extends SystemManagementRestApi {
+public interface SystemManagementClientResource extends MgmtSystemManagementRestApi {
     static String PATH = "system/admin";
 
 }

examples/hawkbit-example-mgmt-simulator/pom.xml

@@ -17,7 +17,7 @@
       <version>0.2.0-SNAPSHOT</version>
    </parent>
    <packaging>jar</packaging>
-   <artifactId>hawkbit-example-mgmt-spring-client</artifactId>
+   <artifactId>hawkbit-example-mgmt-simulator</artifactId>
    <name>hawkBit-example :: Management Feign Client</name>
 
    <build>
@@ -57,7 +57,7 @@
    <dependencies>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-example-mgmt-client</artifactId>
+         <artifactId>hawkbit-example-mgmt-feign-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

examples/pom.xml

@@ -22,12 +22,12 @@
    <packaging>pom</packaging>
 
    <modules>
-      <module>hawkbit-example-feign-core-client</module>
       <module>hawkbit-device-simulator</module>
       <module>hawkbit-example-app</module>
-      <module>hawkbit-example-mgmt-client</module>
-      <module>hawkbit-example-mgmt-spring-client</module>
-      <module>hawkbit-example-ddi-client</module>
+      <module>hawkbit-example-core-feign-client</module>
+      <module>hawkbit-example-ddi-feign-client</module>
+      <module>hawkbit-example-mgmt-feign-client</module>
+      <module>hawkbit-example-mgmt-simulator</module>
   </modules>