Updated to latest stable ESH version incl. MapDB

Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer)

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

@@ -671,4 +671,39 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.smarthome.config.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.smarthome.core.binding.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.smarthome.core.thing.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.smarthome.storage.mapdb"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.gson"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

targetplatform/openHAB_Runtime.launch

@@ -17,12 +17,12 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.clean=true -Dosgi.noShutdown=true -Dlogback.configurationFile=./runtime/etc/logback_debug.xml -Djava.library.path=./lib -Djetty.home.bundle=org.eclipse.jetty.osgi.boot -Dorg.quartz.properties=./runtime/etc/quartz.properties -Djetty.port=8080 -Djetty.port.ssl=8443 -DmdnsName=openhab -Dopenhab.logdir=./userdata/logs -Dsmarthome.servicecfg=./runtime/etc/services.cfg -Dsmarthome.servicepid=org.openhab"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.clean=true -Dosgi.noShutdown=true -Dlogback.configurationFile=./runtime/etc/logback_debug.xml -Djava.library.path=./lib -Djetty.home.bundle=org.eclipse.jetty.osgi.boot -Dorg.quartz.properties=./runtime/etc/quartz.properties -Djetty.port=8080 -Djetty.port.ssl=8443 -DmdnsName=openhab -Dopenhab.logdir=./userdata/logs -Dsmarthome.servicecfg=./runtime/etc/services.cfg -Dsmarthome.servicepid=org.openhab -Dsmarthome.userdata=userdata"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:distribution/openhabhome}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value=""/>
 <stringAttribute key="productFile" value="/org.openhab.runtime.product/org.openhab.runtime.product.product"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@1:default,ch.qos.logback.core@1:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.google.inject@default:default,com.sun.jersey@default:default,javax.activation@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet*3.1.0.v20140303-1611@default:default,javax.transaction@default:false,javax.ws.rs@default:default,javax.xml.bind@default:default,javax.xml.stream@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.exec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:true,org.apache.felix.gogo.runtime@default:true,org.apache.felix.gogo.shell@default:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.codehaus.jackson.core@default:default,org.codehaus.jackson.mapper@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@3:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.2.1.v20140609@default:default,org.eclipse.jetty.io*9.2.1.v20140609@default:default,org.eclipse.jetty.osgi.boot@2:true,org.eclipse.jetty.osgi.httpservice@default:default,org.eclipse.jetty.security*9.2.1.v20140609@default:default,org.eclipse.jetty.server*9.2.1.v20140609@default:default,org.eclipse.jetty.servlet*9.2.1.v20140609@default:default,org.eclipse.jetty.util*9.2.1.v20140609@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.smarthome.binding.yahooweather@default:true,org.eclipse.smarthome.config.core@default:true,org.eclipse.smarthome.config.xml@default:true,org.eclipse.smarthome.core.autoupdate@default:true,org.eclipse.smarthome.core.binding.xml@default:true,org.eclipse.smarthome.core.library@default:true,org.eclipse.smarthome.core.persistence@default:true,org.eclipse.smarthome.core.scheduler@default:true,org.eclipse.smarthome.core.scriptengine@default:true,org.eclipse.smarthome.core.thing.xml@default:true,org.eclipse.smarthome.core.thing@default:true,org.eclipse.smarthome.core.transform@default:true,org.eclipse.smarthome.core@default:true,org.eclipse.smarthome.io.console@default:true,org.eclipse.smarthome.io.monitor@default:true,org.eclipse.smarthome.io.multimedia@default:true,org.eclipse.smarthome.io.net@default:true,org.eclipse.smarthome.io.rest.item@default:default,org.eclipse.smarthome.io.rest.sitemap@default:default,org.eclipse.smarthome.io.rest@default:true,org.eclipse.smarthome.io.servicediscovery@default:true,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.model.core@4:true,org.eclipse.smarthome.model.item.runtime@default:true,org.eclipse.smarthome.model.item@3:true,org.eclipse.smarthome.model.persistence.runtime@default:true,org.eclipse.smarthome.model.persistence@3:true,org.eclipse.smarthome.model.rule.runtime@default:true,org.eclipse.smarthome.model.rule@3:true,org.eclipse.smarthome.model.script.runtime@default:true,org.eclipse.smarthome.model.script@3:true,org.eclipse.smarthome.model.sitemap.runtime@default:true,org.eclipse.smarthome.model.sitemap@3:true,org.eclipse.smarthome.model.thing.runtime@default:true,org.eclipse.smarthome.model.thing@3:true,org.eclipse.smarthome.ui.icon@default:true,org.eclipse.smarthome.ui.webapp@default:true,org.eclipse.smarthome.ui@default:true,org.eclipse.xtend.lib@default:default,org.eclipse.xtext.common.types@default:true,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.slf4j.jul@default:default,org.slf4j.log4j@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@1:default,ch.qos.logback.core@1:default,ch.qos.logback.slf4j@default:false,com.google.gson@default:default,com.google.guava@default:default,com.google.inject@default:default,com.sun.jersey@default:default,javax.activation@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet*3.1.0.v20140303-1611@default:default,javax.transaction@default:false,javax.ws.rs@default:default,javax.xml.bind@default:default,javax.xml.stream@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.exec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:true,org.apache.felix.gogo.runtime@default:true,org.apache.felix.gogo.shell@default:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.codehaus.jackson.core@default:default,org.codehaus.jackson.mapper@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@3:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.2.1.v20140609@default:default,org.eclipse.jetty.io*9.2.1.v20140609@default:default,org.eclipse.jetty.osgi.boot@2:true,org.eclipse.jetty.osgi.httpservice@default:default,org.eclipse.jetty.security*9.2.1.v20140609@default:default,org.eclipse.jetty.server*9.2.1.v20140609@default:default,org.eclipse.jetty.servlet*9.2.1.v20140609@default:default,org.eclipse.jetty.util*9.2.1.v20140609@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.smarthome.binding.yahooweather@default:true,org.eclipse.smarthome.config.core@default:true,org.eclipse.smarthome.config.xml@default:true,org.eclipse.smarthome.core.autoupdate@default:true,org.eclipse.smarthome.core.binding.xml@default:true,org.eclipse.smarthome.core.library@default:true,org.eclipse.smarthome.core.persistence@default:true,org.eclipse.smarthome.core.scheduler@default:true,org.eclipse.smarthome.core.scriptengine@default:true,org.eclipse.smarthome.core.thing.xml@default:true,org.eclipse.smarthome.core.thing@default:true,org.eclipse.smarthome.core.transform@default:true,org.eclipse.smarthome.core@default:true,org.eclipse.smarthome.io.console@default:true,org.eclipse.smarthome.io.monitor@default:true,org.eclipse.smarthome.io.multimedia@default:true,org.eclipse.smarthome.io.net@default:true,org.eclipse.smarthome.io.rest.item@default:default,org.eclipse.smarthome.io.rest.sitemap@default:default,org.eclipse.smarthome.io.rest@default:true,org.eclipse.smarthome.io.servicediscovery@default:true,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.model.core@4:true,org.eclipse.smarthome.model.item.runtime@default:true,org.eclipse.smarthome.model.item@3:true,org.eclipse.smarthome.model.persistence.runtime@default:true,org.eclipse.smarthome.model.persistence@3:true,org.eclipse.smarthome.model.rule.runtime@default:true,org.eclipse.smarthome.model.rule@3:true,org.eclipse.smarthome.model.script.runtime@default:true,org.eclipse.smarthome.model.script@3:true,org.eclipse.smarthome.model.sitemap.runtime@default:true,org.eclipse.smarthome.model.sitemap@3:true,org.eclipse.smarthome.model.thing.runtime@default:true,org.eclipse.smarthome.model.thing@3:true,org.eclipse.smarthome.storage.mapdb@default:true,org.eclipse.smarthome.ui.icon@default:true,org.eclipse.smarthome.ui.webapp@default:true,org.eclipse.smarthome.ui@default:true,org.eclipse.xtend.lib@default:default,org.eclipse.xtext.common.types@default:true,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.slf4j.jul@default:default,org.slf4j.log4j@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="org.openhab.core.compat1x@default:default,org.openhab.core@5:true,org.openhab.io.transport.serial@default:default,org.openhab.library.tel@default:true"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>

