Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit 5a5911a Author: Tobias Bräutigam <[email protected]> Date: Fri Mar 20 14:52:44 2015 +0100 removed properties field Signed-off-by: Tobias Bräutigam <[email protected]> commit 549886a Author: Tobias Bräutigam <[email protected]> Date: Fri Mar 20 14:15:14 2015 +0100 code formatting Signed-off-by: Tobias Bräutigam <[email protected]> commit 489be9e Author: Tobias Bräutigam <[email protected]> Date: Fri Mar 20 13:44:02 2015 +0100 marrytts bundle removed Signed-off-by: Tobias Bräutigam <[email protected]> commit a099699 Author: Kai Kreuzer <[email protected]> Date: Tue Mar 3 15:49:33 2015 +0100 upgraded Jetty to 9.2.9 and JAX-RS connector to 4.2.2 Fixes openhab#38 Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit a59e819 Author: Tobias Bräutigam <[email protected]> Date: Fri Mar 20 13:35:25 2015 +0100 removed marrytts bundle from launch Signed-off-by: Tobias Bräutigam <[email protected]> commit b0cee0b Merge: 06e8bd2 2816811 Author: Tobias Bräutigam <[email protected]> Date: Fri Mar 20 13:31:52 2015 +0100 Merge branch 'master' into marytts-bundle Conflicts: bundles/core/org.openhab.core.compat1x/build.properties commit 06e8bd2 Author: Tobias Bräutigam <[email protected]> Date: Fri Mar 20 12:47:03 2015 +0100 fixed method name Signed-off-by: Tobias Bräutigam <[email protected]> commit 2816811 Merge: deffae8 8fce0f9 Author: Tobias Bräutigam <[email protected]> Date: Thu Mar 19 18:54:41 2015 +0100 Merge pull request #3 from openhab/master Merge with master commit 8fce0f9 Author: Kai Kreuzer <[email protected]> Date: Thu Mar 19 17:38:55 2015 +0100 Adapted code to latest stable ESH release Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit b3463ea Author: Kai Kreuzer <[email protected]> Date: Thu Mar 19 17:38:19 2015 +0100 Improved default sitemap provider and demo files to make the Classic UI behave nice again. Also adapted AutoApproveService and removed ThingItemProvider as it was superceded by the ThingSetupManager of ESH. Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit fcd7715 Author: Tobias Bräutigam <[email protected]> Date: Thu Mar 19 09:29:48 2015 +0100 break added Signed-off-by: Tobias Bräutigam <[email protected]> commit 43cba52 Author: Tobias Bräutigam <[email protected]> Date: Thu Mar 19 09:27:51 2015 +0100 removed marytts bundle from build path Signed-off-by: Tobias Bräutigam <[email protected]> commit 8c77b5b Author: Tobias Bräutigam <[email protected]> Date: Thu Mar 19 09:24:49 2015 +0100 augmented the compbalility layer to support the TTSService interface (needed for all text-to-speech engines) Signed-off-by: Tobias Bräutigam <[email protected]> commit ff2e51c Author: Kai Kreuzer <[email protected]> Date: Sun Mar 15 09:44:16 2015 -0700 added info about Milight and Energenie commit 67af79a Author: Kai Kreuzer <[email protected]> Date: Sat Mar 14 15:15:45 2015 -0700 updated information about rrd4j commit 60c3b88 Author: Kai Kreuzer <[email protected]> Date: Sat Mar 14 15:16:36 2015 -0700 Implemented ItemRegistry, ItemUIRegistry and ChartProvider support for the compatibility layer. This fixes openhab#146. Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 791e777 Author: Kai Kreuzer <[email protected]> Date: Thu Mar 12 07:36:56 2015 -0700 Added InsteonPLM 1.7 binding commit cb3fa7d Merge: cc7fa1d d0798b5 Author: Kai Kreuzer <[email protected]> Date: Thu Mar 12 06:50:40 2015 -0700 Merge pull request openhab#160 from sja/format-start-scripts Format start scripts and add check for not found equinox launcher commit d0798b5 Author: Sebastian Janzen <[email protected]> Date: Tue Mar 10 13:45:45 2015 +0100 Format start scripts and add check for not found equinox launcher If the equinox launcher jar is not present, there was no error message. Signed-off-by: Sebastian Janzen <[email protected]> commit cc7fa1d Merge: 743bc6c fcfdefe Author: Kai Kreuzer <[email protected]> Date: Tue Mar 10 23:37:39 2015 +0100 Merge pull request openhab#157 from maggu2810/fix-resource-leak Resource leak: 'socket' never closed commit fcfdefe Author: Markus Rathgeb <[email protected]> Date: Mon Mar 9 09:15:07 2015 +0100 Resource leak: 'socket' never closed Signed-off-by: Markus Rathgeb <[email protected]> commit 743bc6c Merge: 07ada5e fec6647 Author: Kai Kreuzer <[email protected]> Date: Mon Mar 9 23:22:24 2015 +0100 Merge pull request openhab#158 from kgoderis/sonos Fix a bug in the implementation of DiscoveryListener of the ZonePlayerHa... commit fec6647 Author: Karel Goderis <[email protected]> Date: Mon Mar 9 19:56:26 2015 +0100 Fix a bug in the implementation of DiscoveryListener of the ZonePlayerHandler Note for other binding developers: DiscoveryListeners get called on the discovery of any Thing, e.g. there is no selectivity, and it is up to the DiscoveryListener implementor to check if the ThingUID is valid or not Signed-off-by: Karel Goderis <[email protected]> commit 07ada5e Merge: 1780131 906b836 Author: Kai Kreuzer <[email protected]> Date: Mon Mar 9 18:03:08 2015 +0100 Merge pull request openhab#156 from maggu2810/fix-classpath-vs-exec-env classpath's JRE container and execution enviroment's one does not fit commit 906b836 Author: Markus Rathgeb <[email protected]> Date: Mon Mar 9 09:05:32 2015 +0100 classpath's JRE container and execution enviroment's one does not fit Fix "The JRE container on the classpath is not a perfect match to the 'J2SE-1.5' execution environment" for org.openhab.io.transport.serial. Fix "The JRE container on the classpath is not a perfect match to the 'JavaSE-1.7' execution environment" for org.openhab.core.init and org.openhab.core. Signed-off-by: Markus Rathgeb <[email protected]> commit 1780131 Merge: 8a6f1a8 86a8ed1 Author: Kai Kreuzer <[email protected]> Date: Wed Mar 4 18:37:49 2015 +0100 Merge pull request openhab#154 from maggu2810/launch-cfg-stop-auto-add stop add workspace plugins automatically to launch config commit 86a8ed1 Author: Markus Rathgeb <[email protected]> Date: Wed Mar 4 17:37:00 2015 +0100 stop add workspace plugins automatically to launch config It is very annoying if every bundle I added to my workspace is also added to the launch configuration and must be deactivated manually. A launch configuration should represent a configuration that is changed manually if additional bundles should be added. If the automatically addition of plugins is deactivated, we could stop adding plugins to deselected_workspace_plugins. Signed-off-by: Markus Rathgeb <[email protected]> commit 8a6f1a8 Author: Kai Kreuzer <[email protected]> Date: Tue Mar 3 23:00:32 2015 +0100 updated launch config for new target platform Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 42ad9c1 Author: Kai Kreuzer <[email protected]> Date: Tue Mar 3 15:49:33 2015 +0100 upgraded Jetty to 9.2.9 and JAX-RS connector to 4.2.2 Fixes openhab#38 Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit d34492b Merge: 18e7ae4 a292008 Author: Kai Kreuzer <[email protected]> Date: Mon Feb 23 22:34:27 2015 +0100 Merge pull request openhab#145 from cdjackson/dev Update compatability commit a292008 Merge: 8c5f668 18e7ae4 Author: Chris Jackson <[email protected]> Date: Mon Feb 23 21:24:54 2015 +0000 Merge branch 'master' of https://github.com/openhab/openhab2 into dev Conflicts: docs/sources/installation/compatibility.md commit 18e7ae4 Author: Kai Kreuzer <[email protected]> Date: Mon Feb 23 22:17:42 2015 +0100 removed 2.0 alpha compat info commit 8c5f668 Author: Chris Jackson <[email protected]> Date: Mon Feb 23 21:16:00 2015 +0000 Update compatability Add OW-Server, MySQL, Heatmiser, SNMP Signed-off-by: Chris Jackson <[email protected]> (github: cdjackson) commit c1fc6df Merge: df79093 8892836 Author: Kai Kreuzer <[email protected]> Date: Mon Feb 23 22:07:23 2015 +0100 Merge pull request openhab#144 from isigmund/master changed compatibility.md commit 8892836 Author: Ingo Sigmund <[email protected]> Date: Mon Feb 23 21:44:17 2015 +0100 changed comaptibility.md to reflect sucessful testing of openhab 1.6.0 bindings Fs20 and CUL on openhab2 snapshot commit df79093 Merge: 232b275 491f7f2 Author: Kai Kreuzer <[email protected]> Date: Sat Feb 21 11:33:25 2015 +0100 Merge pull request openhab#141 from kgoderis/sonos Sonos : implementation of new commands commit 491f7f2 Author: Karel Goderis <[email protected]> Date: Fri Feb 20 23:40:35 2015 +0100 Implementation of the playTrack functionality Signed-off-by: Karel Goderis <[email protected]> commit 195f846 Author: Karel Goderis <[email protected]> Date: Fri Feb 20 23:03:56 2015 +0100 Implement playQueue functionality Signed-off-by: Karel Goderis <[email protected]> commit 232b275 Merge: ddaf474 e5fc3eb Author: Kai Kreuzer <[email protected]> Date: Fri Feb 20 20:42:32 2015 +0100 Merge pull request openhab#140 from kgoderis/sonos Further improvement of Metadata methods commit e5fc3eb Author: Karel Goderis <[email protected]> Date: Fri Feb 20 20:37:30 2015 +0100 Further improvement of Metadata methods Signed-off-by: Karel Goderis <[email protected]> commit ddaf474 Author: Kai Kreuzer <[email protected]> Date: Wed Feb 18 21:02:58 2015 +0100 Update compatibility.md commit cd465fb Merge: d618223 65a5094 Author: Kai Kreuzer <[email protected]> Date: Wed Feb 18 21:01:59 2015 +0100 Merge pull request openhab#136 from mdbergmann/patch-1 Update compatibility.md commit d618223 Merge: 7e2bb61 dd7c484 Author: Kai Kreuzer <[email protected]> Date: Wed Feb 18 20:51:36 2015 +0100 Merge pull request openhab#138 from maggu2810/remove-missing-deactivate-call ThingItemProvider: prevent call of missing deactive function commit 7e2bb61 Merge: 25cc1b3 ab114f7 Author: Kai Kreuzer <[email protected]> Date: Wed Feb 18 20:48:43 2015 +0100 Merge pull request openhab#137 from maggu2810/compat1x-fix-import add missing import for javax.sound.sampled commit dd7c484 Author: Markus Rathgeb <[email protected]> Date: Wed Feb 18 18:34:50 2015 +0100 ThingItemProvider: prevent call of missing deactive function Signed-off-by: Markus Rathgeb <[email protected]> commit ab114f7 Author: Markus Rathgeb <[email protected]> Date: Wed Feb 18 17:31:19 2015 +0100 add missing import for javax.sound.sampled Signed-off-by: Markus Rathgeb <[email protected]> commit 65a5094 Author: mdbergmann <[email protected]> Date: Wed Feb 18 13:27:10 2015 +0100 Update compatibility.md commit 25cc1b3 Merge: 54b135c ad957f8 Author: Kai Kreuzer <[email protected]> Date: Mon Feb 16 17:26:28 2015 +0100 Merge pull request openhab#134 from kgoderis/sonos Fix small bugs in updateCurrentURIFormatted and updateTrackMetaData commit ad957f8 Author: Karel Goderis <[email protected]> Date: Mon Feb 16 17:11:19 2015 +0100 Fix small bugs in updateCurrentURIFormatted and updateTrackMetaData Signed-off-by: Karel Goderis <[email protected]> commit 54b135c Merge: fed8c5c 9f107a3 Author: Kai Kreuzer <[email protected]> Date: Mon Feb 16 13:30:52 2015 +0100 Merge pull request openhab#131 from kgoderis/sonos Improve track meta data handling commit 9f107a3 Author: Karel Goderis <[email protected]> Date: Mon Feb 16 13:09:45 2015 +0100 Improve track meta data handling Signed-off-by: Karel Goderis <[email protected]> commit fed8c5c Author: Kai Kreuzer <[email protected]> Date: Mon Feb 16 08:59:11 2015 +0100 Updated to JAX-RS connector 4.2.0 Fixes openhab#38 Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 8f97322 Author: Kai Kreuzer <[email protected]> Date: Sat Feb 14 00:37:23 2015 +0100 Updated AUTHORS Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit f84b1b2 Author: Thomas Eichstädt-Engelen <[email protected]> Date: Fri Feb 13 17:18:25 2015 +0100 Fixes openhab#84 - Let openhab2 take SystemProperties into Account Signed-off-by: Thomas Eichstädt-Engelen <[email protected]> commit 5e55ac0 Merge: 3a024bb 6bc91d6 Author: Kai Kreuzer <[email protected]> Date: Wed Feb 11 16:22:18 2015 +0100 Merge branch 'maxcube-test' of https://github.com/marcelrv/openhab2 into marcelrv-maxcube-test Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 3a024bb Author: Kai Kreuzer <[email protected]> Date: Wed Feb 11 14:13:13 2015 +0100 updated dependency to renamed mdns bundle fixes openhab#128 Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 91b9294 Author: Kai Kreuzer <[email protected]> Date: Mon Feb 9 20:21:07 2015 +0100 Update compatibility.md commit 09f159d Merge: 3a00a6d e3bda3d Author: Kai Kreuzer <[email protected]> Date: Mon Feb 9 20:19:58 2015 +0100 Merge pull request openhab#126 from kgoderis/patch-2 Update compatibility.md commit e3bda3d Author: kgoderis <[email protected]> Date: Mon Feb 9 20:06:13 2015 +0100 Update compatibility.md commit 3a00a6d Merge: 0795c8d a866116 Author: Kai Kreuzer <[email protected]> Date: Sun Feb 8 20:44:13 2015 +0100 Merge pull request openhab#125 from kgoderis/sonos Fix bug in updateCurrentURIFormatted() commit a866116 Author: Karel Goderis <[email protected]> Date: Sat Feb 7 16:44:52 2015 +0100 Fix bug in updateCurrentURIFormatted() Signed-off-by: Karel Goderis <[email protected]> commit 0795c8d Merge: 21c6ea6 b490af2 Author: Kai Kreuzer <[email protected]> Date: Sat Feb 7 12:28:25 2015 +0100 Merge pull request openhab#123 from kgoderis/sonos Fix bugs in playLineIn() commit b490af2 Author: Karel Goderis <[email protected]> Date: Sat Feb 7 11:33:23 2015 +0100 Improve error handling in playLineIn() Signed-off-by: Karel Goderis <[email protected]> commit 69a755e Author: Karel Goderis <[email protected]> Date: Sat Feb 7 11:32:06 2015 +0100 Fix bug in playLineIn() Signed-off-by: Karel Goderis <[email protected]> commit 21c6ea6 Author: Kai Kreuzer <[email protected]> Date: Fri Feb 6 17:04:49 2015 +0100 fixed rrd4j compat info Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 883f718 Author: Kai Kreuzer <[email protected]> Date: Thu Feb 5 23:02:22 2015 +0100 added info about screencast Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 5cf303b Author: Kai Kreuzer <[email protected]> Date: Thu Feb 5 23:02:01 2015 +0100 updated copyright Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit ef60ae0 Author: Kai Kreuzer <[email protected]> Date: Thu Feb 5 22:48:38 2015 +0100 added headers Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 24f624a Author: Kai Kreuzer <[email protected]> Date: Thu Feb 5 22:46:31 2015 +0100 added info about Paper UI and a screencast for binding skeleton creation Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 527b51f Author: Kai Kreuzer <[email protected]> Date: Thu Feb 5 21:52:34 2015 +0100 set auto-start to true - this will avoid many problems where people forget to do this manually Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 24950b1 Author: Kai Kreuzer <[email protected]> Date: Thu Feb 5 21:47:03 2015 +0100 adding new workspace bundles automatically to the launch config Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 780b229 Merge: 9c5c046 3180c83 Author: Kai Kreuzer <[email protected]> Date: Wed Feb 4 23:09:58 2015 +0100 Merge pull request openhab#122 from kgoderis/sonos Fix bug in saveState() and restoreState() + improve error handling commit 3180c83 Author: Karel Goderis <[email protected]> Date: Wed Feb 4 19:18:30 2015 +0100 Fix bug in saveState() and restoreState() + improve error handling Signed-off-by: Karel Goderis <[email protected]> commit 9c5c046 Merge: 58ec087 1194776 Author: Kai Kreuzer <[email protected]> Date: Tue Feb 3 10:52:19 2015 +0100 Merge pull request openhab#121 from kgoderis/master Fix FileInputStream path in org.openhab.io.multimedia.actions.audio commit 1194776 Author: Karel Goderis <[email protected]> Date: Tue Feb 3 09:32:04 2015 +0100 Fix FileInputStream path in org.openhab.io.multimedia.actions.audio Signed-off-by: Karel Goderis <[email protected]> commit 58ec087 Author: Kai Kreuzer <[email protected]> Date: Sun Feb 1 14:56:32 2015 +0100 added sources of jUPnP to target platform - see jupnp/jupnp#16 Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit ca25009 Author: Kai Kreuzer <[email protected]> Date: Fri Jan 30 17:05:44 2015 +0100 updated archetype version Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 1def393 Merge: aba7037 bb8a1c7 Author: Kai Kreuzer <[email protected]> Date: Thu Jan 29 10:28:58 2015 +0100 Merge pull request openhab#120 from maggu2810/sonos-fix-imports sonos: fix missing import-package commit bb8a1c7 Author: Markus Rathgeb <[email protected]> Date: Thu Jan 29 10:18:33 2015 +0100 fix missing import-package The file SonosXMLParser.java is using the following imports: - org.xml.sax.Attributes; - org.xml.sax.InputSource; - org.xml.sax.SAXException; - org.xml.sax.XMLReader; - org.xml.sax.helpers.DefaultHandler; - org.xml.sax.helpers.XMLReaderFactory; The OSGi specification mandates that a bundle declare all package depenencies using either Import-Package or Require-Bundle. The one exception to this rule is the java.* packages which is always delegated to the boot classpath. All other packages dependencies must be declared in the bundle's manifest file. Signed-off-by: Markus Rathgeb <[email protected]> commit 6bc91d6 Author: Marcel Verpaalen <[email protected]> Date: Wed Jan 28 18:25:13 2015 +0100 Updated with cleaned target Signed-off-by: Marcel Verpaalen <[email protected]> commit aba7037 Merge: 4048ac9 0a6aab5 Author: Kai Kreuzer <[email protected]> Date: Wed Jan 28 18:18:16 2015 +0100 Merge pull request openhab#119 from kgoderis/patch-1 Update logback_debug.xml commit 0a6aab5 Author: kgoderis <[email protected]> Date: Wed Jan 28 18:12:48 2015 +0100 Update logback_debug.xml Fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=458180 Signed-off-by: Karel Goderis <[email protected]> commit 4048ac9 Merge: a60baaa f41b4ea Author: Kai Kreuzer <[email protected]> Date: Wed Jan 28 13:22:57 2015 +0100 Merge pull request openhab#118 from maggu2810/ui-dashboard-fix-imports fix version requirements of service.component import commit f41b4ea Author: Markus Rathgeb <[email protected]> Date: Wed Jan 28 13:10:19 2015 +0100 fix version requirements of service.component import The version of the service component package for OSGi Release 4 is using the version 1.2. The JavaDoc API states, that consumer of the API should use version="[1.2,2.0)" for the version of the import. I cannot find an implementation of the fixed version 1.2.2, perhaps this is only supported by equinox. Source: http://www.osgi.org/javadoc/r4v43/residential/org/osgi/service/component/package-summary.html Signed-off-by: Markus Rathgeb <[email protected]> commit a60baaa Author: Kai Kreuzer <[email protected]> Date: Tue Jan 27 12:21:38 2015 +0100 fixes openhab#117 Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit a7284cc Author: Kai Kreuzer <[email protected]> Date: Mon Jan 26 18:36:16 2015 +0100 reverted accidential commit commit 19dee90 Author: Kai Kreuzer <[email protected]> Date: Mon Jan 26 18:34:47 2015 +0100 added DSC alarm info commit f678dfc Author: Kai Kreuzer <[email protected]> Date: Mon Jan 26 18:33:44 2015 +0100 added Z-Wave info commit efb303c Author: Marcel Verpaalen <[email protected]> Date: Fri Jan 23 01:47:28 2015 +0100 Initial contribution MAX! Binding Tests Signed-off-by: Marcel Verpaalen <[email protected]> commit c4c9962 Author: Kai Kreuzer <[email protected]> Date: Thu Jan 22 19:02:18 2015 +0100 Added new url for Classic UI with sitemap commit 7cacee6 Author: Kai Kreuzer <[email protected]> Date: Mon Jan 19 20:00:51 2015 +0100 changed http port definitions to OSGi params Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 5173ecd Author: Kai Kreuzer <[email protected]> Date: Mon Jan 19 19:47:35 2015 +0100 updated thing item provider and default sitemap provider to work with home-groups Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit f1345f0 Author: Kai Kreuzer <[email protected]> Date: Mon Jan 19 18:30:46 2015 +0100 worked around current bugs in configuration handling Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer) commit 1ec7579 Author: Kai Kreuzer <[email protected]> Date: Mon Jan 19 18:30:04 2015 +0100 adding advanced property to most channels Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer)
- Loading branch information
