Fix ConfigurableService deprecations (openhab#262)

Related to: openhab/openhab-core#1491

Signed-off-by: Wouter Born <[email protected]>

Author: wborn

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/servlet/WebAppServlet.java

@@ -60,19 +60,18 @@
  * @author Vlad Ivanov - Basic UI changes
  *
  */
-@Component(immediate = true, service = Servlet.class, configurationPid = "org.openhab.basicui", property = { //
-        Constants.SERVICE_PID + "=org.openhab.basicui", //
-        ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=ui:basic", //
-        ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=ui", //
-        ConfigurableService.SERVICE_PROPERTY_LABEL + "=Basic UI" //
-})
+@Component(immediate = true, service = Servlet.class, configurationPid = "org.openhab.basicui", //
+        property = Constants.SERVICE_PID + "=org.openhab.basicui")
+@ConfigurableService(category = "ui", label = "Basic UI", description_uri = WebAppServlet.CONFIG_URI)
 @NonNullByDefault
 public class WebAppServlet extends BaseServlet {
 
     private final Logger logger = LoggerFactory.getLogger(WebAppServlet.class);
 
     private static final long serialVersionUID = 3443749654545136365L;
 
+    protected static final String CONFIG_URI = "ui:basic";
+
     /** the name of the servlet to be used in the URL */
     public static final String SERVLET_NAME = "app";
 

bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/servlet/CometVisuApp.java

@@ -55,15 +55,15 @@
  *
  * @author Tobias Bräutigam - Initial contribution
  */
-@Component(immediate = true, service = CometVisuApp.class, configurationPid = "org.openhab.cometvisu", property = {
-        Constants.SERVICE_PID + "=org.openhab.cometvisu",
-        ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=ui:cometvisu",
-        ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=ui",
-        ConfigurableService.SERVICE_PROPERTY_LABEL + "=CometVisu" })
+@Component(immediate = true, service = CometVisuApp.class, configurationPid = "org.openhab.cometvisu", //
+        property = Constants.SERVICE_PID + "=org.openhab.cometvisu")
+@ConfigurableService(category = "ui", label = "CometVisu", description_uri = CometVisuApp.CONFIG_URI)
 public class CometVisuApp {
 
     private final Logger logger = LoggerFactory.getLogger(CometVisuApp.class);
 
+    protected static final String CONFIG_URI = "ui:cometvisu";
+
     protected HttpService httpService;
 
     private ItemUIRegistry itemUIRegistry;