targetplatform/openhab-esh.target

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="openHAB 2 + Eclipse SmartHome" sequenceNumber="69">
+<?pde version="3.8"?><target name="openHAB 2 + Eclipse SmartHome" sequenceNumber="70">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xtend.sdk.feature.group" version="2.6.1.v201406120726"/>
 <unit id="org.eclipse.xtext.sdk.feature.group" version="2.6.1.v201406120726"/>
 <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.6.1.v201406110919"/>
 <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.sdk.feature.group" version="2.10.0.v20140519-0339"/>
 <repository location="http://download.eclipse.org/modeling/emf/emf/updates/releases/"/>
 </location>
@@ -105,16 +105,18 @@
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.smarthome.feature.runtime.ui.source.feature.group" version="0.7.0.201407151307"/>
-<unit id="org.eclipse.smarthome.feature.test.source.feature.group" version="0.7.0.201407151307"/>
-<unit id="org.eclipse.smarthome.feature.runtime.rest.feature.group" version="0.7.0.201407151307"/>
-<unit id="org.eclipse.smarthome.feature.runtime.core.feature.group" version="0.7.0.201407151307"/>
-<unit id="org.eclipse.smarthome.feature.runtime.model.feature.group" version="0.7.0.201407151307"/>
-<unit id="org.eclipse.smarthome.feature.test.feature.group" version="0.7.0.201407151307"/>
-<unit id="org.eclipse.smarthome.feature.runtime.ui.feature.group" version="0.7.0.201407151307"/>
-<unit id="org.eclipse.smarthome.feature.runtime.core.source.feature.group" version="0.7.0.201407151307"/>
-<unit id="org.eclipse.smarthome.feature.runtime.model.source.feature.group" version="0.7.0.201407151307"/>
-<unit id="org.eclipse.smarthome.feature.runtime.rest.source.feature.group" version="0.7.0.201407151307"/>
+<unit id="org.eclipse.smarthome.feature.runtime.binding.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.runtime.rest.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.runtime.core.source.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.runtime.core.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.test.source.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.runtime.binding.source.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.runtime.rest.source.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.runtime.model.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.runtime.ui.source.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.runtime.model.source.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.runtime.ui.feature.group" version="0.7.0.201407262207"/>
+<unit id="org.eclipse.smarthome.feature.test.feature.group" version="0.7.0.201407262207"/>
 <repository location="http://download.eclipse.org/smarthome/updates-stable/"/>
 </location>
 </locations>