yaml catalog supports scanning, experimental, and default

this restores catalog scanning as the default, based on 
brooklyn/default.catalog.bom in the cli project;
there are some limitations on what can be scanned, described in the doc.
some of the tests configure other catalogs (with core's 
brooklyn/empty.catalog.bom used in many)


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

Branch: refs/heads/0.7.0-incubating
Commit: 3d9651fcf8d1831ebe5c2dc7569b354a85f24d63
Parents: 0b60bf2
Author: Alex Heneveld <[email protected]>
Authored: Wed Apr 29 13:27:09 2015 +0100
Committer: Alex Heneveld <[email protected]>
Committed: Fri May 8 18:22:21 2015 +0100

----------------------------------------------------------------------
 docs/guide/ops/catalog/index.md | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3d9651fc/docs/guide/ops/catalog/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/ops/catalog/index.md b/docs/guide/ops/catalog/index.md
index 8477204..dcedcd8 100644
--- a/docs/guide/ops/catalog/index.md
+++ b/docs/guide/ops/catalog/index.md
@@ -103,6 +103,11 @@ The following optional catalog metadata is supported:
   (to prevent requiring all OSGi bundles to be loaded at launch).
   Icons are instead typically installed either at the server from which the 
OSGi bundles or catalog items are supplied 
   or in the `conf` folder of the Brooklyn distro.
+- `scanJavaAnnotations` [experimental]: if provided (as `true`), this will 
scan any locally provided
+  libraries for types annotated `@Catalog` and extract metadata to include 
them as catalog items.
+  If no libraries are specified this will scan the default classpath.
+  This feature is experimental and may change or be removed.
+  Also note that other metadata (such as versions, etc) may not be applied.
 - `brooklyn.libraries`: a list of pointers to OSGi bundles required for the 
catalog item.
   This can be omitted if blueprints are pure YAML and everything required is 
included in the classpath and catalog.
   Where custom Java code or bundled resources is needed, however, OSGi JARs 
supply

Reply via email to