Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F233E17727 for ; Wed, 18 Mar 2015 22:14:22 +0000 (UTC) Received: (qmail 17589 invoked by uid 500); 18 Mar 2015 22:14:22 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 17567 invoked by uid 500); 18 Mar 2015 22:14:22 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 17558 invoked by uid 99); 18 Mar 2015 22:14:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Mar 2015 22:14:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 18 Mar 2015 22:14:21 +0000 Received: (qmail 15519 invoked by uid 99); 18 Mar 2015 22:12:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Mar 2015 22:12:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C1FDE18F9; Wed, 18 Mar 2015 22:12:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Wed, 18 Mar 2015 22:12:52 -0000 Message-Id: <3e554f54468d4756870463759db1a0ef@git.apache.org> In-Reply-To: <3c1e0db5cd0d4e3d86003554da27a890@git.apache.org> References: <3c1e0db5cd0d4e3d86003554da27a890@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] incubator-brooklyn git commit: This closes #554 X-Virus-Checked: Checked by ClamAV on apache.org This closes #554 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/78072b29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/78072b29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/78072b29 Branch: refs/heads/master Commit: 78072b294db95ea57eef93ba377d1349116ab811 Parents: 5fa1444 b68363e Author: Alex Heneveld Authored: Wed Mar 18 22:12:32 2015 +0000 Committer: Alex Heneveld Committed: Wed Mar 18 22:12:32 2015 +0000 ---------------------------------------------------------------------- .../AbstractBrooklynObjectRebindSupport.java | 2 +- .../entity/rebind/dto/MementosGenerators.java | 55 +++++++- .../persister/BrooklynPersistenceUtils.java | 4 +- .../location/access/PortForwardManagerImpl.java | 7 +- .../util/task/system/ProcessTaskStub.java | 2 +- .../entity/rebind/RebindCatalogItemTest.java | 4 +- ...talogWhenCatalogPersistenceDisabledTest.java | 8 +- .../entity/rebind/RebindTestFixture.java | 10 +- .../access/PortForwardManagerRebindTest.java | 45 +++++++ .../location/jclouds/BrooklynImageChooser.java | 135 ++++++++++++++++++- .../location/jclouds/JcloudsLocation.java | 5 +- .../entity/brooklynnode/BrooklynNodeImpl.java | 25 +--- .../java/JavaSoftwareProcessSshDriver.java | 1 + .../entity/proxy/AbstractControllerImpl.java | 7 +- .../brooklyn/entity/proxy/LoadBalancer.java | 2 +- .../entity/webapp/JavaWebAppSshDriver.java | 4 +- .../entity/proxy/AbstractControllerTest.java | 4 + .../java-web-app-and-db-with-policy.yaml | 4 +- 18 files changed, 273 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/78072b29/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/78072b29/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java ----------------------------------------------------------------------