GitHub user geomacy opened a pull request:
https://github.com/apache/brooklyn-server/pull/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.
Any bundle with a catalog.bom file may specify applications to
appear in the catalog (itemType: template).
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=org.apache.brooklyn.*
brooklyn.catalog.osgi.application.blacklist=
(i.e. empty blacklist by default).
Note that two 'default' example applications are supplied in the bom
for brooklyn-software-base.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/geomacy/brooklyn-server default-catalog
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-server/pull/106.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #106
----
commit 7a1d51c6c9d0ea084ad09be51a27dec06fb0d365
Author: Geoff Macartney <[email protected]>
Date: 2016-04-05T13:22:05Z
Support removal of catalog entries from bundle BOM when the bundle is
stopped.
This change follows on from
https://github.com/apache/brooklyn-server/pull/80.
With this change any catalog members that were added by scanning the
bundle's
catalog.bom when the bundle started will be removed upon stopping the
bundle.
commit 84720cfa88bd98eed6b73918d3f250bee1291157
Author: Geoff Macartney <[email protected]>
Date: 2016-04-05T14:06:13Z
Code review comments.
https://github.com/apache/brooklyn-server/pull/80#discussion_r57442437
https://github.com/apache/brooklyn-server/pull/80#discussion_r57442486
https://github.com/apache/brooklyn-server/pull/80#discussion_r57442585
https://github.com/apache/brooklyn-server/pull/80#discussion-diff-57442710
commit a5278a229e7adf3fe6fb32964c599c409fd98190
Author: Geoff Macartney <[email protected]>
Date: 2016-04-07T08:49:30Z
Code review comments: gobble exceptions on stopping bundle.
Gobble exception to avoid possibility of causing problems stopping bundle.
commit 9763f15a2c937a71309b9e2548735496144b7cbb
Author: Geoff Macartney <[email protected]>
Date: 2016-04-07T08:34:54Z
Add catalog.bom application white/blacklists.
Any bundle with a catalog.bom file may specify applications to
appear in the catalog (itemType: template).
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=org.apache.brooklyn.*
brooklyn.catalog.osgi.application.blacklist=
(i.e. empty blacklist by default).
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
