Граф коммитов

123 Коммитов

Автор SHA1 Сообщение Дата
Kai Kreuzer db2de6742c added export for core.binding package
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-24 09:49:50 +02:00
Dennis Nobel b2a3e5aac5 Initial contribution of thing concept.
Also-by: Oliver Libutzki o.libutzki@external.telekom.de
Also-by: Kai Kreuzer k.kreuzer@telekom.de
Also-by: Michael Grammling m.grammling@external.telekom.de
Signed-off-by: Dennis Nobel d.nobel@external.telekom.de
2014-06-23 18:59:33 +02:00
Oliver Libutzki 1eb79d0075 Merge branch 'master' of https://github.com/eclipse/smarthome into Bug436537
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>

Conflicts:
	targetplatform/SmartHome Runtime.launch
2014-06-20 11:47:12 +02:00
Oliver Libutzki 0a4844b1c5 Added possibility to load dynamically added action classes at runtime
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-06-19 17:48:24 +02:00
Oliver Libutzki 0570add3b5 Improved error message if a reference cannot be resolved while executing
a rule or script

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-06-16 21:31:19 +02:00
Kai Kreuzer 1823c5776a renamed config folder and added null checks in case folders do not exist
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-16 10:24:31 +02:00
Kai Kreuzer 1526f71e98 removed invalid import statement
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-13 15:52:26 +02:00
Kai Kreuzer dd3906e921 A couple of minor bug fixes
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-13 15:38:23 +02:00
Kai Kreuzer 464697d964 Fixed potential NPE on certain startup orders
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-13 10:48:05 +02:00
Kai Kreuzer 6c1e3e68e1 Added ui.icon bundle to maven build
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-13 10:29:36 +02:00
Kai Kreuzer 2cffef12ab Removed old binding interfaces and abstract classes
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-12 21:56:53 +02:00
Oliver Libutzki 82c03e2f60 [436537] Updated target definition and migrated code in order to compile
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-06-12 18:36:06 +02:00
Kai Kreuzer d4c09c607a Merge branch 'Bug428193' of https://github.com/OLibutzki/smarthome into OLibutzki-Bug428193
Signed-off-by: Kai Kreuzer <kai@openhab.org>

Conflicts:
	bundles/model/org.eclipse.smarthome.model.script.tests/META-INF/MANIFEST.MF
	targetplatform/smarthome.target
2014-06-10 22:11:01 +02:00
Oliver Libutzki 104480cb18 Changed copyright header and added some information in the contributor
section

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-06-10 09:32:26 +02:00
Kai Kreuzer 46231d9f16 #434003 - Modularize main configuration file - fixed designer integration
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-09 22:45:43 +02:00
Kai Kreuzer 0b45625290 #434003 - Modularize main configuration file
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-09 21:51:03 +02:00
Kai Kreuzer 7461bf6058 #434003 - Modularize main configuration file
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-06-09 20:58:59 +02:00
kaikreuzer c16d3b80a3 Merge pull request #25 from mariniss/master
Bug 423536 - Null check in rule fails
CQ #8340
2014-06-06 21:10:42 +02:00
Michael Grammling 4fff29f778 FIXED Deadlock situation.
Signed-off-by: Michael Grammling <m.grammling@external.telekom.de>
2014-06-05 14:38:12 +02:00
Fabio Marini 03074ca955 Bug 423536 - Null check in rule fails
* Created test suite for NumberExtensions utils
 * Extended NumberExtensions utils with null safe system

Signed-off-by: Fabio Marini <fabio.mariniss@gmail.com>
2014-06-05 10:48:29 +02:00
Oliver Libutzki 2d301ea933 Javadoc due to review comments
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-06-04 19:23:13 +02:00
kaikreuzer 9d0d5c271a Merge pull request #23 from planetrenner-martin/decimal-formatter
Flexible formatting of DecimalType
2014-06-04 10:35:05 +02:00
Oliver Libutzki 8ef5b63030 Fixed test launch config
Added emf registration for xtextbin binary files

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-06-03 22:43:36 +02:00
Oliver Libutzki 7579a03222 Migrated SctiptEngineTest to Groovy OSGi Test
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-06-03 22:33:00 +02:00
Oliver Libutzki 02e5acb8b2 Merge branch 'master' of https://github.com/eclipse/smarthome into Bug428193 2014-06-03 20:56:05 +02:00
Oliver Libutzki e0ef616a2e Runtime bundle refactoring
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-06-03 19:53:03 +02:00
Kai Kreuzer 1c19ecda4a Bug 423545 - Add possiblity to easily switch between different iconsets
Added icon servlet as a replacement for the webapps/images folder

