Renamed core.cloud in cloudconnection.kapua.mqtt.provider

Signed-off-by: pierantoniomerlino <[email protected]>
eclipse-kura · Sep 4, 2024 · e98932d · e98932d
1 parent 1860c67
commit e98932d
Show file tree

Hide file tree

Showing 65 changed files with 37 additions and 29 deletions.
diff --git a/kura/distrib/config/kura.build.properties b/kura/distrib/config/kura.build.properties
@@ -10,7 +10,6 @@ org.eclipse.kura.core.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.system.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.certificates.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.keystore.version=2.0.0-SNAPSHOT
-org.eclipse.kura.core.cloud.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.cloud.command.version=1.0.0-SNAPSHOT
 org.eclipse.kura.core.cloud.factory.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.comm.version=2.0.0-SNAPSHOT
@@ -133,6 +132,7 @@ org.eclipse.kura.db.sqlite.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.rest.network.status.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.wire.script.tools.version=2.0.0-SNAPSHOT
 org.eclipse.kura.cloudconnection.sparkplug.mqtt.provider.version=2.0.0-SNAPSHOT
+org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version=1.0.0-SNAPSHOT
 
 ## features versions
 org.eclipse.kura.driver.opcua.version=2.0.0-SNAPSHOT

diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml
@@ -81,7 +81,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh</artifactId>
-                <version>1.0-beta-6</version>
+                <version>>1.0-beta-6</version>
             </extension>
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
@@ -216,11 +216,6 @@
                                     <artifactId>org.eclipse.kura.core.certificates</artifactId>
                                     <version>${org.eclipse.kura.core.certificates.version}</version>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.eclipse.kura</groupId>
-                                    <artifactId>org.eclipse.kura.core.cloud</artifactId>
-                                    <version>${org.eclipse.kura.core.cloud.version}</version>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.eclipse.kura</groupId>
                                     <artifactId>org.eclipse.kura.core.cloud.command</artifactId>
@@ -556,6 +551,11 @@
                                     <artifactId>org.eclipse.kura.cloudconnection.raw.mqtt.provider</artifactId>
                                     <version>${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}</version>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.eclipse.kura</groupId>
+                                    <artifactId>org.eclipse.kura.cloudconnection.kapua.mqtt.provider</artifactId>
+                                    <version>${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}</version>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.eclipse.kura</groupId>
                                     <artifactId>org.eclipse.kura.useradmin.store</artifactId>
@@ -752,7 +752,6 @@
                                 <move file="target/plugins/org.eclipse.kura.core.jar" tofile="target/plugins/org.eclipse.kura.core_${org.eclipse.kura.core.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.system.jar" tofile="target/plugins/org.eclipse.kura.core.system_${org.eclipse.kura.core.system.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.certificates.jar" tofile="target/plugins/org.eclipse.kura.core.certificates_${org.eclipse.kura.core.certificates.version}.jar" />
-                                <move file="target/plugins/org.eclipse.kura.core.cloud.jar" tofile="target/plugins/org.eclipse.kura.core.cloud_${org.eclipse.kura.core.cloud.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.cloud.command.jar" tofile="target/plugins/org.eclipse.kura.core.cloud.command_${org.eclipse.kura.core.cloud.command.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.cloud.factory.jar" tofile="target/plugins/org.eclipse.kura.core.cloud.factory_${org.eclipse.kura.core.cloud.factory.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.comm.jar" tofile="target/plugins/org.eclipse.kura.core.comm_${org.eclipse.kura.core.comm.version}.jar" />
@@ -816,6 +815,7 @@
                                 <move file="target/plugins/org.eclipse.kura.xml.marshaller.unmarshaller.provider.jar" tofile="target/plugins/org.eclipse.kura.xml.marshaller.unmarshaller.provider_${org.eclipse.kura.xml.marshaller.unmarshaller.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.wire.component.join.provider.jar" tofile="target/plugins/org.eclipse.kura.wire.component.join.provider_${org.eclipse.kura.wire.component.join.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider.jar" tofile="target/plugins/org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider_${org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider.version}.jar" />
