You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/09 23:46:54 UTC
[41/50] git commit: comments about the need for name on a template
being added to catalog
comments about the need for name on a template being added to catalog
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/450ce967
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/450ce967
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/450ce967
Branch: refs/heads/master
Commit: 450ce9677f28fce589df72e9cfb78e2971e95904
Parents: 773d5c9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jul 9 11:43:52 2014 -0400
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 22:34:47 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/rest/resources/CatalogBundleResourceTest.java | 3 ++-
.../test/java/brooklyn/rest/resources/CatalogResourceTest.java | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/450ce967/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
index f3a8477..ba6e3ea 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
@@ -134,7 +134,8 @@ public class CatalogBundleResourceTest extends BrooklynRestResourceTest {
private void addCatalogOSGiEntity(String registeredTypeName, String serviceType) {
String catalogYaml =
"name: "+registeredTypeName+"\n"+
- // FIXME name above should be unnecessary when brooklyn.catalog below is working
+ // FIXME name above should be unnecessary -- slight problem somewhere currently
+ // as testListApplicationYaml fails without the line above
"brooklyn.catalog:\n"+
" id: " + registeredTypeName + "\n"+
" name: My Catalog App\n"+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/450ce967/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
index cd5af80..dca7a44 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
@@ -71,8 +71,6 @@ public class CatalogResourceTest extends BrooklynRestResourceTest {
String registeredTypeName = "my.catalog.app.id";
String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
String yaml =
- "name: "+registeredTypeName+"\n"+
- // FIXME name above should be unnecessary when brooklyn.catalog below is working
"brooklyn.catalog:\n"+
" id: " + registeredTypeName + "\n"+
" name: My Catalog App\n"+