Merge commit 'c94efbebab3172bd18b829dbeed132679d54bb4f'

Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/8806c8f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/8806c8f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/8806c8f9

Branch: refs/heads/feature-UNOMI-117
Commit: 8806c8f9259ea6cb491605c5be169507ef4b0940
Parents: a4ecc1e c94efbe
Author: Abdelkader Midani <amid...@apache.org>
Authored: Tue Aug 8 14:47:39 2017 +0200
Committer: Abdelkader Midani <amid...@apache.org>
Committed: Tue Aug 8 14:47:39 2017 +0200

----------------------------------------------------------------------
 extensions/pom.xml                              |   1 +
 extensions/weather-update/.gitignore            |   8 +
 extensions/weather-update/README.md             |  43 +++
 extensions/weather-update/core/pom.xml          | 100 +++++++
 .../actions/WeatherUpdateAction.java            | 279 +++++++++++++++++++
 .../cxs/actions/UpdateWeatherAction.json        |  15 +
 .../sessions/weather/weatherLike.json           |  13 +
 .../sessions/weather/weatherTemp.json           |  13 +
 .../sessions/weather/weatherWindDirection.json  |  13 +
 .../sessions/weather/weatherWindSpeed.json      |  13 +
 .../META-INF/cxs/rules/UpdateWeather.json       |  40 +++
 .../sessions/weatherSessionProperties.json      |   5 +
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  44 +++
 .../src/main/resources/messages_en.properties   |  18 ++
 .../org.apache.unomi.weatherUpdate.cfg          |  19 ++
 extensions/weather-update/karaf-kar/pom.xml     |  82 ++++++
 .../karaf-kar/src/main/feature/feature.xml      |  28 ++
 extensions/weather-update/pom.xml               |  37 +++
 ...g.apache.unomi.persistence.elasticsearch.cfg |   2 +-
 19 files changed, 772 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to