From fed8c5c5c99e500e5768f91e8fb5fb2ddc459959 Mon Sep 17 00:00:00 2001
From: Kai Kreuzer <kai@openhab.org>
Date: Mon, 16 Feb 2015 08:59:11 +0100
Subject: [PATCH] Updated to JAX-RS connector 4.2.0 Fixes #38

Signed-off-by: Kai Kreuzer <kai@openhab.org> (github: @kaikreuzer)
---
 targetplatform/openHAB_Runtime.launch |  9 ++++-----
 targetplatform/openhab.target         | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/targetplatform/openHAB_Runtime.launch b/targetplatform/openHAB_Runtime.launch
index d58c5c6267ada..1dba3fad1802e 100644
--- a/targetplatform/openHAB_Runtime.launch
+++ b/targetplatform/openHAB_Runtime.launch
@@ -12,20 +12,19 @@
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/openHAB_Runtime"/>
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="default_auto_start" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.openhab.binding.max,org.openhab.binding.max.test,org.openhab.binding.networkhealth,org.openhab.binding.sonos,org.openhab.io.transport.serial"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-org.openhab.runtime.product.product"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Home"/>
+<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.openhab.io.jetty -Dorg.quartz.properties=./runtime/etc/quartz.properties -Dorg.osgi.service.http.port=9080 -Dorg.osgi.service.http.port.secure=9443 -DmdnsName=openhab -Dopenhab.logdir=./userdata/logs -Dsmarthome.servicecfg=./runtime/etc/services.cfg -Dsmarthome.servicepid=org.openhab -Dsmarthome.userdata=userdata -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-ssl.xml,etc/jetty-deployer.xml,etc/jetty-https.xml,etc/jetty-selector.xml"/>
+<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.openhab.io.jetty -Dorg.quartz.properties=./runtime/etc/quartz.properties -Dorg.osgi.service.http.port=8080 -Dorg.osgi.service.http.port.secure=8443 -DmdnsName=openhab -Dopenhab.logdir=./userdata/logs -Dsmarthome.servicecfg=./runtime/etc/services.cfg -Dsmarthome.servicepid=org.openhab -Dsmarthome.userdata=userdata -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-ssl.xml,etc/jetty-deployer.xml,etc/jetty-https.xml,etc/jetty-selector.xml"/>
 <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.eclipsesource.jaxrs.jersey-all@default:true,com.eclipsesource.jaxrs.provider.gson@default:true,com.eclipsesource.jaxrs.publisher@default:true,com.google.gson*2.2.4.v201311231704@default:default,com.google.gson*2.2.4@default:default,com.google.guava@default:default,com.google.inject@default:default,javax.activation@default:default,javax.mail@default:default,javax.servlet*3.1.0.v20140303-1611@default:default,javax.transaction@default:false,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.eclipse.core.jobs@default:default,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.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.monitor@default:true,org.eclipse.smarthome.io.multimedia@default:true,org.eclipse.smarthome.io.net@default:true,org.eclipse.smarthome.io.rest.core@default:true,org.eclipse.smarthome.io.rest.sitemap@default:true,org.eclipse.smarthome.io.rest.sse@default:true,org.eclipse.smarthome.io.rest@default:true,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.io.transport.upnp@default:true,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.classic@default:true,org.eclipse.smarthome.ui.icon@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.init@1:true,org.openhab.core@5:true,org.openhab.io.jetty@default:default,org.openhab.io.rest.docs@default:true,org.openhab.ui.dashboard@default:true"/>
