adapted packaging to new mechanism (openhab#334)

* changed addons.cfg to new packaging types
* refactored demo packaging to use addons configuration instead of direct Karaf features
* removed experimental features

Signed-off-by: Kai Kreuzer <[email protected]>

distributions/distribution-resources/src/main/resources/conf/services/addons.cfg

@@ -1,10 +1,12 @@
 # The base installation package of this openHAB instance (default is "standard")
 # Valid options:
 #   - minimal  : Installation only with dashboard, but no UIs or other addons
-#   - standard : Typical installation with all standards UIs
+#   - simple   : Setup for using openHAB purely through UIs - you need to expect MANY constraints in functionality!
+#   - standard : Default setup for normal users, best for textual setup
+#   - expert   : Setup for expoert users, especially for people migrating from openHAB 1.x
 #   - demo     : A demo setup which includes UIs, a few bindings, config files etc.
 #
-#package = standard
+package = standard
 
 # Access Remote Add-on Repositories
 # Defines whether the remote openHAB add-on repository should be used for browsing and installing add-ons.
@@ -18,29 +20,23 @@
 #
 #legacy = true
 
-# Include experimental add-ons. If set to true, it also allows the installation of extensions that are not (yet) part
-# of the official distribution and need further testing (requires remote repo access, see above). (default is false)
-#
-#experimental = true
-
-
 # A comma-separated list of bindings to install (e.g. "sonos,knx,zwave")
-binding = 
+#binding = 
 
 # A comma-separated list of UIs to install (e.g. "basic,paper")
-ui = 
+#ui = 
 
 # A comma-separated list of persistence services to install (e.g. "rrd4j,jpa")
-persistence = 
+#persistence = 
 
 # A comma-separated list of actions to install (e.g. "mail,pushover")
-action = 
+#action = 
 
 # A comma-separated list of transformation services to install (e.g. "map,jsonpath")
-transformation = 
+#transformation = 
 
 # A comma-separated list of voice services to install (e.g. "marytts,freetts")
-voice = 
+#voice = 
 
 # A comma-separated list of miscellaneous services to install (e.g. "myopenhab")
-misc = 
+#misc = 

features/openhab-demo-resources/pom.xml

@@ -41,7 +41,7 @@
                                 <artifact><file>src/main/resources/services/logging.cfg</file><type>cfg</type><classifier>services-logging</classifier></artifact>
                                 <artifact><file>src/main/resources/services/basicui.cfg</file><type>cfg</type><classifier>services-basicui</classifier></artifact>
                                 <artifact><file>src/main/resources/services/classicui.cfg</file><type>cfg</type><classifier>services-classicui</classifier></artifact>
-                                <artifact><file>src/main/resources/services/runtime.cfg</file><type>cfg</type><classifier>services-runtime</classifier></artifact>
+                                <artifact><file>src/main/resources/etc/org.openhab.addons.cfg</file><type>cfg</type><classifier>addons</classifier></artifact>
                             </artifacts>
                         </configuration>
                     </execution>

features/openhab-demo-resources/src/main/resources/etc/org.openhab.addons.cfg

@@ -0,0 +1,6 @@
+package = demo
+ui = basic,paper,habpanel
+misc = restdocs
+binding = yahooweather,wemo,hue,sonos,ipp,astro,avmfritz,ntp
+persistence = rrd4j
+transformation = map

features/openhab-demo/src/main/feature/feature.xml

@@ -5,22 +5,6 @@
 
     <feature name="openhab-package-demo" description="openHAB Demo Package" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <feature>openhab-runtime-certificate</feature>
-        <feature>openhab-transport-mdns</feature>
-        <feature>openhab-misc-restdocs</feature>
-        <feature>openhab-ui-basic</feature>
-        <feature>openhab-ui-classic</feature>
-        <feature>openhab-ui-paper</feature>
-        <feature>openhab-binding-yahooweather</feature>
-        <feature>openhab-binding-wemo</feature>
-        <feature>openhab-binding-hue</feature>
-        <feature>openhab-binding-sonos</feature>
-        <feature>openhab-binding-ipp</feature>
-        <feature>openhab-binding-astro</feature>
-        <feature>openhab-binding-avmfritz</feature>
-        <feature>openhab-binding-ntp</feature>
-        <feature>openhab-persistence-rrd4j</feature>
-        <feature>openhab-transformation-map</feature>
         <configfile finalname="${openhab.conf}/items/demo.items" override="false">mvn:${project.groupId}/openhab-demo-resources/${project.version}/cfg/items</configfile>
         <configfile finalname="${openhab.conf}/sitemaps/demo.sitemap" override="false">mvn:${project.groupId}/openhab-demo-resources/${project.version}/cfg/sitemaps</configfile>
         <configfile finalname="${openhab.conf}/things/demo.things" override="false">mvn:${project.groupId}/openhab-demo-resources/${project.version}/cfg/things</configfile>
@@ -34,7 +18,7 @@
         <configfile finalname="${openhab.conf}/services/basicui.cfg" override="false">mvn:${project.groupId}/openhab-demo-resources/${project.version}/cfg/services-basicui</configfile>
         <configfile finalname="${openhab.conf}/services/classicui.cfg" override="false">mvn:${project.groupId}/openhab-demo-resources/${project.version}/cfg/services-classicui</configfile>
         <configfile finalname="${openhab.conf}/services/logging.cfg" override="false">mvn:${project.groupId}/openhab-demo-resources/${project.version}/cfg/services-logging</configfile>
-        <configfile finalname="${openhab.conf}/services/runtime.cfg" override="false">mvn:${project.groupId}/openhab-demo-resources/${project.version}/cfg/services-runtime</configfile>
+        <configfile finalname="${openhab.userdata}/etc/org.openhab.addons.cfg" override="true">mvn:${project.groupId}/openhab-demo-resources/${project.version}/cfg/addons</configfile>
     </feature>
 
 </features>

features/pom.xml

@@ -19,7 +19,6 @@
         <module>openhab-aggregate-xml</module>
         <module>openhab-demo-resources</module>
         <module>openhab-demo</module>
-        <module>openhab-addons-experimental</module>
         <module>openhab-verify</module>
     </modules>