From fe9f0583b5d8dcc88d40c9517f63f327b61261b8 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sun, 22 Jan 2023 19:22:13 +0100 Subject: [PATCH] Fix some addon.xml issues (#14261) * Fix some addon.xml issues * Re-add thing-type binding for Velux * Prefix thing-type filenames Signed-off-by: Jacob Laursen --- .../src/main/resources/OH-INF/addon/addon.xml | 4 ++-- .../src/main/resources/OH-INF/addon/addon.xml | 10 +++++++++ .../src/main/resources/OH-INF/addon/addon.xml | 21 +++++++++--------- .../{actuator.xml => thing-type-actuator.xml} | 0 .../OH-INF/thing/thing-type-binding.xml | 22 +++++++++++++++++++ ...utter.xml => thing-type-rollershutter.xml} | 0 .../thing/{scene.xml => thing-type-scene.xml} | 0 .../{vshutter.xml => thing-type-vshutter.xml} | 0 .../{window.xml => thing-type-window.xml} | 0 9 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/addon/addon.xml rename bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/{actuator.xml => thing-type-actuator.xml} (100%) create mode 100644 bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-binding.xml rename bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/{rollershutter.xml => thing-type-rollershutter.xml} (100%) rename bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/{scene.xml => thing-type-scene.xml} (100%) rename bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/{vshutter.xml => thing-type-vshutter.xml} (100%) rename bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/{window.xml => thing-type-window.xml} (100%) diff --git a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml index b60f56335..18ba83fcc 100644 --- a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml @@ -3,6 +3,6 @@ xmlns:addon="https://openhab.org/schemas/addon/v1.0.0" xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd"> binding - @text/icloud.binding.name - @text/icloud.binding.description + @text/icloud.addon.name + @text/icloud.addon.description diff --git a/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/addon/addon.xml new file mode 100644 index 000000000..141328cc9 --- /dev/null +++ b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/addon/addon.xml @@ -0,0 +1,10 @@ + + + + binding + Glen Dimplex Nobø Hub Binding + This is the binding for Glen Dimplex Nobø Hub. + + diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml index 850e1af26..92076c4f4 100644 --- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml @@ -4,31 +4,30 @@ xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd"> binding - @text/binding.shelly.name - @text/binding.shelly.description - Markus Michels + @text/addon.shelly.name + @text/addon.shelly.description admin - - @text/binding.shelly.config.defaultUserId.description + + @text/addon.shelly.config.defaultUserId.description admin - - @text/binding.shelly.config.defaultPassword.description + + @text/addon.shelly.config.defaultPassword.description password - - @text/binding.shelly.config.localIP.description + + @text/addon.shelly.config.localIP.description true - - @text/binding.shelly.config.autoCoIoT.description + + @text/addon.shelly.config.autoCoIoT.description diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/actuator.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-actuator.xml similarity index 100% rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/actuator.xml rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-actuator.xml diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-binding.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-binding.xml new file mode 100644 index 000000000..8524d7f71 --- /dev/null +++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-binding.xml @@ -0,0 +1,22 @@ + + + + + + + + + @text/thing-type.velux.binding.description + NetworkAppliance + + + + + N/A + + bundleVersion + + diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/rollershutter.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-rollershutter.xml similarity index 100% rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/rollershutter.xml rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-rollershutter.xml diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/scene.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-scene.xml similarity index 100% rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/scene.xml rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-scene.xml diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/vshutter.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-vshutter.xml similarity index 100% rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/vshutter.xml rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-vshutter.xml diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/window.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-window.xml similarity index 100% rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/window.xml rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-window.xml