brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [26/51] [abbrv] brooklyn-library git commit: This closes #760. Makes YAML pluggable.
Date Mon, 01 Feb 2016 17:47:46 GMT
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 <svetoslav.neykov@cloudsoftcorp.com>
> 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 <svetoslav.neykov@cloudsoftcorp.com>
> Date:   Tue Jul 21 15:01:51 2015 +0300
>
>     Decrease API surface in CampCatalogUtils
>
> commit 4e24d5f93d250dbbbcf579f2a406f63e1c315798
> Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
> Date:   Tue Jul 21 13:17:42 2015 +0300
>
>     Deduplicate code
>
> commit a953e059066aa53323db0ed027366a4b5994ecfc
> Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
> 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 <svetoslav.neykov@cloudsoftcorp.com>
> 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 <svetoslav.neykov@cloudsoftcorp.com>
> 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.
>


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/d1fea955
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/d1fea955
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/d1fea955

Branch: refs/heads/0.8.0-incubating
Commit: d1fea9558200ca54a3af6bc5bdf321d29a84bf6e
Parents: d1460dd
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Aug 19 11:02:12 2015 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Aug 19 13:48:36 2015 +0100

----------------------------------------------------------------------
 usage/camp/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d1fea955/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index 9a643e1..34da33c 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -36,6 +36,11 @@
     <dependencies>
         
         <dependency>
+            <groupId>org.apache.brooklyn.camp</groupId>
+            <artifactId>camp-base</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.brooklyn</groupId>
             <artifactId>brooklyn-core</artifactId>
             <version>${project.version}</version>
@@ -112,6 +117,13 @@
         
         <!-- demo and tests -->
         <dependency>
+            <groupId>org.apache.brooklyn.camp</groupId>
+            <artifactId>camp-base</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.brooklyn</groupId>
             <artifactId>brooklyn-core</artifactId>
             <version>${project.version}</version>


Mime
View raw message