Signed-off-by: Kai Kreuzer <kai@openhab.org> (github: @kaikreuzer)
2014-06-02 23:21:48 +02:00
Martin 8fc4f1e242 github/openhab issue #1013: values like "10.0" did not work with integer formats like "%d"
Signed-off-by: Martin <martin+github@planet-renner.net>
2014-06-02 11:52:10 +02:00
kaikreuzer 0a3a0d8227 Merge pull request #22 from dvanherbergen/mqtt-update
CQ #8246: Updated MQTT transport to match latest version in OpenHAB.
2014-05-27 17:19:02 +02:00
Davy Vanherbergen 072af27caa Updated to match latest version in OpenHAB.
Signed-off-by: Davy Vanherbergen <davy.vanherbergen@gmail.com>
2014-05-23 13:40:42 +02:00
Kai Kreuzer 938c4d390e fixed startup behaviour of dynamic rest api extensions
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-05-22 17:31:01 +02:00
Kai Kreuzer fd4e0bb3f6 Added package export for storage
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-05-22 09:28:27 +02:00
Oliver Libutzki c4220c99a3 Fixed manifests
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-05-21 23:08:48 +02:00
Oliver Libutzki 67f3eefcae Cleanup
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-05-21 22:56:01 +02:00
Oliver Libutzki 40c27a689b Removed OSGI-INF from build.properties
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-05-21 22:38:32 +02:00
Oliver Libutzki ca887d9c64 Refactored Guice injection
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-05-21 21:50:15 +02:00
Kai Kreuzer f6122fd148 Added ManagedItemProvider as provided service
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-05-21 17:24:02 +02:00
Kai Kreuzer 01fc930cbf Fixed test execution during Maven build
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-05-21 14:15:35 +02:00
Kai Kreuzer 36b1a77179 Added typed return values and tests
Signed-off-by: Kai Kreuzer <kai@openhab.org> (github: @kaikreuzer)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-05-20 21:30:13 +02:00
Thomas Eichstädt-Engelen ea6fc81f0e incorporated Kai's review comments 2014-05-20 17:49:16 +02:00
Thomas Eichstädt-Engelen 3cf2115b8f initial checkin of the new Storage concept 2014-05-20 00:23:19 +02:00
Oliver Libutzki 1233ce5038 [428193] Maven build
Updated runtime feature
Updated runtime product

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-05-15 19:31:44 +02:00
Oliver Libutzki 930e8d7aba [Bug 428193] Improved Guice injection
fixed some interpreter bugs

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-05-15 18:06:59 +02:00
Oliver Libutzki 0e2d026a0e Introduction of ModelInjectorProvider
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
2014-05-14 16:45:35 +02:00
Kai Kreuzer a0c5c0a832 added immediate activation
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-05-10 23:43:03 +02:00
Kai Kreuzer 2fc2f0d4a8 fixed component declaration
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2014-05-10 23:27:16 +02:00
Martin 4c366c701c github/openhab issue #1013: When the value was an integer and the format was like "%.1f", an exception was thrown
Signed-off-by: Martin <martin+github@planet-renner.net>
2014-05-02 21:43:17 +02:00
Martin ed2583ec45 github/openhab issue #1013: flexible formatting of numeric values
Signed-off-by: Martin <martin+github@planet-renner.net>
2014-04-30 19:04:52 +02:00
Kai Kreuzer 315f4874f2 removed unnecessary dependency on equinox 2014-04-27 21:11:09 +02:00
Kai Kreuzer ea8daaa8be removed specific import package versions 2014-04-25 22:37:04 +02:00