From 99b28abaa997703db14567cb05aed1f2aeed2cb1 Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Sat, 17 Jul 2021 23:36:39 +0200
Subject: [PATCH] [enocean] Standardize config URI (#11009)

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../src/main/resources/OH-INF/config/config.xml    |  6 +++---
 .../main/resources/OH-INF/thing/ClassicDevice.xml  |  8 ++++----
 .../resources/OH-INF/thing/gernericChannels.xml    | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/config/config.xml
index ebd49c604dd7b..11790121d1481 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/config/config.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/config/config.xml
@@ -4,7 +4,7 @@
 	xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0"
 	xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">
 
-	<config-description uri="enocean:genericChannel:config">
+	<config-description uri="channel-type:enocean:genericChannel">
 		<parameter name="transformationType" type="text" required="true">
 			<label>Transformation Type</label>
 			<description>The type of the transformation, e.g. "MAP"</description>
@@ -15,7 +15,7 @@
 		</parameter>
 	</config-description>
 
-	<config-description uri="enocean:listeningRockerChannel:config">
+	<config-description uri="channel-type:enocean:listeningRockerChannel">
 		<parameter name="enoceanId" type="text">
 			<label>EnOceanId</label>
 			<description>EnOcean Id to listen to</description>
@@ -40,7 +40,7 @@
 		</parameter>
 	</config-description>
 
-	<config-description uri="enocean:virtualRockerChannel:config">
+	<config-description uri="channel-type:enocean:virtualRockerChannel">
 		<parameter name="duration" type="integer" unit="ms">
 			<label>Time Between Press and Release Message</label>
 			<default>250</default>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/ClassicDevice.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/ClassicDevice.xml
index 4fa6e9da97390..4ca5ba73367ef 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/ClassicDevice.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/ClassicDevice.xml
@@ -57,7 +57,7 @@
 		<item-type>Switch</item-type>
 		<label>Rocker Switch</label>
 		<description>The virtual rocker switch channel allows to send rocker msg.</description>
-		<config-description-ref uri="enocean:virtualRockerChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:virtualRockerChannel"/>
 	</channel-type>
 
 	<!-- virtual rocker switch channel -->
@@ -65,7 +65,7 @@
 		<item-type>Rollershutter</item-type>
 		<label>Rollershutter</label>
 		<description>This channels allows to control a rollershutter through rocker msg.</description>
-		<config-description-ref uri="enocean:virtualRockerChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:virtualRockerChannel"/>
 	</channel-type>
 
 	<!-- virtual rocker switch channel -->
@@ -90,14 +90,14 @@
 	<channel-type id="rockerswitchListenerSwitch">
 		<item-type>Switch</item-type>
 		<label>Rocker Switch Listener (Switch)</label>
-		<config-description-ref uri="enocean:listeningRockerChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:listeningRockerChannel"/>
 	</channel-type>
 
 	<!-- rocker switch listener channel -->
 	<channel-type id="rockerswitchListenerRollershutter">
 		<item-type>Rollershutter</item-type>
 		<label>Rocker Switch Listener (Rollershutter)</label>
-		<config-description-ref uri="enocean:listeningRockerChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:listeningRockerChannel"/>
 	</channel-type>
 
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml
index 2744f18b8989c..3d61a146ebd4e 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml
@@ -10,7 +10,7 @@
 		<label>Switch</label>
 		<description>The switch channel allows to switch something on and off.</description>
 		<category>Switch</category>
-		<config-description-ref uri="enocean:genericChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:genericChannel"/>
 	</channel-type>
 
 	<!-- Rollershutter Channel with transformation configuration -->
@@ -19,7 +19,7 @@
 		<label>Rollershutter</label>
 		<description>Rollershutter</description>
 		<category>Blinds</category>
-		<config-description-ref uri="enocean:genericChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:genericChannel"/>
 	</channel-type>
 
 	<!-- Dimmer Channel with transformation configuration -->
@@ -28,26 +28,26 @@
 		<label>Dimmer</label>
 		<description>Dimmer</description>
 		<category>DimmableLight</category>
-		<config-description-ref uri="enocean:genericChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:genericChannel"/>
 	</channel-type>
 
 	<channel-type id="genericNumber">
 		<item-type>Number</item-type>
 		<label>Number</label>
 		<description>Number</description>
-		<config-description-ref uri="enocean:genericChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:genericChannel"/>
 	</channel-type>
 
 	<channel-type id="genericString">
 		<item-type>String</item-type>
 		<label>String</label>
-		<config-description-ref uri="enocean:genericChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:genericChannel"/>
 	</channel-type>
 
 	<channel-type id="genericColor">
 		<item-type>Color</item-type>
 		<label>Color</label>
-		<config-description-ref uri="enocean:genericChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:genericChannel"/>
 	</channel-type>
 
 	<!-- generic Teach in Channel -->
@@ -56,7 +56,7 @@
 		<label>Teach In</label>
 		<description>The teach in channel allows to send a teach in msg.</description>
 		<category>Switch</category>
-		<config-description-ref uri="enocean:genericChannel:config"/>
+		<config-description-ref uri="channel-type:enocean:genericChannel"/>
 	</channel-type>
 
 </thing:thing-descriptions>