updated to latest ESH version

Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer)
fuetti · Oct 14, 2014 · a1b1ec5 · a1b1ec5
1 parent 4b6dd9a
commit a1b1ec5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,10 @@ bundles/io/org.openhab.io.multimedia.tts.marytts/lib/
 distribution/openhabhome/logs/*.log
 distribution/openhabhome/*.zip
 distribution/openhabhome/etc/rrd4j/*.rrd
+distribution/openhabhome/userdata/id/uuid
+distribution/openhabhome/userdata/id/version
+distribution/openhabhome/userdata/logs/events.log
+distribution/openhabhome/userdata/logs/openhab.log
+distribution/openhabhome/userdata/mapdb/storage.mapdb
+distribution/openhabhome/userdata/mapdb/storage.mapdb.p
+distribution/openhabhome/userdata/mapdb/storage.mapdb.t
diff --git a/features/org.openhab.runtime.feature/feature.xml b/features/org.openhab.runtime.feature/feature.xml
@@ -391,13 +391,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.smarthome.io.rest.item"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.smarthome.io.rest.sitemap"
          download-size="0"
@@ -734,4 +727,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.smarthome.config.dispatch"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.smarthome.io.rest.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/targetplatform/openHAB_Runtime.launch b/targetplatform/openHAB_Runtime.launch
@@ -22,7 +22,7 @@
 <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.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:true,org.eclipse.jetty.io*9.2.1.v20140609@default:default,org.eclipse.jetty.osgi.boot@2:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.rewrite@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.hue@default:true,org.eclipse.smarthome.binding.yahooweather@default:true,org.eclipse.smarthome.config.core@default:true,org.eclipse.smarthome.config.discovery@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@2: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.mdns@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@2:true,org.eclipse.smarthome.io.rest.sitemap@2:true,org.eclipse.smarthome.io.rest@default:true,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.model.core@5:true,org.eclipse.smarthome.model.item.runtime@3:true,org.eclipse.smarthome.model.item@3:true,org.eclipse.smarthome.model.persistence.runtime@3:true,org.eclipse.smarthome.model.persistence@3:true,org.eclipse.smarthome.model.rule.runtime@3:true,org.eclipse.smarthome.model.rule@3:true,org.eclipse.smarthome.model.script.runtime@3:true,org.eclipse.smarthome.model.script@3:true,org.eclipse.smarthome.model.sitemap.runtime@3:true,org.eclipse.smarthome.model.sitemap@3:true,org.eclipse.smarthome.model.thing.runtime@3: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.jupnp@default:true,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:true,org.eclipse.jetty.io*9.2.1.v20140609@default:default,org.eclipse.jetty.osgi.boot@2:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.rewrite@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.hue@default:true,org.eclipse.smarthome.binding.yahooweather@default:true,org.eclipse.smarthome.config.core@default:true,org.eclipse.smarthome.config.discovery@default:true,org.eclipse.smarthome.config.dispatch@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@2: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.mdns@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.core@2:true,org.eclipse.smarthome.io.rest.sitemap@2:true,org.eclipse.smarthome.io.rest@6:true,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.model.core@5:true,org.eclipse.smarthome.model.item.runtime@3:true,org.eclipse.smarthome.model.item@3:true,org.eclipse.smarthome.model.persistence.runtime@3:true,org.eclipse.smarthome.model.persistence@3:true,org.eclipse.smarthome.model.rule.runtime@3:true,org.eclipse.smarthome.model.rule@3:true,org.eclipse.smarthome.model.script.runtime@3:true,org.eclipse.smarthome.model.script@3:true,org.eclipse.smarthome.model.sitemap.runtime@3:true,org.eclipse.smarthome.model.sitemap@3:true,org.eclipse.smarthome.model.thing.runtime@3: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.jupnp@default:true,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:true,org.openhab.core@5:true,org.openhab.io.jetty@default:default,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"/>

diff --git a/targetplatform/openhab.target b/targetplatform/openhab.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="openHAB 2" sequenceNumber="108">
+<?pde version="3.8"?><target name="openHAB 2" sequenceNumber="111">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xtend.sdk.feature.group" version="2.6.2.v201407030533"/>
@@ -54,8 +54,8 @@
 <unit id="org.apache.commons.collections" version="3.2.0.v2013030210310"/>
 <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
 <unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
-<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
-<unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
+<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
 <unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
 <unit id="org.apache.commons.net.source" version="3.2.0.v201305141515"/>
 <unit id="org.apache.commons.lang.source" version="2.6.0.v201404270220"/>
@@ -102,21 +102,21 @@
 <repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.smarthome.feature.runtime.ui.feature.group" version="0.8.0.201410091157"/>
-<unit id="org.eclipse.smarthome.feature.runtime.binding.feature.group" version="0.8.0.201410091157"/>
-<unit id="org.eclipse.smarthome.feature.runtime.core.source.feature.group" version="0.8.0.201410091157"/>
-<unit id="org.eclipse.smarthome.feature.runtime.core.feature.group" version="0.8.0.201410091157"/>
-<unit id="org.eclipse.smarthome.feature.runtime.model.source.feature.group" version="0.8.0.201410091157"/>
-<unit id="org.eclipse.smarthome.feature.runtime.model.feature.group" version="0.8.0.201410091157"/>
-<unit id="org.eclipse.smarthome.feature.runtime.rest.source.feature.group" version="0.8.0.201410091157"/>
-<unit id="org.eclipse.smarthome.feature.runtime.rest.feature.group" version="0.8.0.201410091157"/>
-<unit id="org.eclipse.smarthome.feature.runtime.ui.source.feature.group" version="0.8.0.201410091157"/>
-<unit id="org.eclipse.smarthome.feature.runtime.binding.source.feature.group" version="0.8.0.201410091157"/>
-<repository location="http://download.eclipse.org/smarthome/updates-stable/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.jupnp.feature.feature.group" version="2.0.0.201410140825"/>
 <repository location="http://www.openhab.org/jupnp/update-site/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.smarthome.feature.runtime.core.feature.group" version="0.8.0.201410141707"/>
+<unit id="org.eclipse.smarthome.feature.runtime.ui.source.feature.group" version="0.8.0.201410141707"/>
+<unit id="org.eclipse.smarthome.feature.runtime.core.source.feature.group" version="0.8.0.201410141707"/>
+<unit id="org.eclipse.smarthome.feature.runtime.model.source.feature.group" version="0.8.0.201410141707"/>
+<unit id="org.eclipse.smarthome.feature.runtime.binding.feature.group" version="0.8.0.201410141707"/>
+<unit id="org.eclipse.smarthome.feature.runtime.rest.feature.group" version="0.8.0.201410141707"/>
+<unit id="org.eclipse.smarthome.feature.runtime.binding.source.feature.group" version="0.8.0.201410141707"/>
+<unit id="org.eclipse.smarthome.feature.runtime.rest.source.feature.group" version="0.8.0.201410141707"/>
+<unit id="org.eclipse.smarthome.feature.runtime.ui.feature.group" version="0.8.0.201410141707"/>
+<unit id="org.eclipse.smarthome.feature.runtime.model.feature.group" version="0.8.0.201410141707"/>
+<repository location="http://download.eclipse.org/smarthome/updates-stable/"/>
+</location>
 </locations>
 </target>