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/04/20 18:37:38 UTC

[3/3] brooklyn-server git commit: Closes #106

Closes #106

Add catalog.bom application white/blacklists.

Note this PR depends on https://github.com/apache/brooklyn-server/pull/100 and should be merged after it.

It is desirable to have a config time mechanism to control what
bundles are allowed to present applications in the catalog and
what aren't.

This change adds a white/blacklist mechanism to the catalog.bom
bundle scanning. Each list takes the form of a CSV whitelist of
regexes to match against bundle symbolic ids.  A bundle will be
allowed to add an application (template) to the catalog if its
bundle id matches one of the regexes on the whitelist, and also
does not match one of the regexes on the blacklist.

The configuration keys and default values for the lists are:

brooklyn.catalog.osgi.application.whitelist=.*
brooklyn.catalog.osgi.application.blacklist=

(i.e. by default accept all bundles).

these values are specified in the file org.apache.brooklyn.core.catalog.bomscanner.cfg

Note that two 'default'  example applications are supplied in the bom
for brooklyn-software-base.


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

Branch: refs/heads/master
Commit: bc0362bacd0724777aae3a2cda6f25b7ed2c4322
Parents: fee7438 3277583
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Apr 20 17:37:26 2016 +0100
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Wed Apr 20 17:37:26 2016 +0100

----------------------------------------------------------------------
 .../catalog/internal/CatalogBomScanner.java     | 107 ++++++++++--
 core/src/main/resources/catalog.bom             |   3 +-
 ....apache.brooklyn.core.catalog.bomscanner.cfg |  27 +++
 .../resources/OSGI-INF/blueprint/blueprint.xml  |   8 +-
 .../catalog/internal/CatalogBomScannerTest.java | 173 +++++++++++++++++++
 policy/src/main/resources/catalog.bom           |   3 +-
 server-cli/src/main/resources/catalog.bom       |   1 -
 software/base/src/main/resources/catalog.bom    | 121 ++++++++++++-
 test-framework/src/main/resources/catalog.bom   |   3 +-
 .../entities/src/main/resources/catalog.bom     |   5 +-
 .../src/main/resources/catalog.bom              |   3 +-
 .../src/main/resources/catalog.bom              |   3 +-
 .../src/main/resources/catalog.bom              |   3 +-
 .../org/apache/brooklyn/util/text/Strings.java  |  21 +++
 .../apache/brooklyn/util/text/StringsTest.java  |  26 +++
 15 files changed, 472 insertions(+), 35 deletions(-)
----------------------------------------------------------------------