Align feature and product names with ESH, also add a binding feature

Signed-off-by: Thomas Eichstädt-Engelen <thomas@openhab.org>

features/org.openhab.feature.dependencies.minimal/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.openhab.dependencies..minimal.feature</name>
+	<name>org.openhab.feature.dependencies.minimal</name>
 	<comment></comment>
 	<projects>
 	</projects>

features/org.openhab.feature.dependencies.minimal/feature.xml

@@ -10,7 +10,7 @@
 
 -->
 <feature
-      id="org.openhab.dependencies.minimal.feature"
+      id="org.openhab.feature.dependencies.minimal"
       label="openHAB Minimal Dependencies"
       version="2.0.0.qualifier"
       provider-name="openHAB.org">

features/org.openhab.feature.dependencies.minimal/pom.xml

@@ -9,7 +9,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.openhab</groupId>
-  <artifactId>org.openhab.dependencies.minimal.feature</artifactId>
+  <artifactId>org.openhab.feature.dependencies.minimal</artifactId>
 
   <name>openHAB Minimal Dependencies</name>
 

features/org.openhab.feature.dependencies/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.openhab.dependencies.feature</name>
+	<name>org.openhab.feature.dependencies</name>
 	<comment></comment>
 	<projects>
 	</projects>

features/org.openhab.feature.dependencies/feature.xml

@@ -10,7 +10,7 @@
 
 -->
 <feature
-      id="org.openhab.dependencies.feature"
+      id="org.openhab.feature.dependencies"
       label="openHAB Dependencies"
       version="2.0.0.qualifier"
       provider-name="openHAB.org">

features/org.openhab.feature.dependencies/pom.xml

@@ -9,7 +9,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.openhab</groupId>
-  <artifactId>org.openhab.dependencies.feature</artifactId>
+  <artifactId>org.openhab.feature.dependencies</artifactId>
 
   <name>openHAB Dependencies</name>
 

features/org.openhab.feature.runtime.minimal/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.openhab.runtime.minimal.feature</name>
+	<name>org.openhab.feature.runtime.minimal</name>
 	<comment></comment>
 	<projects>
 	</projects>

features/org.openhab.feature.runtime.minimal/feature.xml

@@ -10,7 +10,7 @@
 
 -->
 <feature
-      id="org.openhab.runtime.minimal.feature"
+      id="org.openhab.feature.runtime.minimal"
       label="openHAB Minimal Runtime"
       version="2.0.0.qualifier"
       provider-name="openHAB.org">
@@ -20,7 +20,7 @@
    </description>
 
    <copyright>
-      Copyright (c) 2010-2014, openHAB.org &lt;admin@openhab.org&gt;
+      Copyright (c) 2010-2015, openHAB.org &lt;admin@openhab.org&gt;
    </copyright>
 
    <license url="%licenseURL">
@@ -75,4 +75,5 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+
 </feature>

features/org.openhab.feature.runtime.minimal/pom.xml

@@ -9,7 +9,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.openhab</groupId>
-  <artifactId>org.openhab.runtime.minimal.feature</artifactId>
+  <artifactId>org.openhab.feature.runtime.minimal</artifactId>
 
   <name>openHAB Minimal Runtime</name>
 

features/org.openhab.feature.runtime/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.openhab.runtime.feature</name>
+	<name>org.openhab.feature.runtime</name>
 	<comment></comment>
 	<projects>
 	</projects>

features/org.openhab.feature.runtime/feature.xml

@@ -10,7 +10,7 @@
 
 -->
 <feature
-      id="org.openhab.runtime.feature"
+      id="org.openhab.feature.runtime"
       label="openHAB Runtime"
       version="2.0.0.qualifier"
       provider-name="openHAB.org">
@@ -20,7 +20,7 @@
    </description>
 
    <copyright>
-      Copyright (c) 2010-2014, openHAB.org &lt;admin@openhab.org&gt;
+      Copyright (c) 2010-2015, openHAB.org &lt;admin@openhab.org&gt;
    </copyright>
 
    <license url="%licenseURL">
@@ -95,4 +95,5 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+
 </feature>

features/org.openhab.feature.runtime/pom.xml

@@ -9,7 +9,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.openhab</groupId>
-  <artifactId>org.openhab.runtime.feature</artifactId>
+  <artifactId>org.openhab.feature.runtime</artifactId>
 
   <name>openHAB Runtime</name>
 

features/pom.xml

