This closes #887
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/099d88ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/099d88ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/099d88ad Branch: refs/heads/master Commit: 099d88ad1f747bf5ed5bbcb4dce9cf347abeb998 Parents: f34d0a3 eee4361 Author: Alex Heneveld <[email protected]> Authored: Tue Sep 15 17:48:30 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Sep 15 17:48:30 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/api/catalog/BrooklynCatalog.java | 4 +- .../catalog/internal/BasicBrooklynCatalog.java | 35 +++++-- .../catalog/internal/CatalogInitialization.java | 3 + .../core/location/CatalogLocationResolver.java | 9 +- .../core/mgmt/EntityManagementUtils.java | 9 +- .../brooklyn/core/plan/PlanToSpecFactory.java | 15 ++- .../core/plan/PlanToSpecTransformer.java | 2 +- .../brooklyn/util/core/file/ArchiveBuilder.java | 61 +++++++----- .../core/plan/XmlPlanToSpecTransformer.java | 8 +- .../util/core/file/ArchiveBuilderTest.java | 44 +++++---- .../BrooklynAssemblyTemplateInstantiator.java | 27 +++--- .../BrooklynComponentTemplateResolver.java | 42 ++++++--- .../BrooklynEntityDecorationResolver.java | 11 ++- .../spi/creation/BrooklynEntityMatcher.java | 1 + .../spi/creation/CampToSpecTransformer.java | 64 ++++++++----- .../CatalogOsgiVersionMoreEntityTest.java | 3 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 3 +- .../catalog/CatalogYamlLocationTest.java | 5 +- .../brooklyn/test/lite/CampYamlLiteTest.java | 3 +- .../main/java/org/apache/brooklyn/cli/Main.java | 3 +- usage/jsgui/src/main/webapp/assets/css/base.css | 3 + .../assets/js/model/server-extended-status.js | 2 +- .../src/main/webapp/assets/js/view/catalog.js | 2 +- .../webapp/assets/tpl/catalog/add-location.html | 3 +- .../webapp/assets/tpl/catalog/add-yaml.html | 3 +- .../rest/resources/CatalogResource.java | 6 +- .../rest/transform/CatalogTransformer.java | 14 +-- .../brooklyn/util/exceptions/Exceptions.java | 5 +- .../util/exceptions/UserFacingException.java | 2 +- .../java/org/apache/brooklyn/util/os/Os.java | 3 +- .../org/apache/brooklyn/util/time/Duration.java | 4 +- .../org/apache/brooklyn/util/time/Time.java | 98 +++++++++++--------- .../org/apache/brooklyn/util/time/TimeTest.java | 8 +- 33 files changed, 309 insertions(+), 196 deletions(-) ----------------------------------------------------------------------
