From f84b1b2c507f2b01a9c2c8d28bee6fa1a686fa44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Eichst=C3=A4dt-Engelen?= <thomas@openhab.org>
Date: Fri, 13 Feb 2015 17:18:25 +0100
Subject: [PATCH] Fixes #84 - Let openhab2 take SystemProperties into Account
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Eichstädt-Engelen <thomas@openhab.org>
---
 .../jettyhome/etc/jetty-https.xml                  |  8 ++++----
 .../jettyhome/etc/jetty-selector.xml               |  4 ++--
 .../jettyhome/etc/jetty-ssl.xml                    | 14 +++++++-------
 targetplatform/openHAB_Runtime.launch              |  9 +++++----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-https.xml b/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-https.xml
index caa0c962d42dd..5a723699920f2 100644
--- a/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-https.xml
+++ b/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-https.xml
@@ -38,10 +38,10 @@
               </Item>
             </Array>
           </Arg>
-          <Set name="host"><Property name="jetty.host" /></Set>
-          <Set name="port"><Property name="org.osgi.service.http.port.secure" default="8443" /></Set>
-          <Set name="idleTimeout"><Property name="https.timeout" default="30000"/></Set>
-          <Set name="soLingerTime"><Property name="https.soLingerTime" default="-1"/></Set>
+          <Set name="host"><SystemProperty name="jetty.host" /></Set>
+          <Set name="port"><SystemProperty name="org.osgi.service.http.port.secure" default="8443" /></Set>
+          <Set name="idleTimeout"><SystemProperty name="https.timeout" default="30000"/></Set>
+          <Set name="soLingerTime"><SystemProperty name="https.soLingerTime" default="-1"/></Set>
         </New>
     </Arg>
   </Call>
diff --git a/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-selector.xml b/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-selector.xml
index eaf1808d76502..2cbd9fe14d74a 100644
--- a/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-selector.xml
+++ b/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-selector.xml
@@ -21,8 +21,8 @@
                 </Item>
               </Array>
              </Arg>
-            <Set name="host"><Property name="jetty.host" /></Set>
-            <Set name="port"><Property name="org.osgi.service.http.port" default="8080"/></Set>
+            <Set name="host"><SystemProperty name="jetty.host" /></Set>
+            <Set name="port"><SystemProperty name="org.osgi.service.http.port" default="8080" /></Set>
             <Set name="idleTimeout">300000</Set>
           </New>
       </Arg>
diff --git a/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-ssl.xml b/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-ssl.xml
index 0ffde304179f4..b0dfd0ad379c4 100644
--- a/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-ssl.xml
+++ b/bundles/io/org.openhab.io.jetty/jettyhome/etc/jetty-ssl.xml
@@ -7,14 +7,14 @@
 <!-- and either jetty-https.xml or jetty-spdy.xml (but not both)   -->
 <!-- ============================================================= -->
 <Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-  <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.keystore" default="runtime/etc/keystore"/></Set>
-  <Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
-  <Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set>
-  <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.truststore" default="runtime/etc/keystore"/></Set>
-  <Set name="TrustStorePassword"><Property name="jetty.truststore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
+  <Set name="KeyStorePath"><SystemProperty name="jetty.base" default="." />/<SystemProperty name="jetty.keystore" default="runtime/etc/keystore"/></Set>
+  <Set name="KeyStorePassword"><SystemProperty name="jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
+  <Set name="KeyManagerPassword"><SystemProperty name="jetty.keymanager.password" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set>
+  <Set name="TrustStorePath"><SystemProperty name="jetty.base" default="." />/<SystemProperty name="jetty.truststore" default="runtime/etc/keystore"/></Set>
+  <Set name="TrustStorePassword"><SystemProperty name="jetty.truststore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
   <Set name="EndpointIdentificationAlgorithm"></Set>
-  <Set name="NeedClientAuth"><Property name="jetty.ssl.needClientAuth" default="false"/></Set>
-  <Set name="WantClientAuth"><Property name="jetty.ssl.wantClientAuth" default="false"/></Set>
+  <Set name="NeedClientAuth"><SystemProperty name="jetty.ssl.needClientAuth" default="false"/></Set>
+  <Set name="WantClientAuth"><SystemProperty name="jetty.ssl.wantClientAuth" default="false"/></Set>
   <Set name="ExcludeCipherSuites">
     <Array type="String">
       <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
diff --git a/targetplatform/openHAB_Runtime.launch b/targetplatform/openHAB_Runtime.launch
index 1dba3fad1802e..d58c5c6267ada 100644
--- a/targetplatform/openHAB_Runtime.launch
+++ b/targetplatform/openHAB_Runtime.launch
@@ -12,19 +12,20 @@
 <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/JavaSE-1.7"/>
+<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.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=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.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.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.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"/>
+<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"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>