GitHub user neykov opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/71
Yaml referencing other Yaml files
* entityResolver.populateSpec is called for both catalog and yaml
referencing items now to migrate attributes from the referee to the referred
specs.
* Reference catalog/YAML at any level
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/neykov/incubator-brooklyn yaml-url-references
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/71.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 #71
----
commit d5a249fe1875dcfb71b041761791a3b44069cd91
Author: Svetoslav Neykov <[email protected]>
Date: 2014-07-16T08:04:15Z
AppOrSpec not relevant any more, remove.
The code uses only the spec part.
commit 918a2687053de57560e2a68b858c8a9b117a6f5d
Author: Svetoslav Neykov <[email protected]>
Date: 2014-07-16T08:13:57Z
Rename getCatalogIdOrJavaType to getBrooklynType.
The type now can be one of:
* catalog id
* java class name
* URL to yaml file
commit b982e6fea941b499b21736f12bddaa55437f3e38
Author: Svetoslav Neykov <[email protected]>
Date: 2014-07-16T08:22:16Z
Split spec creation in separate steps to allow re-use.
commit 201717a367a501a5ee174656780a2e3555f04edd
Author: Svetoslav Neykov <[email protected]>
Date: 2014-07-16T08:55:40Z
Load URL referenced YAMLs.
Allow URL references to YAML files in addition to catalog IDs and java
types.
Currently limited to services (PlatformComponentTemplate level).
In the case of more than one service in the referenced plan just use the
wrapped app as a child.
The template referencing the yaml will override the name, IDs of the child.
Locations, policies,
effectors, ect. will be appended to the child's config. Do the same for
catalog item references.
commit 6bc8d49f954e4bdbf186fa9581a57766465f1f98
Author: Svetoslav Neykov <[email protected]>
Date: 2014-07-16T10:20:01Z
Resolve catalog items and yaml URLs from child entities as well.
commit 22506097a692c5055d1043a6f9e38d57913a863d
Author: Svetoslav Neykov <[email protected]>
Date: 2014-07-16T10:33:37Z
Remove unnecessary name in YAML.
commit e517ddd231550010e5039092484df26b91021860
Author: Svetoslav Neykov <[email protected]>
Date: 2014-07-16T10:55:04Z
Add tests
* Catalog item does not leak bundles to child catalog items
* Catalog item DOES leak bundles to URL referenced YAMLs
----
---
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.
---
