diff --git a/bundles/core/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java b/bundles/core/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java index 3c515b86e29e0..5732c092ebfb5 100644 --- a/bundles/core/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java +++ b/bundles/core/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -61,6 +62,14 @@ public List getExtensions(Locale locale) { logger.error("Exception while retrieving features: {}", e.getMessage()); return Collections.emptyList(); } + + // let's sort the result alphabetically + Collections.sort(extensions, new Comparator() { + @Override + public int compare(Extension ext1, Extension ext2) { + return ext1.getLabel().compareTo(ext2.getLabel()); + } + }); return extensions; } @@ -89,10 +98,11 @@ private Extension getExtension(Feature feature) { public List getTypes(Locale locale) { List typeList = new ArrayList<>(6); typeList.add(new ExtensionType("binding", "Bindings")); - typeList.add(new ExtensionType("ui", "User Interface")); - typeList.add(new ExtensionType("persistence", "Persistence Service")); + typeList.add(new ExtensionType("ui", "User Interfaces")); + typeList.add(new ExtensionType("persistence", "Persistence Services")); typeList.add(new ExtensionType("action", "Actions")); typeList.add(new ExtensionType("transformation", "Transformations")); + typeList.add(new ExtensionType("tts", "Text-2-Speech")); typeList.add(new ExtensionType("misc", "Misc")); return typeList; } diff --git a/features/org.openhab.feature.addons/src/main/feature/feature.xml b/features/org.openhab.feature.addons/src/main/feature/feature.xml index b2ca43c6c66a4..e0ecf66718de0 100644 --- a/features/org.openhab.feature.addons/src/main/feature/feature.xml +++ b/features/org.openhab.feature.addons/src/main/feature/feature.xml @@ -520,39 +520,12 @@ mvn:${project.groupId}/org.openhab.feature.addons.external/${project.version}/cfg/jpa - - - - openhab-runtime-base - openhab-runtime-compat1x - openhab-transport-serial - mvn:org.openhab.io/org.openhab.io.transport.cul/${oh1.version} - - - - shk-esh-io-transport-mdns - - - - shk-esh-io-transport-mqtt - - - - openhab-runtime-base - mvn:org.openhab.bundles.io/org.openhab.io.transport.serial/${project.version} - - - - shk-esh-io-transport-upnp - - openhab-runtime-base openhab-ui-dashboard shk-esh-ui-basic - mvn:org.eclipse.smarthome.extension.ui/org.eclipse.smarthome.ui.basic/${esh.version} mvn:org.openhab.ui/org.openhab.ui.basicui/${project.version} mvn:org.openhab.bundles.ui/org.openhab.ui.iconset.classic/${project.version} mvn:${project.groupId}/org.openhab.feature.addons.external/${project.version}/cfg/basicui @@ -585,15 +558,42 @@ mvn:org.openhab.ui/org.openhab.ui.paperui/${project.version} - + - - openhab-runtime-base - openhab-runtime-compat1x - mvn:org.openhab.io/org.openhab.io.caldav/${oh1.version} - mvn:${project.groupId}/org.openhab.feature.addons.external/${project.version}/cfg/caldavio + + shk-esh-transform-exec + + shk-esh-transform-javascript + + + + shk-esh-transform-map + + + + shk-esh-transform-scale + + + + shk-esh-transform-regex + + + + shk-esh-transform-xpath + + + + shk-esh-transform-jsonpath + + + + shk-esh-transform-xslt + + + + openhab-runtime-base openhab-runtime-compat1x @@ -601,4 +601,37 @@ mvn:${project.groupId}/org.openhab.feature.addons.external/${project.version}/cfg/marytts + + + + openhab-runtime-base + openhab-runtime-compat1x + openhab-transport-serial + mvn:org.openhab.io/org.openhab.io.transport.cul/${oh1.version} + + + + shk-esh-io-transport-mdns + + + + shk-esh-io-transport-mqtt + + + + openhab-runtime-base + mvn:org.openhab.bundles.io/org.openhab.io.transport.serial/${project.version} + + + + shk-esh-io-transport-upnp + + + + openhab-runtime-base + openhab-runtime-compat1x + mvn:org.openhab.io/org.openhab.io.caldav/${oh1.version} + mvn:${project.groupId}/org.openhab.feature.addons.external/${project.version}/cfg/caldavio + +