Merge pull request #519 from maggu2810/karaf-features

Karaf cleanup and improvements
openhab · Dec 4, 2015 · f96d1e1 · f96d1e1
2 parents 82bc7af + 84b21c3
commit f96d1e1
Show file tree

Hide file tree

Showing 14 changed files with 367 additions and 606 deletions.
diff --git a/distributions/openhab-runtime-karaf/pom.xml b/distributions/openhab-runtime-karaf/pom.xml
@@ -90,29 +90,21 @@
             <version>${karaf.features.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openhab.features</groupId>
-            <artifactId>org.openhab.feature.runtime</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.openhab.features</groupId>
-            <artifactId>org.openhab.feature.addons</artifactId>
+            <artifactId>org.openhab.feature.aggregate.kar</artifactId>
             <version>${project.version}</version>
             <type>kar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.openhab.features</groupId>
-            <artifactId>org.openhab.feature.demo</artifactId>
+            <artifactId>org.openhab.feature.aggregate.xml</artifactId>
             <version>${project.version}</version>
-            <type>kar</type>
-            <scope>provided</scope>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -154,7 +146,9 @@
                     <installedFeatures>
                         <feature>wrapper</feature>
                     </installedFeatures>
-                    <!-- <startupFeatures/> -->
+                    <startupFeatures>
+                        <feature>eventadmin</feature>
+                    </startupFeatures>
                     <bootFeatures>
                         <feature>jaas</feature>
                         <feature>shell</feature>
@@ -169,35 +163,12 @@
                         <feature>kar</feature>
                         <feature>log</feature>
                         <feature>package</feature>
-                        <!-- <feature>scr</feature> -->
                         <feature>service</feature>
                         <feature>system</feature>
-                        <!-- <feature>webconsole</feature> -->
                         <feature>openhab-runtime</feature>
                     </bootFeatures>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>com.google.code.maven-config-processor-plugin</groupId>
-                <artifactId>config-processor-maven-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <transformations>
-                        <transformation>
-                            <type>properties</type>
-                            <input>${project.build.directory}/assembly/etc/org.apache.karaf.features.cfg</input>
-                            <config>src/main/config-processor/org.apache.karaf.features.cfg.xml</config>
-                        </transformation>
-                    </transformations>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/...butions/openhab-runtime-karaf/src/main/config-processor/org.apache.karaf.features.cfg.xml b/...butions/openhab-runtime-karaf/src/main/config-processor/org.apache.karaf.features.cfg.xml
diff --git a/distributions/openhab-runtime-karaf/src/main/filtered-resources/etc/startup.properties b/distributions/openhab-runtime-karaf/src/main/filtered-resources/etc/startup.properties
diff --git a/distributions/openhab-runtime-karaf/src/main/resources/etc/system.properties b/distributions/openhab-runtime-karaf/src/main/resources/etc/system.properties
@@ -157,7 +157,5 @@ smarthome.configdir=${openhab.conf}
 org.quartz.properties=${openhab.runtime}/etc/quartz.properties
 jetty.keystore.path=${openhab.runtime}/etc/keystore
 jetty.truststore.path=${openhab.runtime}/etc/keystore
-jetty.etc.config.urls=etc/jetty.xml,etc/jetty-ssl.xml,etc/jetty-deployer.xml,etc/jetty-https.xml,etc/jetty-selector.xml
-jetty.home.bundle=org.openhab.io.jetty
 equinox.ds.block_timeout=240000
 equinox.scr.waitTimeOnBlock=60000
diff --git a/features/org.openhab.feature.addons/pom.xml b/features/org.openhab.feature.addons/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>org.openhab.feature.addons</artifactId>
-    <packaging>kar</packaging>
+    <packaging>feature</packaging>
 
     <name>openHAB Feature Addons</name>
     <description>openHAB 2</description>
@@ -34,7 +34,6 @@
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <version>4.0.4-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
                     <startLevel>80</startLevel>
@@ -49,24 +48,4 @@
         </plugins>
     </build>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <!-- TODO: temporary solution as long as karaf-maven-plugin <= 4.0.3 -->
-            <id>apache-snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>https://repository.apache.org/content/groups/snapshots</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <repositories>
-        <repository>
-            <id>openhab.repository.snapshot</id>
-            <name>openHAB 1.x Snapshots</name>
-            <url>http://oss.jfrog.org/artifactory/libs-snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
 </project>