@@ -16,10 +16,10 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>org.openhab.dependencies.feature</module>
-    <module>org.openhab.dependencies.minimal.feature</module>
-    <module>org.openhab.runtime.feature</module>
-    <module>org.openhab.runtime.minimal.feature</module>
+    <module>org.openhab.feature.dependencies</module>
+    <module>org.openhab.feature.dependencies.minimal</module>
+    <module>org.openhab.feature.runtime</module>
+    <module>org.openhab.feature.runtime.minimal</module>
   </modules>
 
 </project>

products/org.openhab.product.runtime.minimal/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.openhab.runtime.minimal.product</name>
+	<name>org.openhab.product.runtime.minimal</name>
 	<comment></comment>
 	<projects>
 	</projects>

products/org.openhab.product.runtime.minimal/category.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.openhab.runtime.minimal.feature_2.0.0.qualifier.jar" id="org.openhab.runtime.minimal.feature" version="2.0.0.qualifier">
+   <feature url="features/org.openhab.feature.runtime.minimal_2.0.0.qualifier.jar" id="org.openhab.feature.runtime.minimal" version="2.0.0.qualifier">
       <category name="org.openhab"/>
    </feature>
    <category-def name="org.openhab" label="openHAB">

products/org.openhab.product.runtime.minimal/org.openhab.runtime.minimal.product.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="openHAB Minimal Runtime" uid="org.openhab.runtime.minimal.product" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product name="openHAB Minimal Runtime" uid="org.openhab.product.runtime.minimal" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="false">
 
    <configIni use="default">
    </configIni>
@@ -31,13 +31,15 @@
    </plugins>
 
    <features>
-      <feature id="org.openhab.runtime.minimal.feature"/>
-      <feature id="org.openhab.dependencies.minimal.feature"/>
+      <feature id="org.openhab.feature.dependencies.minimal" version="2.0.0.qualifier"/>
+      <feature id="org.openhab.feature.runtime.minimal" version="2.0.0.qualifier"/>
    </features>
 
    <configurations>
       <plugin id="ch.qos.logback.classic" autoStart="true" startLevel="1" />
       <plugin id="ch.qos.logback.core" autoStart="true" startLevel="1" />
+      <plugin id="com.eclipsesource.jaxrs.provider.gson" autoStart="true" startLevel="5" />
+      <plugin id="com.eclipsesource.jaxrs.publisher" autoStart="true" startLevel="5" />
       <plugin id="org.apache.felix.fileinstall" autoStart="true" startLevel="3" />
       <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
       <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
@@ -80,12 +82,10 @@
       <plugin id="org.eclipse.smarthome.storage.mapdb" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.smarthome.ui.paperui" autoStart="true" startLevel="0" />
       <plugin id="org.jupnp" autoStart="true" startLevel="0" />
-      <plugin id="com.eclipsesource.jaxrs.provider.gson" autoStart="true" startLevel="5" />
-      <plugin id="com.eclipsesource.jaxrs.publisher" autoStart="true" startLevel="5" />
       <plugin id="org.openhab.core" autoStart="true" startLevel="5" />
-      <plugin id="org.openhab.ui.dashboard" autoStart="true" startLevel="0" />
       <plugin id="org.openhab.core.init" autoStart="true" startLevel="1" />
       <plugin id="org.openhab.io.rest.docs" autoStart="true" startLevel="0" />
+      <plugin id="org.openhab.ui.dashboard" autoStart="true" startLevel="0" />
    </configurations>
 
 </product>

products/org.openhab.product.runtime.minimal/pom.xml

@@ -9,7 +9,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.openhab.products</groupId>
-  <artifactId>org.openhab.runtime.minimal.product</artifactId>
+  <artifactId>org.openhab.product.runtime.minimal</artifactId>
 
   <name>openHAB Minimal Runtime</name>
 
@@ -78,7 +78,7 @@
 				<configuration>
 					<products>
 						<product>
-							<id>org.openhab.runtime.minimal.product</id>
+							<id>org.openhab.product.runtime.minimal</id>
 						</product>
 					</products>
 				</configuration>

products/org.openhab.product.runtime/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.openhab.runtime.product</name>
+	<name>org.openhab.product.runtime</name>
 	<comment></comment>
 	<projects>
 	</projects>

products/org.openhab.product.runtime/category.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.openhab.runtime.feature_2.0.0.qualifier.jar" id="org.openhab.runtime.feature" version="2.0.0.qualifier">
+   <feature url="features/org.openhab.feature.runtime_2.0.0.qualifier.jar" id="org.openhab.feature.runtime" version="2.0.0.qualifier">
       <category name="org.openhab"/>
    </feature>
    <category-def name="org.openhab" label="openHAB">

