GitHub user ahgittin opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/846
YAML pluggable camp
rebases #760 with new package structure. builds on #844 so merge that first!
(it's just the last commit here)
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ahgittin/incubator-brooklyn
yaml-pluggable-camp
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/846.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 #846
----
commit bc509036738704419814ce972b52958fb5ace797
Author: Alex Heneveld <[email protected]>
Date: 2015-08-18T19:20:05Z
BROOKLYN-162 - refactoring core, applying org.apache package prefix and
grouping more sensibly; also restructuring api package similarly
commit d326759c5508c6767b2780fcb29156150ec0a7e8
Author: Alex Heneveld <[email protected]>
Date: 2015-08-18T20:14:34Z
BROOKLYN-162 - apply org.apache package prefix to policy project (a few
outstanding items)
commit 64c2b2e5a31c86b44c08d77012b200595d46728c
Author: Alex Heneveld <[email protected]>
Date: 2015-08-18T21:12:56Z
BROOKLYN-162 - apply org.apache package prefix to software-base, tidying
package names, and moving a few sensory things to core
commit a1ad34d718e37bbab7108956a2f3f9959be68000
Author: Alex Heneveld <[email protected]>
Date: 2015-08-18T21:38:46Z
BROOKLYN-162 - jclouds last few package prefixes needed, and tidy in core
and elsewhere related (or observed in the process)
commit c45bab04f2efec84ce489e6f505f12cf0bdbcd53
Author: Alex Heneveld <[email protected]>
Date: 2015-08-19T00:00:43Z
BROOKLYN-162 - cleanup and test fixes following refectoring, esp the
software/base changes
commit 95277b3abb6f6aad0e8294eabfa93994fc6ddca7
Author: Alex Heneveld <[email protected]>
Date: 2015-08-19T09:48:02Z
updated default catalog with correct package names
commit 1ad11b0fb3edce2c3098aa2076281b38edb40313
Author: Alex Heneveld <[email protected]>
Date: 2015-08-19T10:02:12Z
This closes #760. Makes YAML pluggable.
I've done effectively a rebase-resolve-squash on the commits from that PR.
Doing a formal rebase was very hard due to all the conflicts.
This uses a ServiceLoader to get CAMP stuff, with a list of transformers
supported.
For the record the commit log of #760, squashed here, is:
> commit f7067c2c10942cfea15ecbe0cb4e8e31e8fb6cde
> Author: Svetoslav Neykov <[email protected]>
> Date: Tue Jul 21 17:25:15 2015 +0300
>
> Use plugins to parse yaml plans
>
> Move all CAMP related code to a CAMP implementation of the plugin.
>
> commit c9db2547e1fd0e16b23cb09f04f4cffe6db01ad8
> Author: Svetoslav Neykov <[email protected]>
> Date: Tue Jul 21 15:01:51 2015 +0300
>
> Decrease API surface in CampCatalogUtils
>
> commit 4e24d5f93d250dbbbcf579f2a406f63e1c315798
> Author: Svetoslav Neykov <[email protected]>
> Date: Tue Jul 21 13:17:42 2015 +0300
>
> Deduplicate code
>
> commit a953e059066aa53323db0ed027366a4b5994ecfc
> Author: Svetoslav Neykov <[email protected]>
> Date: Mon Jul 20 18:55:18 2015 +0300
>
> Move all CAMP-related code to a single place - brooklyn-launcher
>
> Use existing utils methods wrapping CAMP calls - in
EntityManagementUtils.
>
> commit dc4b37f6c07337171b61ab25beb9bcea617d9452
> Author: Svetoslav Neykov <[email protected]>
> Date: Mon Jul 20 16:36:32 2015 +0300
>
> Move all CAMP-related code to a single place - brooklyn-rest-server
>
> Use existing utils methods wrapping CAMP calls - in
EntityManagementUtils.
>
> commit 3b8bc66c35ba84db158f2018b967bf501f5811c8
> Author: Svetoslav Neykov <[email protected]>
> Date: Mon Jul 20 16:02:36 2015 +0300
>
> Move all CAMP-related code to a single place - brooklyn-core
>
> EntityManagementUtils and CampCatalogUtils interface to the CAMP
parser now.
>
----
---
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.
---