brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [26/50] git commit: Remove entitlements TODO (no requirement to do per-entity instantiation); Multiple root entities not to be supported for the time being.
Date Wed, 09 Jul 2014 21:46:39 GMT
Remove entitlements TODO (no requirement to do per-entity instantiation); Multiple root entities
not to be supported for the time being.


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

Branch: refs/heads/master
Commit: bd918dc2a42c174e07622673e49454bc2bc8c50c
Parents: e5fd513
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Tue Jul 8 10:43:53 2014 +0300
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Wed Jul 9 22:34:45 2014 +0100

----------------------------------------------------------------------
 .../spi/creation/BrooklynAssemblyTemplateInstantiator.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bd918dc2/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
index 46e50ed..559a908 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
@@ -389,9 +389,8 @@ public class BrooklynAssemblyTemplateInstantiator implements AssemblyTemplateSpe
             BrooklynLoaderTracker.unsetLoader(itemLoader);
         }
 
-        // TODO Should we check entitlements, or sufficient to do once for this being called
in the first place?
-        // TODO Is it acceptable to only allow a single  top-level entity in a catalog? If
not, we need to think
-        //      about what it would mean to subsequently call buildChildrenEntitySpecs on
the list of top-level entities!
+        // In case we want to allow multiple top-level entities in a catalog we need to think
+        // about what it would mean to subsequently call buildChildrenEntitySpecs on the
list of top-level entities!
         try {
             AssemblyTemplateInstantiator ati = at.getInstantiator().newInstance();
             if (ati instanceof BrooklynAssemblyTemplateInstantiator) {


Mime
View raw message