You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/11/26 02:07:33 UTC

[6/6] incubator-brooklyn git commit: This closes #352

This closes #352


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

Branch: refs/heads/master
Commit: a5db1546b9efd962c988c7e3f80068c74d810e99
Parents: 0f50c58 53ea410
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Nov 26 02:07:15 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Nov 26 02:07:15 2014 +0100

----------------------------------------------------------------------
 api/src/main/java/brooklyn/entity/Feed.java     |   5 +-
 .../main/java/brooklyn/mementos/Memento.java    |   6 +
 .../java/brooklyn/policy/EntityAdjunct.java     |   2 +-
 .../brooklyn/basic/AbstractBrooklynObject.java  |  15 +-
 .../brooklyn/entity/basic/AbstractEntity.java   |  50 ++++--
 .../java/brooklyn/entity/basic/Entities.java    |   3 +-
 .../AbstractBrooklynObjectRebindSupport.java    |   6 +
 .../entity/rebind/RebindManagerImpl.java        |  11 +-
 .../entity/rebind/dto/AbstractMemento.java      |  61 ++++---
 .../entity/rebind/dto/BasicLocationMemento.java |   1 -
 .../entity/rebind/dto/MementosGenerators.java   |   8 +-
 .../java/brooklyn/event/feed/AbstractFeed.java  |  76 +++++---
 .../java/brooklyn/event/feed/FeedConfig.java    |  88 +++++++++
 .../java/brooklyn/event/feed/PollConfig.java    |  16 +-
 .../main/java/brooklyn/event/feed/Poller.java   |  26 ++-
 .../event/feed/function/FunctionFeed.java       |  13 +-
 .../event/feed/function/FunctionPollConfig.java |  21 +++
 .../java/brooklyn/event/feed/http/HttpFeed.java |   6 +
 .../event/feed/http/HttpPollConfig.java         |  10 +-
 .../brooklyn/event/feed/shell/ShellFeed.java    |   6 +
 .../event/feed/shell/ShellPollConfig.java       |   6 +
 .../java/brooklyn/event/feed/ssh/SshFeed.java   |   6 +
 .../brooklyn/event/feed/ssh/SshPollConfig.java  |  12 ++
 .../windows/WindowsPerformanceCounterFeed.java  |   6 +
 .../WindowsPerformanceCounterPollConfig.java    |   6 +-
 .../internal/BrooklynGarbageCollector.java      |  13 +-
 .../policy/basic/AbstractEntityAdjunct.java     |   8 +-
 .../java/brooklyn/policy/basic/AdjunctType.java |  10 +-
 .../brooklyn/util/text/DataUriSchemeParser.java |  28 ++-
 .../brooklyn/util/text/TemplateProcessor.java   |   2 +-
 .../brooklyn/entity/rebind/RebindFeedTest.java  | 178 +++++++++++++++++--
 .../entity/rebind/RebindTestFixture.java        |  40 ++++-
 .../event/feed/function/FunctionFeedTest.java   |  34 +++-
 .../brooklyn/event/feed/http/HttpFeedTest.java  |  15 ++
 .../feed/shell/ShellFeedIntegrationTest.java    |  21 +++
 .../event/feed/ssh/SshFeedIntegrationTest.java  |  16 ++
 .../brooklyn/management/ha/HotStandbyTest.java  |  48 ++++-
 .../java/brooklyn/util/ResourceUtilsTest.java   |  10 +-
 .../location/jclouds/JcloudsLocation.java       |   2 +-
 .../entity/monitoring/zabbix/ZabbixFeed.java    |   7 +
 .../monitoring/zabbix/ZabbixPollConfig.java     |   6 +
 .../brooklyn/entity/chef/ChefAttributeFeed.java |   9 +-
 .../entity/chef/ChefAttributePollConfig.java    |   7 +-
 .../event/feed/jmx/JmxAttributePollConfig.java  |   7 +-
 .../java/brooklyn/event/feed/jmx/JmxFeed.java   |   6 +
 .../jmx/JmxNotificationSubscriptionConfig.java  |  14 ++
 .../event/feed/jmx/JmxOperationPollConfig.java  |   4 +
 .../java/brooklyn/util/guava/Functionals.java   |  21 +++
 .../main/java/brooklyn/util/guava/Maybe.java    |  16 ++
 .../java/brooklyn/util/javalang/Equals.java     |  35 ++++
 .../src/main/java/brooklyn/util/net/Urls.java   |  24 +++
 .../main/java/brooklyn/util/text/Strings.java   |  22 +++
 .../test/java/brooklyn/util/net/UrlsTest.java   |  10 +-
 53 files changed, 934 insertions(+), 145 deletions(-)
----------------------------------------------------------------------