refactor(api)!: Removed bluetooth old api, implementation, tests and …

…examples (#5323) * Deleted old bluetooth APIs Signed-off-by: pierantoniomerlino <[email protected]> * Updated kura.api manifest Signed-off-by: pierantoniomerlino <[email protected]> * Deleted old bluetooth APIs implementation Signed-off-by: pierantoniomerlino <[email protected]> * Deleted sensortag old example Signed-off-by: pierantoniomerlino <[email protected]> * Deleted beacon old examples Signed-off-by: pierantoniomerlino <[email protected]> * Deleted sensortag old example tests Signed-off-by: pierantoniomerlino <[email protected]> * Removed useless import Signed-off-by: pierantoniomerlino <[email protected]> * Deleted reference to linux.bluetooth from distrib Signed-off-by: pierantoniomerlino <[email protected]> * Fixed dev-env build Signed-off-by: pierantoniomerlino <[email protected]> --------- Signed-off-by: pierantoniomerlino <[email protected]>
eclipse-kura · Jul 25, 2024 · 83b5252 · 83b5252
1 parent 7981037
commit 83b5252
Show file tree

Hide file tree

Showing 76 changed files with 2 additions and 9,120 deletions.
diff --git a/kura/distrib/config/kura.build.properties b/kura/distrib/config/kura.build.properties
@@ -41,7 +41,6 @@ org.eclipse.kura.driver.ble.sensortag.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.driver.eddystone.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.driver.ibeacon.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.driver.gpio.provider.version=2.0.0-SNAPSHOT
-org.eclipse.kura.linux.bluetooth.version=2.0.0-SNAPSHOT
 org.eclipse.kura.linux.clock.version=2.0.0-SNAPSHOT
 org.eclipse.kura.ble.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.ble.ibeacon.provider.version=2.0.0-SNAPSHOT

diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml
@@ -366,11 +366,6 @@
                                     <artifactId>org.eclipse.kura.linux.usb.aarch64</artifactId>
                                     <version>${org.eclipse.kura.linux.usb.version}</version>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.eclipse.kura</groupId>
-                                    <artifactId>org.eclipse.kura.linux.bluetooth</artifactId>
-                                    <version>${org.eclipse.kura.linux.bluetooth.version}</version>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.eclipse.kura</groupId>
                                     <artifactId>org.eclipse.kura.ble.provider</artifactId>
@@ -785,7 +780,6 @@
                                 <move file="target/plugins/org.eclipse.kura.linux.usb.armv6hf.jar" tofile="target/plugins/org.eclipse.kura.linux.usb.armv6hf_${org.eclipse.kura.linux.usb.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.linux.usb.x86_64.jar" tofile="target/plugins/org.eclipse.kura.linux.usb.x86_64_${org.eclipse.kura.linux.usb.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.linux.usb.aarch64.jar" tofile="target/plugins/org.eclipse.kura.linux.usb.aarch64_${org.eclipse.kura.linux.usb.version}.jar" />
-                                <move file="target/plugins/org.eclipse.kura.linux.bluetooth.jar" tofile="target/plugins/org.eclipse.kura.linux.bluetooth_${org.eclipse.kura.linux.bluetooth.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.ble.provider.jar" tofile="target/plugins/org.eclipse.kura.ble.provider_${org.eclipse.kura.ble.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.ble.ibeacon.provider.jar" tofile="target/plugins/org.eclipse.kura.ble.ibeacon.provider_${org.eclipse.kura.ble.ibeacon.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.ble.eddystone.provider.jar" tofile="target/plugins/org.eclipse.kura.ble.eddystone.provider_${org.eclipse.kura.ble.eddystone.provider.version}.jar" />
@@ -2065,7 +2059,6 @@
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.system_${org.eclipse.kura.core.system.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.deployment.agent_${org.eclipse.kura.deployment.agent.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.status_${org.eclipse.kura.core.status.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.linux.bluetooth_${org.eclipse.kura.linux.bluetooth.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.ble.provider_${org.eclipse.kura.ble.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.ble.ibeacon.provider_${org.eclipse.kura.ble.ibeacon.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.ble.eddystone.provider_${org.eclipse.kura.ble.eddystone.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
@@ -2162,28 +2155,6 @@
                                         <copy overwrite="true" file="src/main/resources/common/projects/demo_heater.project" tofile="${project.build.directory}/staging/demo_heater/.project" />
                                         <move file="${project.build.directory}/staging/demo_heater/demo_heater.classpath" tofile="${project.build.directory}/staging/demo_heater/.classpath" />
 
-                                        <!-- Stage the org.eclipse.kura.example.beacon Project -->
-                                        <copy todir="${project.build.directory}/staging/beacon">
-                                            <fileset dir="../examples/org.eclipse.kura.example.beacon" />
-                                        </copy>
-                                        <delete file="${project.build.directory}/staging/beacon/pom.xml" />
-                                        <delete dir="${project.build.directory}/staging/beacon/bin" />
-                                        <delete dir="${project.build.directory}/staging/beacon/target" />
-                                        <copy file="src/main/resources/common/classpaths/beacon.classpath" tofile="${project.build.directory}/staging/beacon/beacon.classpath" />
-                                        <copy overwrite="true" file="src/main/resources/common/projects/beacon.project" tofile="${project.build.directory}/staging/beacon/.project" />
-                                        <move file="${project.build.directory}/staging/beacon/beacon.classpath" tofile="${project.build.directory}/staging/beacon/.classpath" />
-
-                                        <!-- Stage the org.eclipse.kura.example.beacon.scanner Project -->
-                                        <copy todir="${project.build.directory}/staging/beacon.scanner">
-                                            <fileset dir="../examples/org.eclipse.kura.example.beacon.scanner" />
-                                        </copy>
-                                        <delete file="${project.build.directory}/staging/beacon.scanner/pom.xml" />
-                                        <delete dir="${project.build.directory}/staging/beacon.scanner/bin" />
-                                        <delete dir="${project.build.directory}/staging/beacon.scanner/target" />
-                                        <copy file="src/main/resources/common/classpaths/beacon.scanner.classpath" tofile="${project.build.directory}/staging/beacon.scanner/beacon.scanner.classpath" />
-                                        <copy overwrite="true" file="src/main/resources/common/projects/beacon.scanner.project" tofile="${project.build.directory}/staging/beacon.scanner/.project" />
-                                        <move file="${project.build.directory}/staging/beacon.scanner/beacon.scanner.classpath" tofile="${project.build.directory}/staging/beacon.scanner/.classpath" />
-
                                         <!-- Stage the org.eclipse.kura.example.ibeacon.advertiser Project -->
                                         <copy todir="${project.build.directory}/staging/ibeacon.advertiser">
                                             <fileset dir="../examples/org.eclipse.kura.example.ibeacon.advertiser" />
@@ -2228,17 +2199,6 @@
                                         <copy overwrite="true" file="src/main/resources/common/projects/eddystone.scanner.project" tofile="${project.build.directory}/staging/eddystone.scanner/.project" />
                                         <move file="${project.build.directory}/staging/eddystone.scanner/eddystone.scanner.classpath" tofile="${project.build.directory}/staging/eddystone.scanner/.classpath" />
 
-                                        <!-- Stage the org.eclipse.kura.example.ble.tisensortag Project -->
-                                        <copy todir="${project.build.directory}/staging/tisensortag">
-                                            <fileset dir="../examples/org.eclipse.kura.example.ble.tisensortag" />
-                                        </copy>
-                                        <delete file="${project.build.directory}/staging/tisensortag/pom.xml" />
-                                        <delete dir="${project.build.directory}/staging/tisensortag/bin" />
-                                        <delete dir="${project.build.directory}/staging/tisensortag/target" />
-                                        <copy file="src/main/resources/common/classpaths/tisensortag.classpath" tofile="${project.build.directory}/staging/tisensortag/tisensortag.classpath" />
-                                        <copy overwrite="true" file="src/main/resources/common/projects/tisensortag.project" tofile="${project.build.directory}/staging/tisensortag/.project" />
-                                        <move file="${project.build.directory}/staging/tisensortag/tisensortag.classpath" tofile="${project.build.directory}/staging/tisensortag/.classpath" />
-
                                         <!-- Stage the org.eclipse.kura.example.ble.tisensortag.dbus Project -->
                                         <copy todir="${project.build.directory}/staging/tisensortag.dbus">
                                             <fileset dir="../examples/org.eclipse.kura.example.ble.tisensortag.dbus" />
@@ -2299,13 +2259,10 @@
                                             <zipfileset dir="${project.build.directory}/staging/target-definition/" prefix="target-definition/" />
                                             <zipfileset dir="${project.build.directory}/staging/emulator/" prefix="org.eclipse.kura.emulator/" />
                                             <zipfileset dir="${project.build.directory}/staging/demo_heater/" prefix="org.eclipse.kura.demo.heater/" />
-                                            <zipfileset dir="${project.build.directory}/staging/beacon/" prefix="org.eclipse.kura.example.beacon/" />
-                                            <zipfileset dir="${project.build.directory}/staging/beacon.scanner/" prefix="org.eclipse.kura.example.beacon.scanner/" />
                                             <zipfileset dir="${project.build.directory}/staging/ibeacon.advertiser/" prefix="org.eclipse.kura.example.ibeacon.advertiser/" />
                                             <zipfileset dir="${project.build.directory}/staging/ibeacon.scanner/" prefix="org.eclipse.kura.example.ibeacon.scanner/" />
                                             <zipfileset dir="${project.build.directory}/staging/eddystone.advertiser/" prefix="org.eclipse.kura.example.eddystone.advertiser/" />
                                             <zipfileset dir="${project.build.directory}/staging/eddystone.scanner/" prefix="org.eclipse.kura.example.eddystone.scanner/" />
-                                            <zipfileset dir="${project.build.directory}/staging/tisensortag/" prefix="org.eclipse.kura.example.ble.tisensortag/" />
                                             <zipfileset dir="${project.build.directory}/staging/tisensortag.dbus/" prefix="org.eclipse.kura.example.ble.tisensortag.dbus/" />
                                             <zipfileset dir="${project.build.directory}/staging/publisher/" prefix="org.eclipse.kura.example.publisher/" />
                                             <zipfileset dir="${project.build.directory}/staging/camel_quickstart/" prefix="org.eclipse.kura.example.camel.quickstart/" />
@@ -2396,12 +2353,6 @@
                                             <version>${org.eclipse.kura.driver.s7plc.version}</version>
                                             <type>dp</type>
                                         </artifactItem>
-                                        <artifactItem>
-                                            <groupId>org.eclipse.kura.feature</groupId>
-                                            <artifactId>org.eclipse.kura.driver.ble.sensortag</artifactId>
-                                            <version>${org.eclipse.kura.driver.ble.sensortag.version}</version>
-                                            <type>dp</type>
-                                        </artifactItem>
                                         <artifactItem>
                                             <groupId>org.eclipse.kura.feature</groupId>
                                             <artifactId>org.eclipse.kura.driver.eddystone</artifactId>

diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -189,7 +189,7 @@
         <antcall target="linux.command-config" />
         <antcall target="linux.position-config" />
         <antcall target="linux.usb-config" />
-        <antcall target="linux.bluetooth-config" />
+        <antcall target="bluetooth-config" />
         <antcall target="linux.watchdog-config" />
 
         <!-- Added Camel bundles configs -->
@@ -737,9 +737,6 @@ fi]]>
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.linux.usb.${native.tag}_${org.eclipse.kura.linux.usb.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
-            <zipfileset
-                file="${project.build.directory}/plugins/org.eclipse.kura.linux.bluetooth_${org.eclipse.kura.linux.bluetooth.version}.jar"
-                prefix="${build.output.name}/${plugins.folder}" />
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.ble.provider_${org.eclipse.kura.ble.provider.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
@@ -1214,11 +1211,9 @@ fi]]>
         </propertyfile>
     </target>
 
-    <target name="linux.bluetooth-config">
+    <target name="bluetooth-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.linux.bluetooth_${org.eclipse.kura.linux.bluetooth.version}.jar@4:start" />
             <entry key="osgi.bundles" operation="+"
                 value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.ble.provider_${org.eclipse.kura.ble.provider.version}.jar@4:start" />
             <entry key="osgi.bundles" operation="+"

diff --git a/kura/examples/org.eclipse.kura.example.beacon.scanner/META-INF/MANIFEST.MF b/kura/examples/org.eclipse.kura.example.beacon.scanner/META-INF/MANIFEST.MF
diff --git a/kura/examples/org.eclipse.kura.example.beacon.scanner/OSGI-INF/beaconExample.xml b/kura/examples/org.eclipse.kura.example.beacon.scanner/OSGI-INF/beaconExample.xml
diff --git a/...canner/OSGI-INF/metatype/org.eclipse.kura.example.beacon.scanner.BeaconScannerExample.xml b/...canner/OSGI-INF/metatype/org.eclipse.kura.example.beacon.scanner.BeaconScannerExample.xml