Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 00A8E200CF3 for ; Wed, 13 Sep 2017 15:52:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F39831609CB; Wed, 13 Sep 2017 13:52:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 44B211609CE for ; Wed, 13 Sep 2017 15:52:12 +0200 (CEST) Received: (qmail 78439 invoked by uid 500); 13 Sep 2017 13:52:11 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 78273 invoked by uid 99); 13 Sep 2017 13:52:10 -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, 13 Sep 2017 13:52:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 97973F5767; Wed, 13 Sep 2017 13:52:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: drigodwin@apache.org To: commits@brooklyn.apache.org Date: Wed, 13 Sep 2017 13:52:13 -0000 Message-Id: <97e5cd27af564eb797406e47422844ac@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] brooklyn-dist git commit: This closes #104 archived-at: Wed, 13 Sep 2017 13:52:13 -0000 This closes #104 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/d22a71e2 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/d22a71e2 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/d22a71e2 Branch: refs/heads/master Commit: d22a71e2c2b0b5e750ee74b8d01292ca56a672f8 Parents: ff34316 939dd79 Author: Duncan Godwin Authored: Wed Sep 13 14:52:01 2017 +0100 Committer: Duncan Godwin Committed: Wed Sep 13 14:52:01 2017 +0100 ---------------------------------------------------------------------- deb-packaging/deb/control/control | 2 +- deb-packaging/deb/control/postinst | 3 - deb-packaging/deb/control/preinst | 10 + deb-packaging/pom.xml | 173 ++++++--- .../main/filtered-resources/etc/brooklyn.cfg | 28 ++ .../src/main/resources/bin/runbrooklyn | 39 ++ .../src/main/resources/bin/setenv | 7 + .../src/main/resources/catalog/catalog.bom | 368 +++++++++++++++++++ .../src/main/resources/etc/default.catalog.bom | 362 +----------------- .../org.apache.brooklyn.osgilauncher.cfg | 2 +- rpm-packaging/pom.xml | 162 +++++--- rpm-packaging/rpm/postinstall.sh | 3 - rpm-packaging/rpm/preinstall.sh | 10 + .../resources/service/systemd/brooklyn.service | 10 +- .../resources/service/upstart/deb/brooklyn.conf | 13 +- .../resources/service/upstart/rpm/brooklyn.conf | 14 +- shared-packaging/src/test/yaml/Vagrantfile | 4 +- .../src/test/yaml/package-apps.yaml | 10 +- shared-packaging/src/test/yaml/package.bom | 46 ++- 19 files changed, 767 insertions(+), 499 deletions(-) ----------------------------------------------------------------------