- don't include legacy features in offline distro (openhab#187)

- added feature for experimental add-ons

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

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

@@ -1,9 +1,9 @@
-# The base installation package of this openHAB instance
+# 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
 #   - demo     : A demo setup which includes UIs, a few bindings, config files etc.
-package = standard
+#package = standard
 
 # A comma-separated list of bindings to install (e.g. "sonos,knx,zwave")
 binding = 

features/openhab-addons-experimental/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.openhab.distro</groupId>
+        <artifactId>pom-features</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.openhab.addons</groupId>
+    <artifactId>openhab-addons-experimental</artifactId>
+    <packaging>feature</packaging>
+
+    <name>openHAB Experimental Feature Addons</name>
+    <description>openHAB Experimental Addons</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <startLevel>80</startLevel>
+                    <aggregateFeatures>true</aggregateFeatures>
+                    <!--  <resolver>(obr)</resolver> -->
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <failOnDependencyChange>false</failOnDependencyChange>
+                    <logDependencyChanges>true</logDependencyChanges>
+                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

features/openhab-addons-experimental/src/main/feature/feature.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2014-2016 by the respective copyright holders.
+
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+-->
+<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+
+    <!-- binding -->
+
+    <feature name="openhab-misc-ruleengine" description="Rule Engine (Experimental)" version="${project.version}">
+        <feature>openhab-runtime-base</feature>
+        <feature dependency="true">esh-automation-api</feature>
+        <feature dependency="true">esh-automation-commands</feature>
+        <feature dependency="true">esh-automation-core</feature>
+        <feature dependency="true">esh-automation-module-core</feature>
+        <feature dependency="true">esh-automation-module-script</feature>
+        <feature dependency="true">esh-automation-module-script-defaultscope</feature>
+        <feature dependency="true">esh-automation-module-timer</feature>
+        <feature dependency="true">esh-automation-parser-gson</feature>
+        <feature dependency="true">esh-automation-providers</feature>
+        <feature dependency="true">esh-automation-rest</feature>
+    </feature>
+
+</features>

features/openhab-aggregate-xml/pom.xml

@@ -58,13 +58,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.openhab.addons</groupId>
-            <artifactId>openhab-addons-legacy</artifactId>
-            <version>${oh1.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>openhab-demo</artifactId>

features/openhab-verify/pom.xml

@@ -30,6 +30,14 @@
             <classifier>features</classifier>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openhab.addons</groupId>
+            <artifactId>openhab-addons-experimental</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -49,6 +57,7 @@
                                 <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:${project.groupId}/openhab-aggregate-xml/${project.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.openhab.addons/openhab-addons-experimental/${project.version}/xml/features</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
                             <javase>1.8</javase>

features/pom.xml

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