You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/12/01 16:57:36 UTC
[3/7] incubator-brooklyn git commit: Merge remote-tracking branch
'upstream/master' into amq-broker-name
Merge remote-tracking branch 'upstream/master' into amq-broker-name
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/aed21450
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/aed21450
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/aed21450
Branch: refs/heads/master
Commit: aed214502673bf155f10b0334382fc0267d3ff39
Parents: 3c6ba53 dea4a51
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Fri Nov 28 21:03:37 2014 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Fri Nov 28 21:03:37 2014 -0500
----------------------------------------------------------------------
api/src/main/java/brooklyn/entity/Feed.java | 5 +-
.../brooklyn/management/ManagementContext.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 +-
.../location/access/PortForwardManager.java | 242 ++++++++---
.../access/PortForwardManagerAuthority.java | 230 +---------
.../access/PortForwardManagerClient.java | 272 +++++++++++-
.../location/access/PortForwardManagerImpl.java | 430 +++++++++++++++++++
.../PortForwardManagerLocationResolver.java | 89 ++++
.../brooklyn/location/access/PortMapping.java | 38 +-
.../basic/AbstractLocationResolver.java | 2 +-
.../internal/AbstractManagementContext.java | 2 +-
.../internal/BrooklynGarbageCollector.java | 13 +-
.../NonDeploymentManagementContext.java | 1 -
.../policy/basic/AbstractEntityAdjunct.java | 8 +-
.../java/brooklyn/policy/basic/AdjunctType.java | 10 +-
.../brooklyn/util/text/DataUriSchemeParser.java | 28 +-
.../brooklyn/util/text/TemplateProcessor.java | 2 +-
.../services/brooklyn.location.LocationResolver | 1 +
.../brooklyn/entity/rebind/RebindFeedTest.java | 178 +++++++-
.../entity/rebind/RebindTestFixture.java | 40 +-
...BrooklynMementoPersisterToMultiFileTest.java | 2 +-
.../event/feed/function/FunctionFeedTest.java | 34 +-
.../brooklyn/event/feed/http/HttpFeedTest.java | 15 +
.../feed/shell/ShellFeedIntegrationTest.java | 21 +
.../event/feed/ssh/SshFeedIntegrationTest.java | 16 +
.../PortForwardManagerLocationResolverTest.java | 83 ++++
.../access/PortForwardManagerRebindTest.java | 63 ++-
.../location/access/PortForwardManagerTest.java | 157 +++++++
.../brooklyn/management/ha/HotStandbyTest.java | 48 ++-
.../java/brooklyn/util/ResourceUtilsTest.java | 10 +-
docs/dev/build/debugging-remote-brooklyn.md | 140 ++++++
docs/dev/code/index.include.md | 1 +
.../location/jclouds/JcloudsLocation.java | 17 +-
.../JcloudsPortForwarderExtension.java | 11 +
.../entity/monitoring/zabbix/ZabbixFeed.java | 7 +
.../monitoring/zabbix/ZabbixPollConfig.java | 6 +
.../brooklyn/entity/chef/ChefAttributeFeed.java | 9 +-
.../entity/chef/ChefAttributePollConfig.java | 7 +-
.../java/brooklyn/entity/java/JmxSupport.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 +
.../brooklyn/util/net/NetworkingUtilsTest.java | 12 +-
.../test/java/brooklyn/util/net/UrlsTest.java | 10 +-
73 files changed, 2385 insertions(+), 497 deletions(-)
----------------------------------------------------------------------