GitHub user ahgittin opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/46
OSGi+YAML support in catalog
This adds OSGi and YAML support to catalog. There are a few remaining
issues but this code has been reviewed and tested quite a bit. Incorporates
#38, #39, and #31.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ahgittin/incubator-brooklyn osgi
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/46.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 #46
----
commit d2191c9acb807c1092645e54fffed8f40f9decad
Author: Alex Heneveld <[email protected]>
Date: 2014-07-01T12:34:20Z
import of brooklyncentral/camp-server dependency to apache brooklyn project
commit 79ebcc3382cdd3e8725967aa2c139696ce1f2294
Author: Alex Heneveld <[email protected]>
Date: 2014-06-11T03:27:57Z
osgi wip
commit 06c10c4318374009d1b8e0ed5b314d5481a40c7c
Author: Sam Corbett <[email protected]>
Date: 2014-06-26T13:28:24Z
Ground work to load classes from bundles in blueprints
commit b6d236493d7bdf01654c3ee9e44bcc80f0002208
Author: Sam Corbett <[email protected]>
Date: 2014-06-28T16:11:16Z
Adds context element to catalogue entries
commit b0bd80894e1b4cc93821361abeec5d6aaf3e70fd
Author: Sam Corbett <[email protected]>
Date: 2014-06-30T11:54:44Z
Fix infinite recursion in Osgis.getBundle
commit 494291d8029d6e5fa02f1444a3e5d218ca3ef902
Author: Sam Corbett <[email protected]>
Date: 2014-06-30T12:19:51Z
Incorporate loading from bundles into BrooklynEntityClassResolver
commit 45e1494f74ffe1829b0ded954a450846c3cef2a3
Author: Sam Corbett <[email protected]>
Date: 2014-06-30T14:23:35Z
Adds version to catalogue items and tests deserialisation
commit 0263fa1ca53082f10f07031edad24a1b7a894e88
Author: Sam Corbett <[email protected]>
Date: 2014-06-30T15:07:10Z
Rename catalog context to libraries
commit edcaee4d5df5ec1b2b1a577ead0646b335735516
Author: Sam Corbett <[email protected]>
Date: 2014-06-30T16:23:37Z
Deprecate BrooklynCatalog.addItem and remove addToClasspath
commit 76ff185a0675ae916c053470609480d987a16128
Author: Sam Corbett <[email protected]>
Date: 2014-06-30T16:24:33Z
Note problem with BrooklynAssemblyTemplateInstantiator catalog path
commit 30093bb4a076f20e2fd3eac9451fc5c1ce36db48
Author: Sam Corbett <[email protected]>
Date: 2014-07-01T12:38:45Z
BROOKLYN-13: Handle absent bundle in OsgiManager.tryResolveClass
commit 195410954dd0ece53bc941c93662591470e13272
Author: Aled Sage <[email protected]>
Date: 2014-07-01T12:59:49Z
BROOKLYN-13: adds BrooklynCatalog.addItem(yaml)
- not yet implemented in BasicBrooklynCatalog, as canât yet parse yaml
commit b3d2c03681cc4d1e16818430b96bcbe2342f2a46
Author: Aled Sage <[email protected]>
Date: 2014-07-01T13:00:08Z
BROOKLYN-13: REST PUT /catalog expects yaml rather than groovy
commit acd41f71769cd94a10dffd78e902e042c35186c2
Author: Sam Corbett <[email protected]>
Date: 2014-07-01T13:29:18Z
Merge pull request #1 from aledsage/sjcorbett/yaml-context
REST api for adding catalog item using yaml
commit 3a2f680bddd97fb5786bca08975fbbbbe425d78f
Author: Sam Corbett <[email protected]>
Date: 2014-07-01T15:06:12Z
BROOKLYN-13: Merge CatalogDto and CatalogDtoUtils
There aren't enough methods on the latter to justify the separate class
commit 7d5ce73cdeb9510d126d03cf328d6d6fa9a2ed85
Author: Alex Heneveld <[email protected]>
Date: 2014-07-02T09:29:17Z
update poms to build and use local camp-base and camp-server, now versioned
with brooklyn.
commit 646e20229cac1ea1d22da867fd972bb59412f197
Author: Alex Heneveld <[email protected]>
Date: 2014-07-02T10:52:28Z
add README for CAMP and test in core that it can access some of the CAMP
assembly items, with simple instantiators
commit 7fec791f01b0efc6f29d53550fb433d030fae34e
Author: Sam Corbett <[email protected]>
Date: 2014-07-02T11:10:11Z
BROOKLYN-13: Registers bundles when catalogue is loaded
load() method added to CatalogDo to register bundles with management
context.
BasicBrooklynCatalog altered to not auto-load in another thread because it
caused
a deadlock (management context locked, claims lock for catalogDo.load. BBC
constructor runs task in thread that claims catalogDo.load lock, then tries
to claim
management context lock when getting the OsgiManager)
commit c43eb16fdc209a09f4cc7ee895816298bf48a785
Author: Svetoslav Neykov <[email protected]>
Date: 2014-07-02T09:52:17Z
Conditional wrapping of YAML app.
When loading YAML with a single application in the services list don't
create a wrapper application, use the one from the services list.
To explicitly force wrapping use custom attribute "wrapApp: true".
commit 3e71512b3dd21bb0113316c4e49df48bed92beb3
Author: Alex Heneveld <[email protected]>
Date: 2014-07-02T15:12:47Z
Merge remote-tracking branch 'sjcorbett/yaml-context' into osgi2
commit 74ddd83b7a7563815618bb566643a3275da77481
Author: Alex Heneveld <[email protected]>
Date: 2014-07-02T15:12:55Z
Merge remote-tracking branch 'sjcorbett/auto-deploy-bundles' into osgi2
commit a3915225ee0bb337159c49837344399757d58994
Author: Alex Heneveld <[email protected]>
Date: 2014-07-02T15:13:03Z
Merge remote-tracking branch 'neykov/yaml-promote-app' into osgi2
commit c664f5eb3fdbdef676312ca62398d0226d86b1a5
Author: Alex Heneveld <[email protected]>
Date: 2014-07-02T15:13:19Z
Merge remote-tracking branch 'ahgittin/camp-in-brooklyn' into osgi2
commit 5c3d32ce1f473341d30e3aedaec9c88d1b8f42f0
Author: Alex Heneveld <[email protected]>
Date: 2014-07-02T15:38:01Z
allow access to CAMP from brooklyn catalog
commit 407de80ae9f0b975ad45e283146adfcf881fdfb6
Author: Alex Heneveld <[email protected]>
Date: 2014-07-02T16:17:25Z
update generics for CatalogItem so it can supply a Spec, and add
BrooklynCatalog.createSpec deprecating the loadClass methods
commit 468d788542d19810062d3e0b8a41019aa699f740
Author: Alex Heneveld <[email protected]>
Date: 2014-07-03T01:29:47Z
create specs from catalog items, and use these in many places. also fix
some NPE and serialization issues.
commit 492ccb7f8110b17a23e7befe32230b857a369cb0
Author: Alex Heneveld <[email protected]>
Date: 2014-07-03T10:43:28Z
Merge remote-tracking branch 'apache-git/master' into osgi
commit f99fb581657840e1761402d073074f4968d3c0b1
Author: Svetoslav Neykov <[email protected]>
Date: 2014-07-03T10:53:46Z
Create the wrapper app before building the children.
Reorganize the code so that the wrapper app is created (if necessary)
before initializing the template so that nested entity creation doesn't throw
exceptions. The existence of the root app is mandatory.
The main change is the check whether the single serviceType is an
application (see isSingleApp) before having it instantiated.
Conflicts:
usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
Adding back in the one extra applyLocation which was needed.
commit d4d17b720f6a27086615131720e0f4080d6abbec
Author: Alex Heneveld <[email protected]>
Date: 2014-07-03T13:39:45Z
support more catalog type info and yaml via REST API, and make getPlanYaml
available (nullable) on CatalogItem API;
starting to fix CatalogResourceTest of POSTing a YAML
commit 13aa4af9447fc2536da660ff592fb0c0175b1d0d
Author: Alex Heneveld <[email protected]>
Date: 2014-07-03T14:06:28Z
use an OSGi cache, and connect catalog items to OsgiManager class loading
----
---
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.
---