+<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.eclipsesource.jaxrs.jersey-all@default:true,com.eclipsesource.jaxrs.provider.gson@default:true,com.eclipsesource.jaxrs.publisher@default:true,com.google.gson*2.2.4.v201311231704@default:default,com.google.gson*2.2.4@default:default,com.google.guava@default:default,com.google.inject@default:default,javax.activation@default:default,javax.mail@default:default,javax.servlet*3.1.0.v20140303-1611@default:default,javax.transaction@default:false,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.eclipse.core.jobs@default:default,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.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@default:true,org.eclipse.smarthome.io.rest.sitemap@default:true,org.eclipse.smarthome.io.rest.sse@default:true,org.eclipse.smarthome.io.rest@default:true,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.io.transport.upnp@default:true,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.classic@default:true,org.eclipse.smarthome.ui.icon@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.binding.max@default:true,org.openhab.binding.networkhealth@default:true,org.openhab.binding.sonos@default:true,org.openhab.core.compat1x@default:true,org.openhab.core.init@1:true,org.openhab.core@5:true,org.openhab.io.jetty@default:default,org.openhab.io.rest.docs@default:true,org.openhab.io.transport.serial@default:default,org.openhab.ui.dashboard@default:true"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/targetplatform/openhab.target b/targetplatform/openhab.target
index 51507f48119d6..2d0e6eaa62398 100644
--- 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="123">
+<?pde version="3.8"?><target name="openHAB 2" sequenceNumber="124">
 <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"/>
@@ -99,17 +99,17 @@
 <repository location="http://www.openhab.org/jupnp/update-site/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.eclipsesource.jaxrs.provider.security.feature.source.feature.group" version="2.0.0.201407131319"/>
-<unit id="com.eclipsesource.jaxrs.provider.gson.feature.feature.group" version="2.0.0.201407131319"/>
-<unit id="com.eclipsesource.jaxrs.connector.feature.feature.group" version="4.1.1.201407131319"/>
-<unit id="com.eclipsesource.jaxrs.connector.feature.source.feature.group" version="4.1.1.201407131319"/>
-<unit id="com.eclipsesource.jaxrs.provider.gson.feature.source.feature.group" version="2.0.0.201407131319"/>
-<unit id="com.eclipsesource.jaxrs.provider.security.feature.feature.group" version="2.0.0.201407131319"/>
-<unit id="com.eclipsesource.jaxrs.jersey.runtime.feature.source.feature.group" version="2.0.0.201407131319"/>
-<unit id="com.eclipsesource.jaxrs.provider.sse.feature.source.feature.group" version="2.0.0.201407131319"/>
-<unit id="com.eclipsesource.jaxrs.jersey.runtime.feature.feature.group" version="2.0.0.201407131319"/>
-<unit id="com.eclipsesource.jaxrs.provider.sse.feature.feature.group" version="2.0.0.201407131319"/>
-<repository location="http://hstaudacher.github.io/osgi-jax-rs-connector/4.1.1"/>
+<unit id="com.eclipsesource.jaxrs.provider.security.feature.source.feature.group" version="0.0.0"/>
+<unit id="com.eclipsesource.jaxrs.provider.gson.feature.feature.group" version="0.0.0"/>
+<unit id="com.eclipsesource.jaxrs.connector.feature.feature.group" version="0.0.0"/>
+<unit id="com.eclipsesource.jaxrs.connector.feature.source.feature.group" version="0.0.0"/>
+<unit id="com.eclipsesource.jaxrs.provider.gson.feature.source.feature.group" version="0.0.0"/>
+<unit id="com.eclipsesource.jaxrs.provider.security.feature.feature.group" version="0.0.0"/>
+<unit id="com.eclipsesource.jaxrs.jersey.runtime.feature.source.feature.group" version="0.0.0"/>
+<unit id="com.eclipsesource.jaxrs.provider.sse.feature.source.feature.group" version="0.0.0"/>
+<unit id="com.eclipsesource.jaxrs.jersey.runtime.feature.feature.group" version="0.0.0"/>
+<unit id="com.eclipsesource.jaxrs.provider.sse.feature.feature.group" version="0.0.0"/>
+<repository location="http://hstaudacher.github.io/osgi-jax-rs-connector/4.2.0"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.smarthome.feature.runtime.core.feature.group" version="0.0.0"/>