You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/03/27 12:39:12 UTC
[1/2] brooklyn-client git commit: Use the non-deprecated API method
to upload catalog items
Repository: brooklyn-client
Updated Branches:
refs/heads/master fa2d7b3db -> df47be800
Use the non-deprecated API method to upload catalog items
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/b6804310
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/b6804310
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/b6804310
Branch: refs/heads/master
Commit: b68043105891b1ea2cb1792d971a1cbcc427a1e5
Parents: fa2d7b3
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Fri Mar 24 12:34:38 2017 +0000
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Fri Mar 24 12:34:38 2017 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/b6804310/java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java
----------------------------------------------------------------------
diff --git a/java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java b/java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java
index 96c898e..c7433f6 100644
--- a/java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java
+++ b/java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java
@@ -114,7 +114,7 @@ public class BrooklynApiRestClientTest {
}
public void testCatalogCreate()throws Exception {
- final Response response = api.getCatalogApi().create(getFileContentsAsString("catalog/test-catalog.bom"));
+ final Response response = api.getCatalogApi().createFromUpload(getFileContentsAsString("catalog/test-catalog.bom").getBytes());
Asserts.assertEquals(response.getStatus(), 201);
Asserts.assertStringContains(String.valueOf(response.getEntity()), "simple-tomcat:1.0");
}
[2/2] brooklyn-client git commit: Closes #41
Posted by sv...@apache.org.
Closes #41
Use the non-deprecated API method to upload catalog items
This requires https://github.com/apache/brooklyn-server/pull/485 to be merged first
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/df47be80
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/df47be80
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/df47be80
Branch: refs/heads/master
Commit: df47be800589a8c091356cea5643783f745802e8
Parents: fa2d7b3 b680431
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Mar 27 15:39:05 2017 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Mar 27 15:39:05 2017 +0300
----------------------------------------------------------------------
.../org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------