+                                <move file="target/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.jar" tofile="target/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.http.server.manager.jar" tofile="target/plugins/org.eclipse.kura.http.server.manager_${org.eclipse.kura.http.server.manager.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider.jar" tofile="target/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider_${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.useradmin.store.jar" tofile="target/plugins/org.eclipse.kura.useradmin.store_${org.eclipse.kura.useradmin.store.version}.jar" />
@@ -2025,8 +2025,7 @@
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.camel.xml_${org.eclipse.kura.camel.xml.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core_${org.eclipse.kura.core.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.certificates_${org.eclipse.kura.core.certificates.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud_${org.eclipse.kura.core.cloud.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud_${org.eclipse.kura.core.cloud.command.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.command_${org.eclipse.kura.core.cloud.command.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.factory_${org.eclipse.kura.core.cloud.factory.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.comm_${org.eclipse.kura.core.comm.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.configuration_${org.eclipse.kura.core.configuration.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
@@ -2085,7 +2084,7 @@
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.xml.marshaller.unmarshaller.provider_${org.eclipse.kura.xml.marshaller.unmarshaller.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
 
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider_${org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-
+										<copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider_${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.ai.component.provider_${org.eclipse.kura.wire.ai.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.ai.triton.server_${org.eclipse.kura.ai.triton.server.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />

diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -140,6 +140,7 @@
         <antcall target="core.system-config" />
         <antcall target="core.certificates-config" />
         <antcall target="core.cloud-config" />
+    	<antcall target="cloud.mqtt.kapua-config" />
         <antcall target="cloud.mqtt.eclipseiot-config" />
         <antcall target="cloud.mqtt.raw-config" />
         <antcall target="core.comm-config" />
@@ -589,9 +590,6 @@ fi]]>
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.core.certificates_${org.eclipse.kura.core.certificates.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
-            <zipfileset
-                file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud_${org.eclipse.kura.core.cloud.version}.jar"
-                prefix="${build.output.name}/${plugins.folder}" />
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.command_${org.eclipse.kura.core.cloud.command.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
@@ -604,6 +602,9 @@ fi]]>
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider_${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
+            <zipfileset
+                file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar"
+                prefix="${build.output.name}/${plugins.folder}" />
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.core.comm_${org.eclipse.kura.core.comm.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
@@ -989,7 +990,15 @@ fi]]>
                 value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.core.cloud.factory_${org.eclipse.kura.core.cloud.factory.version}.jar@4:start" />
         </propertyfile>
     </target>
-
+
+    <target name="cloud.mqtt.kapua-config">
+        <propertyfile
+            file="${project.build.directory}/${build.output.name}/config.ini">
+            <entry key="osgi.bundles" operation="+"
+                value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar@4:start" />
+        </propertyfile>
+    </target>
+
     <target name="cloud.mqtt.eclipseiot-config">
         <propertyfile
             file="${project.build.directory}/${build.output.name}/config.ini">

diff --git a/kura/org.eclipse.kura.core.cloud/.gitignore → ...connection.kapua.mqtt.provider/.gitignore b/kura/org.eclipse.kura.core.cloud/.gitignore → ...connection.kapua.mqtt.provider/.gitignore
diff --git a/...ipse.kura.core.cloud/META-INF/MANIFEST.MF → ....kapua.mqtt.provider/META-INF/MANIFEST.MF b/...ipse.kura.core.cloud/META-INF/MANIFEST.MF → ....kapua.mqtt.provider/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.kura.core.cloud
-Bundle-SymbolicName: org.eclipse.kura.core.cloud;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Name: org.eclipse.kura.cloudconnection.kapua.mqtt.provider
+Bundle-SymbolicName: org.eclipse.kura.cloudconnection.kapua.mqtt.provider;singleton:=true
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Kura
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
 Service-Component: OSGI-INF/*.xml

diff --git a/...clipse.kura.core.cloud/OSGI-INF/cloud.xml → ...on.kapua.mqtt.provider/OSGI-INF/cloud.xml b/...clipse.kura.core.cloud/OSGI-INF/cloud.xml → ...on.kapua.mqtt.provider/OSGI-INF/cloud.xml
diff --git a/...se.kura.core.cloud/OSGI-INF/cloudCall.xml → ...apua.mqtt.provider/OSGI-INF/cloudCall.xml b/...se.kura.core.cloud/OSGI-INF/cloudCall.xml → ...apua.mqtt.provider/OSGI-INF/cloudCall.xml
diff --git a/...ra.core.cloud/OSGI-INF/cloudPublisher.xml → ...mqtt.provider/OSGI-INF/cloudPublisher.xml b/...ra.core.cloud/OSGI-INF/cloudPublisher.xml → ...mqtt.provider/OSGI-INF/cloudPublisher.xml
diff --git a/...a.core.cloud/OSGI-INF/cloudSubscriber.xml → ...qtt.provider/OSGI-INF/cloudSubscriber.xml b/...a.core.cloud/OSGI-INF/cloudSubscriber.xml → ...qtt.provider/OSGI-INF/cloudSubscriber.xml
diff --git a/...e/org.eclipse.kura.cloud.CloudService.xml → ...e/org.eclipse.kura.cloud.CloudService.xml b/...e/org.eclipse.kura.cloud.CloudService.xml → ...e/org.eclipse.kura.cloud.CloudService.xml
diff --git a/...e.kura.cloud.publisher.CloudPublisher.xml → ...e.kura.cloud.publisher.CloudPublisher.xml b/...e.kura.cloud.publisher.CloudPublisher.xml → ...e.kura.cloud.publisher.CloudPublisher.xml
diff --git a/...kura.cloud.subscriber.CloudSubscriber.xml → ...kura.cloud.subscriber.CloudSubscriber.xml b/...kura.cloud.subscriber.CloudSubscriber.xml → ...kura.cloud.subscriber.CloudSubscriber.xml
diff --git a/kura/org.eclipse.kura.core.cloud/about.html → ...connection.kapua.mqtt.provider/about.html b/kura/org.eclipse.kura.core.cloud/about.html → ...connection.kapua.mqtt.provider/about.html
diff --git a/....kura.core.cloud/about_files/epl-v20.html → ...ua.mqtt.provider/about_files/epl-v20.html b/....kura.core.cloud/about_files/epl-v20.html → ...ua.mqtt.provider/about_files/epl-v20.html
diff --git a/....eclipse.kura.core.cloud/build.properties → ...tion.kapua.mqtt.provider/build.properties b/....eclipse.kura.core.cloud/build.properties → ...tion.kapua.mqtt.provider/build.properties
diff --git a/kura/org.eclipse.kura.core.cloud/pom.xml → ...oudconnection.kapua.mqtt.provider/pom.xml b/kura/org.eclipse.kura.core.cloud/pom.xml → ...oudconnection.kapua.mqtt.provider/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others
+    Copyright (c) 2024 Eurotech and/or its affiliates and others
   
     This program and the accompanying materials are made
     available under the terms of the Eclipse Public License 2.0
@@ -23,13 +23,13 @@
 		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>org.eclipse.kura.core.cloud</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.kura.cloudconnection.kapua.mqtt.provider</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<properties>
 		<kura.basedir>${project.basedir}/..</kura.basedir>
-		<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../test/org.eclipse.kura.core.cloud.test/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+		<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 	</properties>
 
 	<build>

diff --git a/...se/kura/cloud/app/RequestIdGenerator.java → ...se/kura/cloud/app/RequestIdGenerator.java b/...se/kura/cloud/app/RequestIdGenerator.java → ...se/kura/cloud/app/RequestIdGenerator.java
diff --git a/...ipse/kura/core/cloud/CloudClientImpl.java → ...ipse/kura/core/cloud/CloudClientImpl.java b/...ipse/kura/core/cloud/CloudClientImpl.java → ...ipse/kura/core/cloud/CloudClientImpl.java
diff --git a/...ore/cloud/CloudClientListenerAdapter.java → ...ore/cloud/CloudClientListenerAdapter.java b/...ore/cloud/CloudClientListenerAdapter.java → ...ore/cloud/CloudClientListenerAdapter.java
diff --git a/.../kura/core/cloud/CloudPayloadEncoder.java → .../kura/core/cloud/CloudPayloadEncoder.java b/.../kura/core/cloud/CloudPayloadEncoder.java → .../kura/core/cloud/CloudPayloadEncoder.java
diff --git a/...a/core/cloud/CloudPayloadGZipEncoder.java → ...a/core/cloud/CloudPayloadGZipEncoder.java b/...a/core/cloud/CloudPayloadGZipEncoder.java → ...a/core/cloud/CloudPayloadGZipEncoder.java
diff --git a/...loud/CloudPayloadProtoBufDecoderImpl.java → ...loud/CloudPayloadProtoBufDecoderImpl.java b/...loud/CloudPayloadProtoBufDecoderImpl.java → ...loud/CloudPayloadProtoBufDecoderImpl.java
diff --git a/...loud/CloudPayloadProtoBufEncoderImpl.java → ...loud/CloudPayloadProtoBufEncoderImpl.java b/...loud/CloudPayloadProtoBufEncoderImpl.java → ...loud/CloudPayloadProtoBufEncoderImpl.java
diff --git a/...cloud/CloudPublisherDeliveryListener.java → ...cloud/CloudPublisherDeliveryListener.java b/...cloud/CloudPublisherDeliveryListener.java → ...cloud/CloudPublisherDeliveryListener.java
diff --git a/...pse/kura/core/cloud/CloudServiceImpl.java → ...pse/kura/core/cloud/CloudServiceImpl.java b/...pse/kura/core/cloud/CloudServiceImpl.java → ...pse/kura/core/cloud/CloudServiceImpl.java
diff --git a/.../kura/core/cloud/CloudServiceOptions.java → .../kura/core/cloud/CloudServiceOptions.java b/.../kura/core/cloud/CloudServiceOptions.java → .../kura/core/cloud/CloudServiceOptions.java
diff --git a/...clipse/kura/core/cloud/KuraTopicImpl.java → ...clipse/kura/core/cloud/KuraTopicImpl.java b/...clipse/kura/core/cloud/KuraTopicImpl.java → ...clipse/kura/core/cloud/KuraTopicImpl.java
diff --git a/...a/core/cloud/LifeCyclePayloadBuilder.java → ...a/core/cloud/LifeCyclePayloadBuilder.java b/...a/core/cloud/LifeCyclePayloadBuilder.java → ...a/core/cloud/LifeCyclePayloadBuilder.java
diff --git a/...pse/kura/core/cloud/LifecycleMessage.java → ...pse/kura/core/cloud/LifecycleMessage.java b/...pse/kura/core/cloud/LifecycleMessage.java → ...pse/kura/core/cloud/LifecycleMessage.java
diff --git a/...ra/core/cloud/MessageHandlerCallable.java → ...ra/core/cloud/MessageHandlerCallable.java b/...ra/core/cloud/MessageHandlerCallable.java → ...ra/core/cloud/MessageHandlerCallable.java
diff --git a/...core/cloud/call/CloudCallServiceImpl.java → ...core/cloud/call/CloudCallServiceImpl.java b/...core/cloud/call/CloudCallServiceImpl.java → ...core/cloud/call/CloudCallServiceImpl.java
diff --git a/...e/cloud/publisher/CloudPublisherImpl.java → ...e/cloud/publisher/CloudPublisherImpl.java b/...e/cloud/publisher/CloudPublisherImpl.java → ...e/cloud/publisher/CloudPublisherImpl.java
diff --git a/...loud/publisher/CloudPublisherOptions.java → ...loud/publisher/CloudPublisherOptions.java b/...loud/publisher/CloudPublisherOptions.java → ...loud/publisher/CloudPublisherOptions.java
diff --git a/.../publisher/NotificationPublisherImpl.java → .../publisher/NotificationPublisherImpl.java b/.../publisher/NotificationPublisherImpl.java → .../publisher/NotificationPublisherImpl.java
diff --git a/...cloud/subscriber/CloudSubscriberImpl.java → ...cloud/subscriber/CloudSubscriberImpl.java b/...cloud/subscriber/CloudSubscriberImpl.java → ...cloud/subscriber/CloudSubscriberImpl.java
diff --git a/...ud/subscriber/CloudSubscriberOptions.java → ...ud/subscriber/CloudSubscriberOptions.java b/...ud/subscriber/CloudSubscriberOptions.java → ...ud/subscriber/CloudSubscriberOptions.java
diff --git a/...d/subscriber/CloudSubscriptionRecord.java → ...d/subscriber/CloudSubscriptionRecord.java b/...d/subscriber/CloudSubscriptionRecord.java → ...d/subscriber/CloudSubscriptionRecord.java
diff --git a/...e/kura/core/message/MessageConstants.java → ...e/kura/core/message/MessageConstants.java b/...e/kura/core/message/MessageConstants.java → ...e/kura/core/message/MessageConstants.java
diff --git a/...clipse/kura/core/message/MessageType.java → ...clipse/kura/core/message/MessageType.java b/...clipse/kura/core/message/MessageType.java → ...clipse/kura/core/message/MessageType.java
diff --git a/...re/message/protobuf/KuraPayloadProto.java → ...re/message/protobuf/KuraPayloadProto.java b/...re/message/protobuf/KuraPayloadProto.java → ...re/message/protobuf/KuraPayloadProto.java
diff --git a/...cloud/src/main/protobuf/kurapayload.proto → ...vider/src/main/protobuf/kurapayload.proto b/...cloud/src/main/protobuf/kurapayload.proto → ...vider/src/main/protobuf/kurapayload.proto
diff --git a/kura/pom.xml b/kura/pom.xml
@@ -40,7 +40,6 @@
         <module>org.eclipse.kura.core</module>
         <module>org.eclipse.kura.core.certificates</module>
         <module>org.eclipse.kura.core.keystore</module>
-        <module>org.eclipse.kura.core.cloud</module>
         <module>org.eclipse.kura.core.cloud.command</module>
         <module>org.eclipse.kura.core.cloud.factory</module>
         <module>org.eclipse.kura.core.comm</module>
@@ -128,6 +127,7 @@
         <module>org.eclipse.kura.db.sqlite.provider</module>
         <module>org.eclipse.kura.rest.network.status.provider</module>
         <module>org.eclipse.kura.cloudconnection.sparkplug.mqtt.provider</module>
+        <module>org.eclipse.kura.cloudconnection.kapua.mqtt.provider</module>
         <module>emulator</module>
         <module>test-util</module>
     </modules>

diff --git a/...g.eclipse.kura.core.cloud.test/.gitignore → ...ction.kapua.mqtt.provider.test/.gitignore b/...g.eclipse.kura.core.cloud.test/.gitignore → ...ction.kapua.mqtt.provider.test/.gitignore
diff --git a/...kura.core.cloud.test/META-INF/MANIFEST.MF → ...a.mqtt.provider.test/META-INF/MANIFEST.MF b/...kura.core.cloud.test/META-INF/MANIFEST.MF → ...a.mqtt.provider.test/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.kura.core.cloud.test
-Bundle-SymbolicName: org.eclipse.kura.core.cloud.test;singleton:=true
+Bundle-Name: org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test
+Bundle-SymbolicName: org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test;singleton:=true
 Bundle-Version: 6.0.0.qualifier
 Bundle-Vendor: Eclipse Kura
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
@@ -19,7 +19,7 @@ Import-Package: org.eclipse.kura.core.testutil,
  org.mockito.stubbing;version="[4.0.0,5.0.0)",
  org.osgi.service.cm;version="1.4.0",
  org.slf4j;version="1.6.4"
-Fragment-Host: org.eclipse.kura.core.cloud;bundle-version="1.2.0"
+Fragment-Host: org.eclipse.kura.cloudconnection.kapua.mqtt.provider
 Require-Bundle: org.eclipse.kura.broker.artemis.core;bundle-version="1.2.0",
  org.eclipse.kura.broker.artemis.simple.mqtt;bundle-version="1.1.0"
 
diff --git a/...e.cloud.test/OSGI-INF/cloud-publisher.xml → ...rovider.test/OSGI-INF/cloud-publisher.xml b/...e.cloud.test/OSGI-INF/cloud-publisher.xml → ...rovider.test/OSGI-INF/cloud-publisher.xml
diff --git a/...a.core.cloud.test/OSGI-INF/cloud-test.xml → ...qtt.provider.test/OSGI-INF/cloud-test.xml b/...a.core.cloud.test/OSGI-INF/cloud-test.xml → ...qtt.provider.test/OSGI-INF/cloud-test.xml
diff --git a/...g.eclipse.kura.core.cloud.test/about.html → ...ction.kapua.mqtt.provider.test/about.html b/...g.eclipse.kura.core.cloud.test/about.html → ...ction.kapua.mqtt.provider.test/about.html
diff --git a/...pse.kura.core.cloud.test/build.properties → ...kapua.mqtt.provider.test/build.properties b/...pse.kura.core.cloud.test/build.properties → ...kapua.mqtt.provider.test/build.properties
diff --git a/.../org.eclipse.kura.core.cloud.test/pom.xml → ...nnection.kapua.mqtt.provider.test/pom.xml b/.../org.eclipse.kura.core.cloud.test/pom.xml → ...nnection.kapua.mqtt.provider.test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others
+    Copyright (c) 2024 Eurotech and/or its affiliates and others
 
     This program and the accompanying materials are made
     available under the terms of the Eclipse Public License 2.0
@@ -23,7 +23,7 @@
 		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>org.eclipse.kura.core.cloud.test</artifactId>
+	<artifactId>org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>

diff --git a/...ra/core/cloud/CloudPublisherImplTest.java → ...ra/core/cloud/CloudPublisherImplTest.java b/...ra/core/cloud/CloudPublisherImplTest.java → ...ra/core/cloud/CloudPublisherImplTest.java
diff --git a/...pse/kura/core/cloud/CloudServiceTest.java → ...pse/kura/core/cloud/CloudServiceTest.java b/...pse/kura/core/cloud/CloudServiceTest.java → ...pse/kura/core/cloud/CloudServiceTest.java
diff --git a/...se/kura/core/cloud/BirthMessagesTest.java → ...se/kura/core/cloud/BirthMessagesTest.java b/...se/kura/core/cloud/BirthMessagesTest.java → ...se/kura/core/cloud/BirthMessagesTest.java
diff --git a/.../kura/core/cloud/CloudClientImplTest.java → .../kura/core/cloud/CloudClientImplTest.java b/.../kura/core/cloud/CloudClientImplTest.java → .../kura/core/cloud/CloudClientImplTest.java
diff --git a/...kura/core/cloud/CloudServiceImplTest.java → ...kura/core/cloud/CloudServiceImplTest.java b/...kura/core/cloud/CloudServiceImplTest.java → ...kura/core/cloud/CloudServiceImplTest.java
diff --git a/...a/core/cloud/CloudServiceOptionsTest.java → ...a/core/cloud/CloudServiceOptionsTest.java b/...a/core/cloud/CloudServiceOptionsTest.java → ...a/core/cloud/CloudServiceOptionsTest.java
diff --git a/...oud/publisher/CloudPublisherImplTest.java → ...oud/publisher/CloudPublisherImplTest.java b/...oud/publisher/CloudPublisherImplTest.java → ...oud/publisher/CloudPublisherImplTest.java
diff --git a/.../publisher/CloudPublisherOptionsTest.java → .../publisher/CloudPublisherOptionsTest.java b/.../publisher/CloudPublisherOptionsTest.java → .../publisher/CloudPublisherOptionsTest.java
diff --git a/...lisher/NotificationPublisherImplTest.java → ...lisher/NotificationPublisherImplTest.java b/...lisher/NotificationPublisherImplTest.java → ...lisher/NotificationPublisherImplTest.java
diff --git a/...ra/core/message/KuraBirthPayloadTest.java → ...ra/core/message/KuraBirthPayloadTest.java b/...ra/core/message/KuraBirthPayloadTest.java → ...ra/core/message/KuraBirthPayloadTest.java
diff --git a/...re/message/KuraDisconnectPayloadTest.java → ...re/message/KuraDisconnectPayloadTest.java b/...re/message/KuraDisconnectPayloadTest.java → ...re/message/KuraDisconnectPayloadTest.java
diff --git a/...protobuf/KuraPayloadProtoBuilderTest.java → ...protobuf/KuraPayloadProtoBuilderTest.java b/...protobuf/KuraPayloadProtoBuilderTest.java → ...protobuf/KuraPayloadProtoBuilderTest.java
diff --git a/...uf/KuraPayloadProtoMetricBuilderTest.java → ...uf/KuraPayloadProtoMetricBuilderTest.java b/...uf/KuraPayloadProtoMetricBuilderTest.java → ...uf/KuraPayloadProtoMetricBuilderTest.java
diff --git a/.../KuraPayloadProtoPositionBuilderTest.java → .../KuraPayloadProtoPositionBuilderTest.java b/.../KuraPayloadProtoPositionBuilderTest.java → .../KuraPayloadProtoPositionBuilderTest.java
diff --git a/....test/src/test/resources/log4j.properties → ....test/src/test/resources/log4j.properties b/....test/src/test/resources/log4j.properties → ....test/src/test/resources/log4j.properties
diff --git a/kura/test/pom.xml b/kura/test/pom.xml
@@ -883,7 +883,6 @@
         <module>org.eclipse.kura.core.certificates.test</module>
         <module>org.eclipse.kura.core.comm.test</module>
         <module>org.eclipse.kura.core.configuration.test</module>
-        <module>org.eclipse.kura.core.cloud.test</module>
         <module>org.eclipse.kura.core.cloud.command.test</module>
         <module>org.eclipse.kura.core.cloud.factory.test</module>
         <module>org.eclipse.kura.core.crypto.test</module>
@@ -964,6 +963,7 @@
         <module>org.eclipse.kura.db.sqlite.provider.test</module>
         <module>org.eclipse.kura.message.store.provider.test</module>
         <module>org.eclipse.kura.cloudconnection.sparkplug.mqtt.provider.test</module>
+        <module>org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test</module>
         <!--
         <module>org.eclipse.kura.raspberrypi.sensehat.test</module>
         -->