GitHub user geomacy opened a pull request:
https://github.com/apache/brooklyn-server/pull/80
Populate catalog from bundle bom
This PR adds the ability for bundles to contain a 'catalog.bom' file
specifying items that the bundle contains which should be added to the catalog.
The bundle is scanned for a catalog.bom upon bundle start. The catalog.bom
file is automatically enhanced with a 'brooklyn.libraries' entry that refers to
the newly started bundle, and any items in it are added to the catalog.
The PR also includes updates to the existing jars to add a catalog.bom file
that includes the details of the various entities in each.
This PR is based upon the following and should be merged after them:
https://github.com/apache/brooklyn-server/pull/65
https://github.com/apache/brooklyn-server/pull/66
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/geomacy/brooklyn-server
populate-catalog-from-bundle-bom
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-server/pull/80.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 #80
----
commit a51fdc71c9a1620e35cd88b1b6643ca4439b719d
Author: Geoff Macartney <[email protected]>
Date: 2016-03-04T10:52:46Z
Use OSGI lookup for ApiObjectsFactory and fall back to ServiceLoader.
Abstract out the lookup into a utility.
commit 00d1338b5c500a5585aaa91c38b3205668254821
Author: Geoff Macartney <[email protected]>
Date: 2016-03-07T16:19:39Z
Add framework lookup for (deprecated) PlanToSpecFactory.
commit f7a03f03897a7b0acc50163aeed32bf65283c1c4
Author: Geoff Macartney <[email protected]>
Date: 2016-03-07T17:08:18Z
Apply FrameworkLookup to TypePlanTransformers.
commit 8f88e41afc94bcdf7dfc7896dbaa44ceaffc464f
Author: Geoff Macartney <[email protected]>
Date: 2016-03-08T09:51:55Z
Use prototype scope on beans rather than explicit factory classes.
commit ebaeae7beac048f488b5a46c5430395ddc0ca35b
Author: Geoff Macartney <[email protected]>
Date: 2016-03-08T10:30:13Z
Replace ServiceLoader with FrameworkLookup for EntitySpecResolver.
commit 98d1b6003e9b71c3a0d85d25152e31c5414ccf92
Author: Geoff Macartney <[email protected]>
Date: 2016-03-08T14:26:05Z
Replace ServiceLoader with FrameworkLookup for ServiceTypeResolver.
commit b60db4c6f4dd5f57e06a962d52e734f361dd7c88
Author: Geoff Macartney <[email protected]>
Date: 2016-03-08T14:56:22Z
Replace ServiceLoader with FrameworkLookup for LocationResolver.
commit e6a412bfc0b0347364f50aee92977d6488d3d3e9
Author: Geoff Macartney <[email protected]>
Date: 2016-03-08T16:56:17Z
Fix list handling.
commit 6c3c508c8da03447742d19567d225bcf045da7c0
Author: Geoff Macartney <[email protected]>
Date: 2016-03-10T15:37:31Z
ServiceLookups should be in core, and use correct interface for
campToSpecTransformerService.
commit afcb689f0a31995a27c953abab73f4902d8f2754
Author: Geoff Macartney <[email protected]>
Date: 2016-03-16T12:43:38Z
Update call to ServiceLoader.load to match previous call pattern.
(Previous in the sense of prior to the FrameworkLookup change.)
commit a93c170b6753110b034dcb8244e33ea859bac544
Author: Geoff Macartney <[email protected]>
Date: 2016-03-16T15:02:18Z
Add Javadoc note on use of FrameworkLooup and OSGI service reference count.
commit 630eb6485f89f5d68f5d10107bbc56af3c570cc0
Author: Geoff Macartney <[email protected]>
Date: 2016-03-18T16:36:40Z
Merge branch 'master' into service-loader-updates
commit 71d5a1083f250ac419cdb34b139ba62abef1bd4d
Author: Geoff Macartney <[email protected]>
Date: 2016-03-18T16:41:26Z
Use FrameworkLookup class to get the bundle context.
Necessary to avoid NPE at line 135 and 160 if the class being looked up is
in a bundle that hasn't started yet.
We don't really need to get the bundle context from that class, any
suitable one will do, and we know that
the bundle we live in has started!
commit b2df8dd2943b63eba805eb1b5209c99b3ade1d3f
Author: Geoff Macartney <[email protected]>
Date: 2016-03-23T09:48:28Z
Merge branch 'master' into service-loader-updates
commit 50ece3dee91d0f07f4ac8bd78b462063799580cc
Author: Svetoslav Neykov <[email protected]>
Date: 2016-03-16T16:41:52Z
Make EmbeddedFelixFramework pluggable
Needs different implementations depending on whether running in Karaf or
classical. Can't have EmbeddedFelixFramework loaded in Karaf because felix
bundle doesn't export org.apache.framework packages, just generic OSGi ones.
commit 6f87b0eac5645813a8f130349ba48046b2e5600f
Author: Svetoslav Neykov <[email protected]>
Date: 2016-03-17T16:59:00Z
Add maxmind-db dependency in feature.xml
commit f76f9eefe5c85c100e1d9d78873dbdf2e968150b
Author: Geoff Macartney <[email protected]>
Date: 2016-03-07T17:08:18Z
Add ability to scan catalog.bom files in the root of bundles.
This adds entries to the catalog from any catalog.bom files in the bundle,
automatically adding a 'brooklyn.libraries' section for the bundle itself
to the bom before scanning it for items.
e.g.
brooklyn.catalog:
version: 0.9.0
scanJavaAnnotations: true
description: For testing loading catalog.bom
items:
- id: simpleTest1
item:
type: org.apache.brooklyn.test.osgi.entities.SimpleEntity
Note, however that the scanJavaAnnotations will not work on the bundle. Only
explicitly declared items will be added to the catalog.
commit 171d8a0d8a3d599d7c2977e228968ccc1a052788
Author: Geoff Macartney <[email protected]>
Date: 2016-03-24T18:04:48Z
Add bundle catalogs for OSGI setup.
----
---
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.
---