products/org.openhab.product.runtime/org.openhab.runtime.product.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="openHAB Runtime" uid="org.openhab.runtime.product" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product name="openHAB Runtime" uid="org.openhab.product.runtime" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="false">
 
    <configIni use="default">
    </configIni>
@@ -31,13 +31,15 @@
    </plugins>
 
    <features>
-      <feature id="org.openhab.runtime.feature"/>
-      <feature id="org.openhab.dependencies.feature"/>
+      <feature id="org.openhab.feature.dependencies" version="2.0.0.qualifier"/>
+      <feature id="org.openhab.feature.runtime" version="2.0.0.qualifier"/>
    </features>
 
    <configurations>
       <plugin id="ch.qos.logback.classic" autoStart="true" startLevel="1" />
       <plugin id="ch.qos.logback.core" autoStart="true" startLevel="1" />
+      <plugin id="com.eclipsesource.jaxrs.provider.gson" autoStart="true" startLevel="5" />
+      <plugin id="com.eclipsesource.jaxrs.publisher" autoStart="true" startLevel="5" />
       <plugin id="org.apache.felix.fileinstall" autoStart="true" startLevel="3" />
       <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
       <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
@@ -93,18 +95,16 @@
       <plugin id="org.eclipse.smarthome.model.thing.runtime" autoStart="true" startLevel="3" />
       <plugin id="org.eclipse.smarthome.storage.mapdb" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.smarthome.ui" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.smarthome.ui.icon" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.smarthome.ui.classic" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.smarthome.ui.icon" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.smarthome.ui.paperui" autoStart="true" startLevel="0" />
       <plugin id="org.jupnp" autoStart="true" startLevel="0" />
-      <plugin id="com.eclipsesource.jaxrs.provider.gson" autoStart="true" startLevel="5" />
-      <plugin id="com.eclipsesource.jaxrs.publisher" autoStart="true" startLevel="5" />
       <plugin id="org.openhab.core" autoStart="true" startLevel="5" />
-      <plugin id="org.openhab.core.init" autoStart="true" startLevel="1" />
       <plugin id="org.openhab.core.compat1x" autoStart="true" startLevel="0" />
-      <plugin id="org.openhab.ui.dashboard" autoStart="true" startLevel="0" />
-      <plugin id="org.openhab.ui.classicui" autoStart="true" startLevel="0" />
+      <plugin id="org.openhab.core.init" autoStart="true" startLevel="1" />
       <plugin id="org.openhab.io.rest.docs" autoStart="true" startLevel="0" />
+      <plugin id="org.openhab.ui.classicui" autoStart="true" startLevel="0" />
+      <plugin id="org.openhab.ui.dashboard" autoStart="true" startLevel="0" />
    </configurations>
 
 </product>

products/org.openhab.product.runtime/pom.xml

@@ -9,7 +9,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.openhab.products</groupId>
-  <artifactId>org.openhab.runtime.product</artifactId>
+  <artifactId>org.openhab.product.runtime</artifactId>
 
   <name>openHAB Runtime Application</name>
 
@@ -78,7 +78,7 @@
 				<configuration>
 					<products>
 						<product>
-							<id>org.openhab.runtime.product</id>
+							<id>org.openhab.product.runtime</id>
 						</product>
 					</products>
 				</configuration>

products/org.openhab.repo/.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openhab.repo</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

products/org.openhab.repo/category.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.openhab.feature.dependencies_2.0.0.qualifier.jar" id="org.openhab.feature.dependencies" version="2.0.0.qualifier">
+      <category name="org.openhab"/>
+   </feature>
+   <feature url="features/org.openhab.feature.runtime_2.0.0.qualifier.jar" id="org.openhab.feature.runtime" version="2.0.0.qualifier">
+      <category name="org.openhab"/>
+   </feature>
+   <category-def name="org.openhab" label="openHAB">
+      <description>
+         This category contains all openHAB2 features
+      </description>
+   </category-def>
+</site>

products/org.openhab.repo/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+      <groupId>org.openhab</groupId>
+      <artifactId>products</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.openhab.products</groupId>
+  <artifactId>org.openhab.repo</artifactId>
+
+  <name>openHAB P2 Repository</name>
+
+  <packaging>eclipse-repository</packaging>
+
+</project>

products/pom.xml

@@ -16,8 +16,9 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>org.openhab.runtime.product</module>
-    <module>org.openhab.runtime.minimal.product</module>
+    <module>org.openhab.product.runtime</module>
+    <module>org.openhab.product.runtime.minimal</module>
+    <module>org.openhab.repo</module>
   </modules>
 
 </project>