You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/07/29 13:14:21 UTC
[3/3] brooklyn-dist git commit: Closes #41
Closes #41
Move karaf distribution to brooklyn-dist.
This PR is the third of three that together move the karaf distribution to brooklyn-dist and separate out the software from brooklyn-library into separate catalog bom and feature files.
Merge this after https://github.com/apache/brooklyn-library/pull/53.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/f4e69033
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/f4e69033
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/f4e69033
Branch: refs/heads/master
Commit: f4e69033aafd2f8ad2fb9c24a1b550792dbb95f7
Parents: f2c7112 08f1462
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Jul 29 16:14:07 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Jul 29 16:14:07 2016 +0300
----------------------------------------------------------------------
dist-karaf/apache-brooklyn/pom.xml | 156 ++++++++
.../filtered-resources/etc/branding.properties | 35 ++
.../src/main/resources/etc/custom.properties | 120 ++++++
.../src/main/resources/etc/default.catalog.bom | 368 +++++++++++++++++++
....apache.brooklyn.core.catalog.bomscanner.cfg | 27 ++
.../etc/org.apache.brooklyn.osgilauncher.cfg | 65 ++++
.../resources/etc/org.ops4j.pax.logging.cfg | 95 +++++
.../etc/org.ops4j.pax.url.mvn.repositories.cfg | 20 +
.../main/resources/etc/org.ops4j.pax.web.cfg | 19 +
.../src/main/resources/etc/system.properties | 133 +++++++
dist-karaf/itest/pom.xml | 259 +++++++++++++
.../java/org/apache/brooklyn/AssemblyTest.java | 88 +++++
.../org/apache/brooklyn/KarafTestUtils.java | 84 +++++
.../catalog/internal/CatalogBomScannerTest.java | 176 +++++++++
.../catalog/internal/DefaultBomLoadTest.java | 77 ++++
.../launcher/osgi/OsgiLauncherTest.java | 99 +++++
.../rest/BrooklynRestApiLauncherTest.java | 84 +++++
.../security/CustomSecurityProvider.java | 33 ++
.../security/CustomSecurityProviderTest.java | 156 ++++++++
.../security/StockSecurityProviderTest.java | 191 ++++++++++
.../apache/brooklyn/test/IntegrationTest.java | 26 ++
.../src/test/resources/custom-security-bp.xml | 40 ++
.../itest/src/test/resources/exam.properties | 21 ++
dist-karaf/itest/src/test/resources/logback.xml | 43 +++
dist-karaf/pom.xml | 185 ++++++++++
pom.xml | 1 +
26 files changed, 2601 insertions(+)
----------------------------------------------------------------------