changed packages to not use files but embedded configs instead (#589)

Signed-off-by: Kai Kreuzer <kai@openhab.org>

features/distro-resources/pom.xml

@@ -52,11 +52,6 @@
 						</goals>
 						<configuration>
 							<artifacts>
-								<artifact><file>src/main/resources/etc/addons-minimal.cfg</file><type>cfg</type><classifier>addons-minimal</classifier></artifact>
-								<artifact><file>src/main/resources/etc/addons-simple.cfg</file><type>cfg</type><classifier>addons-simple</classifier></artifact>
-								<artifact><file>src/main/resources/etc/addons-standard.cfg</file><type>cfg</type><classifier>addons-standard</classifier></artifact>
-								<artifact><file>src/main/resources/etc/addons-expert.cfg</file><type>cfg</type><classifier>addons-expert</classifier></artifact>
-								<artifact><file>src/main/resources/etc/addons-demo.cfg</file><type>cfg</type><classifier>addons-demo</classifier></artifact>
 								<artifact><file>src/main/resources/items/demo.items</file><type>cfg</type><classifier>items</classifier></artifact>
 								<artifact><file>src/main/resources/sitemaps/demo.sitemap</file><type>cfg</type><classifier>sitemaps</classifier></artifact>
 								<artifact><file>src/main/resources/things/demo.things</file><type>cfg</type><classifier>things</classifier></artifact>

features/distro/src/main/feature/feature.xml

@@ -15,10 +15,17 @@
         <configfile finalname="${openhab.conf}/services/basicui.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-basicui</configfile>
         <configfile finalname="${openhab.conf}/services/classicui.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-classicui</configfile>
         <configfile finalname="${openhab.conf}/services/logging.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-logging</configfile>
-        <configfile finalname="${openhab.userdata}/etc/org.openhab.addons.cfg" override="true">mvn:${project.groupId}/distro-resources/${project.version}/cfg/addons-demo</configfile>
         <config name="org.eclipse.smarthome.persistence">
 			default = rrd4j
         </config>
+        <config name="org.openhab.addons" append="true">
+			package = demo
+			ui = basic,paper,habpanel
+			misc = restdocs,homekit,hueemulation
+			binding = yahooweather,wemo,hue,sonos,ipp,astro,avmfritz,ntp
+			persistence = rrd4j
+			transformation = map
+        </config>
         <config name="org.openhab.habpanel"><![CDATA[
 			initialPanelConfig=demo
 			lockEditing=false
@@ -29,23 +36,32 @@
 
     <feature name="openhab-package-minimal" description="openHAB Minimal Package" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <configfile finalname="${openhab.userdata}/etc/org.openhab.addons.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/addons-minimal</configfile>
+        <config name="org.openhab.addons" append="true">
+			package = minimal
+        </config>
         <config name="org.eclipse.smarthome.links">
 			autoLinks = false
         </config>
     </feature>
 
     <feature name="openhab-package-simple" description="openHAB Simple Package" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <configfile finalname="${openhab.userdata}/etc/org.openhab.addons.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/addons-simple</configfile>
+        <config name="org.openhab.addons" append="true">
+			package = simple
+			ui = paper,habpanel
+			misc = ruleengine
+        </config>
         <config name="org.eclipse.smarthome.links">
 			autoLinks = true
         </config>
     </feature>
 
     <feature name="openhab-package-standard" description="openHAB Standard Package" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <configfile finalname="${openhab.userdata}/etc/org.openhab.addons.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/addons-standard</configfile>
+        <config name="org.openhab.addons" append="true">
+			package = standard
+			ui = basic,paper,habpanel
+        </config>
         <config name="org.eclipse.smarthome.links">
 			autoLinks = false
         </config>
@@ -54,7 +70,12 @@
     <feature name="openhab-package-expert" description="openHAB Expert Package" version="${project.version}">
         <feature>openhab-runtime-base</feature>
         <feature>openhab-runtime-compat1x</feature>
-        <configfile finalname="${openhab.userdata}/etc/org.openhab.addons.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/addons-expert</configfile>
+        <config name="org.openhab.addons" append="true">
+			package = expert
+			ui = classic,basic,paper,habpanel,habmin
+			misc = restdocs
+			transformation = map,regex,xslt,exec,javascript,scale,xpath,jsonpath
+        </config>
         <config name="org.eclipse.smarthome.links">
 			autoLinks = false
         </config>