From 1fd4db5682833f2231f6510f86af35fb54351c7a Mon Sep 17 00:00:00 2001
From: Kai Kreuzer <kai@openhab.org>
Date: Tue, 28 Nov 2017 00:43:51 +0100
Subject: [PATCH] changed packages to not use files but embedded configs
 instead

Signed-off-by: Kai Kreuzer <kai@openhab.org>
---
 features/distro-resources/pom.xml             |  5 ---
 .../src/main/resources/etc/addons-demo.cfg    |  6 ----
 .../src/main/resources/etc/addons-expert.cfg  |  4 ---
 .../src/main/resources/etc/addons-minimal.cfg |  1 -
 .../src/main/resources/etc/addons-simple.cfg  |  3 --
 .../main/resources/etc/addons-standard.cfg    |  2 --
 features/distro/src/main/feature/feature.xml  | 31 ++++++++++++++++---
 7 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 features/distro-resources/src/main/resources/etc/addons-demo.cfg
 delete mode 100644 features/distro-resources/src/main/resources/etc/addons-expert.cfg
 delete mode 100644 features/distro-resources/src/main/resources/etc/addons-minimal.cfg
 delete mode 100644 features/distro-resources/src/main/resources/etc/addons-simple.cfg
 delete mode 100644 features/distro-resources/src/main/resources/etc/addons-standard.cfg

diff --git a/features/distro-resources/pom.xml b/features/distro-resources/pom.xml
index fc7d5a5f98..807cdeee01 100644
--- a/features/distro-resources/pom.xml
+++ b/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>
diff --git a/features/distro-resources/src/main/resources/etc/addons-demo.cfg b/features/distro-resources/src/main/resources/etc/addons-demo.cfg
deleted file mode 100644
index c21116dff0..0000000000
--- a/features/distro-resources/src/main/resources/etc/addons-demo.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-package = demo
-ui = basic,paper,habpanel
-misc = restdocs,homekit,hueemulation
-binding = yahooweather,wemo,hue,sonos,ipp,astro,avmfritz,ntp
-persistence = rrd4j
-transformation = map
diff --git a/features/distro-resources/src/main/resources/etc/addons-expert.cfg b/features/distro-resources/src/main/resources/etc/addons-expert.cfg
deleted file mode 100644
index 680e5095b8..0000000000
--- a/features/distro-resources/src/main/resources/etc/addons-expert.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-package = expert
-ui = classic,basic,paper,habpanel,habmin
-misc = restdocs
-transformation = map,regex,xslt,exec,javascript,scale,xpath,jsonpath
diff --git a/features/distro-resources/src/main/resources/etc/addons-minimal.cfg b/features/distro-resources/src/main/resources/etc/addons-minimal.cfg
deleted file mode 100644
index ca5df2e94c..0000000000
--- a/features/distro-resources/src/main/resources/etc/addons-minimal.cfg
+++ /dev/null
@@ -1 +0,0 @@
-package = minimal
diff --git a/features/distro-resources/src/main/resources/etc/addons-simple.cfg b/features/distro-resources/src/main/resources/etc/addons-simple.cfg
deleted file mode 100644
index 3bb6e08a92..0000000000
--- a/features/distro-resources/src/main/resources/etc/addons-simple.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-package = simple
-ui = paper,habpanel
-misc = ruleengine
diff --git a/features/distro-resources/src/main/resources/etc/addons-standard.cfg b/features/distro-resources/src/main/resources/etc/addons-standard.cfg
deleted file mode 100644
index d9101aaaa5..0000000000
--- a/features/distro-resources/src/main/resources/etc/addons-standard.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-package = standard
-ui = basic,paper,habpanel
diff --git a/features/distro/src/main/feature/feature.xml b/features/distro/src/main/feature/feature.xml
index 486c9962e4..2c5db5ab30 100644
--- a/features/distro/src/main/feature/feature.xml
+++ b/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,7 +36,9 @@
 
     <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>
@@ -37,7 +46,11 @@
 
     <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>
@@ -45,7 +58,10 @@
 
     <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>