GitHub user neykov opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/955
Camp parsing cleanup and fixes
Modularizes the camp logic, allowing it to be shared with the TOSCA
implementation. Also fixes a couple of problems:
* The recursive check wasn't working for `brooklyn.child` items.
* The recursive check was too strict, including all items already seen
(including sibling items and their children) in the black list, making it
impossible to use the same catalog item in multiple places.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/neykov/incubator-brooklyn
camp-cleanup-and-fixes
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/955.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 #955
----
commit 00615b770d6ecb75fa1513124ebbd3b721bc9580
Author: Svetoslav Neykov <[email protected]>
Date: 2015-10-08T07:09:42Z
White list https protocol for camp URL references
commit 3d415c41c3b3b0eeef3df1f4ad71cec7ddb8de40
Author: Svetoslav Neykov <[email protected]>
Date: 2015-10-08T10:51:49Z
CAMP parsing improvements
Code cleanup, including:
* fix recursive resolving check, avoiding stack overflow error
* go through the PlanToSpecTransformer list for each nested catalog item,
allowing nesting of different types of catalog items (already implemented, but
now integrating it tighter with the parse workflow
Resolve catalog items tiop level, encountered types, cleanup
commit c71d7227dcda9e13c7aaca63cf9624caf48128e7
Author: Svetoslav Neykov <[email protected]>
Date: 2015-10-08T14:36:15Z
PlanToSpecTransformer for old-style xml catalog items
Implement a transformer for items with java type attribute, get the
functionality out of the camp parser.
commit 4485fe5c212ee5fddf4e6452c9fb17b77429b5b5
Author: Svetoslav Neykov <[email protected]>
Date: 2015-10-14T12:02:26Z
Split BrooklynComponentTemplateResolver into independent ServiceSpecResolver
ServiceSpecResolver is not specific to CAMP, it deals with converting a
type (i.e. a catalog item, a java class, chef declaration) to a spec.
BrooklynComponentTemplateResolver then takes the spec and applies the CAMP
config on it.
commit 073c203216428e1ddb87a8f9c2530c41d1239969
Author: Svetoslav Neykov <[email protected]>
Date: 2015-10-14T12:02:50Z
Remove duplicate dependency
commit 73d279097d7a15eb7902c587ee2d5b4400c207b1
Author: Svetoslav Neykov <[email protected]>
Date: 2015-10-14T12:35:40Z
Fix catalog items recursive check
Identical sibling items shouldn't trigger the recursive check abort.
commit 883feaea73a5d1f528796908535fcb3c708f96e0
Author: Svetoslav Neykov <[email protected]>
Date: 2015-10-14T13:06:31Z
Move ServiceSpecResolver and its implementations to core
To be reused by other plan parsers.
commit 09e9f1acf1f307b0da556ae96a3d2b7f3ef91c03
Author: Svetoslav Neykov <[email protected]>
Date: 2015-10-14T14:07:43Z
Test ServiceTypeResolver usage
----
---
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.
---
