From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 22 Jan 2023 18:22:13 +0000 (+0100)
Subject: Fix some addon.xml issues (#14261)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=fe9f0583b5d8dcc88d40c9517f63f327b61261b8;p=openhab-addons.git

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 <jacob-github@vindvejr.dk>
---

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 b60f563357..18ba83fcc8 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">
 	<type>binding</type>
-	<name>@text/icloud.binding.name</name>
-	<description>@text/icloud.binding.description</description>
+	<name>@text/icloud.addon.name</name>
+	<description>@text/icloud.addon.description</description>
 </addon:addon>
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 0000000000..141328cc9c
--- /dev/null
+++ b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/addon/addon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon:addon id="nobohub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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">
+
+	<type>binding</type>
+	<name>Glen Dimplex Nobø Hub Binding</name>
+	<description>This is the binding for Glen Dimplex Nobø Hub.</description>
+
+</addon:addon>
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 850e1af262..92076c4f46 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">
 
 	<type>binding</type>
-	<name>@text/binding.shelly.name</name>
-	<description>@text/binding.shelly.description</description>
-	<author>Markus Michels</author>
+	<name>@text/addon.shelly.name</name>
+	<description>@text/addon.shelly.description</description>
 
 	<config-description>
 		<parameter name="defaultUserId" type="text">
 			<default>admin</default>
-			<label>@text/binding.shelly.config.defaultUserId.label</label>
-			<description>@text/binding.shelly.config.defaultUserId.description</description>
+			<label>@text/addon.shelly.config.defaultUserId.label</label>
+			<description>@text/addon.shelly.config.defaultUserId.description</description>
 		</parameter>
 		<parameter name="defaultPassword" type="text">
 			<default>admin</default>
-			<label>@text/binding.shelly.config.defaultPassword.label</label>
-			<description>@text/binding.shelly.config.defaultPassword.description</description>
+			<label>@text/addon.shelly.config.defaultPassword.label</label>
+			<description>@text/addon.shelly.config.defaultPassword.description</description>
 			<context>password</context>
 		</parameter>
 		<parameter name="localIP" type="text">
-			<label>@text/binding.shelly.config.localIP.label</label>
-			<description>@text/binding.shelly.config.localIP.description</description>
+			<label>@text/addon.shelly.config.localIP.label</label>
+			<description>@text/addon.shelly.config.localIP.description</description>
 			<default></default>
 		</parameter>
 		<parameter name="autoCoIoT" type="boolean">
 			<default>true</default>
-			<label>@text/binding.shelly.config.autoCoIoT.label</label>
-			<description>@text/binding.shelly.config.autoCoIoT.description</description>
+			<label>@text/addon.shelly.config.autoCoIoT.label</label>
+			<description>@text/addon.shelly.config.autoCoIoT.description</description>
 		</parameter>
 	</config-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/actuator.xml
deleted file mode 100644
index eb704bf802..0000000000
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/actuator.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Velux Binding -->
-<thing:thing-descriptions bindingId="velux"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
-	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
-	<!-- -->
-	<!-- Velux actuator Binding -->
-	<!-- -->
-	<thing-type id="actuator">
-		<supported-bridge-type-refs>
-			<bridge-type-ref id="klf200"/>
-		</supported-bridge-type-refs>
-		<label>@text/thing-type.velux.actuator.label</label>
-		<description>@text/thing-type.velux.actuator.description</description>
-		<category>Blinds</category>
-		<channels>
-			<channel id="position" typeId="position"/>
-			<channel id="state" typeId="state"/>
-			<channel id="limitMinimum" typeId="limitMinimum"/>
-			<channel id="limitMaximum" typeId="limitMaximum"/>
-		</channels>
-		<representation-property>serial</representation-property>
-		<config-description-ref uri="thing-type:velux:actuator"/>
-	</thing-type>
-</thing:thing-descriptions>
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/rollershutter.xml
deleted file mode 100644
index 2918a79665..0000000000
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/rollershutter.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Velux Binding -->
-<thing:thing-descriptions bindingId="velux"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
-	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
-
-	<!-- -->
-	<!-- Velux rollershutter Binding -->
-	<!-- -->
-	<thing-type id="rollershutter">
-		<supported-bridge-type-refs>
-			<bridge-type-ref id="klf200"/>
-		</supported-bridge-type-refs>
-		<label>@text/thing-type.velux.rollershutter.label</label>
-		<description>@text/thing-type.velux.rollershutter.description</description>
-		<category>Blinds</category>
-		<channels>
-			<channel id="position" typeId="position"/>
-			<channel id="vanePosition" typeId="vanePosition"/>
-			<channel id="limitMinimum" typeId="limitMinimum"/>
-			<channel id="limitMaximum" typeId="limitMaximum"/>
-		</channels>
-		<representation-property>serial</representation-property>
-		<config-description-ref uri="thing-type:velux:rollershutter"/>
-	</thing-type>
-</thing:thing-descriptions>
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/scene.xml
deleted file mode 100644
index acfa7c11ad..0000000000
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/scene.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Velux Binding -->
-<thing:thing-descriptions bindingId="velux"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
-	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
-
-	<!-- -->
-	<!-- Velux scene Binding -->
-	<!-- -->
-	<thing-type id="scene">
-		<supported-bridge-type-refs>
-			<bridge-type-ref id="klf200"/>
-		</supported-bridge-type-refs>
-		<label>@text/thing-type.velux.scene.label</label>
-		<description>@text/thing-type.velux.scene.description</description>
-		<category>Blinds</category>
-		<channels>
-			<channel id="action" typeId="action"/>
-		</channels>
-		<representation-property>sceneName</representation-property>
-		<config-description-ref uri="thing-type:velux:scene"/>
-	</thing-type>
-</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-actuator.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-actuator.xml
new file mode 100644
index 0000000000..eb704bf802
--- /dev/null
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-actuator.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Velux Binding -->
+<thing:thing-descriptions bindingId="velux"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+	<!-- -->
+	<!-- Velux actuator Binding -->
+	<!-- -->
+	<thing-type id="actuator">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="klf200"/>
+		</supported-bridge-type-refs>
+		<label>@text/thing-type.velux.actuator.label</label>
+		<description>@text/thing-type.velux.actuator.description</description>
+		<category>Blinds</category>
+		<channels>
+			<channel id="position" typeId="position"/>
+			<channel id="state" typeId="state"/>
+			<channel id="limitMinimum" typeId="limitMinimum"/>
+			<channel id="limitMaximum" typeId="limitMaximum"/>
+		</channels>
+		<representation-property>serial</representation-property>
+		<config-description-ref uri="thing-type:velux:actuator"/>
+	</thing-type>
+</thing:thing-descriptions>
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 0000000000..8524d7f717
--- /dev/null
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-binding.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Velux Binding -->
+<thing:thing-descriptions bindingId="velux"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+	<!-- -->
+	<!-- Velux binding Binding -->
+	<!-- -->
+	<thing-type id="binding">
+		<label>@text/thing-type.velux.binding.label</label>
+		<description>@text/thing-type.velux.binding.description</description>
+		<category>NetworkAppliance</category>
+		<channels>
+			<channel id="information" typeId="information"/>
+		</channels>
+		<properties>
+			<property name="bundleVersion">N/A</property>
+		</properties>
+		<representation-property>bundleVersion</representation-property>
+	</thing-type>
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-rollershutter.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-rollershutter.xml
new file mode 100644
index 0000000000..2918a79665
--- /dev/null
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-rollershutter.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Velux Binding -->
+<thing:thing-descriptions bindingId="velux"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<!-- -->
+	<!-- Velux rollershutter Binding -->
+	<!-- -->
+	<thing-type id="rollershutter">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="klf200"/>
+		</supported-bridge-type-refs>
+		<label>@text/thing-type.velux.rollershutter.label</label>
+		<description>@text/thing-type.velux.rollershutter.description</description>
+		<category>Blinds</category>
+		<channels>
+			<channel id="position" typeId="position"/>
+			<channel id="vanePosition" typeId="vanePosition"/>
+			<channel id="limitMinimum" typeId="limitMinimum"/>
+			<channel id="limitMaximum" typeId="limitMaximum"/>
+		</channels>
+		<representation-property>serial</representation-property>
+		<config-description-ref uri="thing-type:velux:rollershutter"/>
+	</thing-type>
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-scene.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-scene.xml
new file mode 100644
index 0000000000..acfa7c11ad
--- /dev/null
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-scene.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Velux Binding -->
+<thing:thing-descriptions bindingId="velux"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<!-- -->
+	<!-- Velux scene Binding -->
+	<!-- -->
+	<thing-type id="scene">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="klf200"/>
+		</supported-bridge-type-refs>
+		<label>@text/thing-type.velux.scene.label</label>
+		<description>@text/thing-type.velux.scene.description</description>
+		<category>Blinds</category>
+		<channels>
+			<channel id="action" typeId="action"/>
+		</channels>
+		<representation-property>sceneName</representation-property>
+		<config-description-ref uri="thing-type:velux:scene"/>
+	</thing-type>
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-vshutter.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-vshutter.xml
new file mode 100644
index 0000000000..8545eab3ee
--- /dev/null
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-vshutter.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Velux Binding -->
+<thing:thing-descriptions bindingId="velux"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<!-- -->
+	<!-- Velux vshutter Binding -->
+	<!-- -->
+	<thing-type id="vshutter">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="klf200"/>
+		</supported-bridge-type-refs>
+		<label>@text/thing-type.velux.vshutter.label</label>
+		<description>@text/thing-type.velux.vshutter.description</description>
+		<category>Blinds</category>
+		<channels>
+			<channel id="position" typeId="position"/>
+		</channels>
+		<config-description-ref uri="thing-type:velux:vshutter"/>
+	</thing-type>
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-window.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-window.xml
new file mode 100644
index 0000000000..baa278e0dc
--- /dev/null
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-window.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Velux Binding -->
+<thing:thing-descriptions bindingId="velux"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<!-- -->
+	<!-- Velux window Binding -->
+	<!-- -->
+	<thing-type id="window">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="klf200"/>
+		</supported-bridge-type-refs>
+		<label>@text/thing-type.velux.window.label</label>
+		<description>@text/thing-type.velux.window.description</description>
+		<category>Window</category>
+		<channels>
+			<channel id="position" typeId="windowPosition"></channel>
+			<channel id="limitMinimum" typeId="limitMinimum"/>
+			<channel id="limitMaximum" typeId="limitMaximum"/>
+		</channels>
+		<representation-property>serial</representation-property>
+		<config-description-ref uri="thing-type:velux:window"/>
+	</thing-type>
+</thing:thing-descriptions>
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/vshutter.xml
deleted file mode 100644
index 8545eab3ee..0000000000
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/vshutter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Velux Binding -->
-<thing:thing-descriptions bindingId="velux"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
-	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
-
-	<!-- -->
-	<!-- Velux vshutter Binding -->
-	<!-- -->
-	<thing-type id="vshutter">
-		<supported-bridge-type-refs>
-			<bridge-type-ref id="klf200"/>
-		</supported-bridge-type-refs>
-		<label>@text/thing-type.velux.vshutter.label</label>
-		<description>@text/thing-type.velux.vshutter.description</description>
-		<category>Blinds</category>
-		<channels>
-			<channel id="position" typeId="position"/>
-		</channels>
-		<config-description-ref uri="thing-type:velux:vshutter"/>
-	</thing-type>
-</thing:thing-descriptions>
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/window.xml
deleted file mode 100644
index baa278e0dc..0000000000
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/window.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Velux Binding -->
-<thing:thing-descriptions bindingId="velux"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
-	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
-
-	<!-- -->
-	<!-- Velux window Binding -->
-	<!-- -->
-	<thing-type id="window">
-		<supported-bridge-type-refs>
-			<bridge-type-ref id="klf200"/>
-		</supported-bridge-type-refs>
-		<label>@text/thing-type.velux.window.label</label>
-		<description>@text/thing-type.velux.window.description</description>
-		<category>Window</category>
-		<channels>
-			<channel id="position" typeId="windowPosition"></channel>
-			<channel id="limitMinimum" typeId="limitMinimum"/>
-			<channel id="limitMaximum" typeId="limitMaximum"/>
-		</channels>
-		<representation-property>serial</representation-property>
-		<config-description-ref uri="thing-type:velux:window"/>
-	</thing-type>
-</thing:thing-descriptions>